diff options
| author | Jagan Teki <jagannadh.teki@gmail.com> | 2018-02-14 21:26:22 +0530 |
|---|---|---|
| committer | Philipp Tomsich <philipp.tomsich@theobroma-systems.com> | 2018-03-13 18:12:36 +0100 |
| commit | 1e84e44cfec952006f30c42bbab5d7e170776549 (patch) | |
| tree | 4994f7bc169ff5f0d7d3440f7cb795c6a2fde2af | |
| parent | 159916f4e880c1a738a595686c36791a605e5657 (diff) | |
| download | u-boot-1e84e44cfec952006f30c42bbab5d7e170776549.tar.gz | |
rk3288: vyasa: Add eMMC boot support
RK3288 Vyasa has eMMC boot support, with JP4 open.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
| -rw-r--r-- | arch/arm/dts/rk3288-vyasa-u-boot.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/dts/rk3288-vyasa.dts | 11 | ||||
| -rw-r--r-- | board/amarula/vyasa-rk3288/vyasa-rk3288.c | 7 |
3 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm/dts/rk3288-vyasa-u-boot.dtsi b/arch/arm/dts/rk3288-vyasa-u-boot.dtsi index b3a56e94ad..6017ca2ddc 100644 --- a/arch/arm/dts/rk3288-vyasa-u-boot.dtsi +++ b/arch/arm/dts/rk3288-vyasa-u-boot.dtsi @@ -20,6 +20,10 @@ u-boot,dm-pre-reloc; }; +&emmc { + u-boot,dm-pre-reloc; +}; + &uart2 { u-boot,dm-pre-reloc; }; diff --git a/arch/arm/dts/rk3288-vyasa.dts b/arch/arm/dts/rk3288-vyasa.dts index 70c433fbdd..850aa25818 100644 --- a/arch/arm/dts/rk3288-vyasa.dts +++ b/arch/arm/dts/rk3288-vyasa.dts @@ -155,6 +155,17 @@ cpu0-supply = <&vdd_cpu>; }; +&emmc { + bus-width = <8>; + cap-mmc-highspeed; + disable-wp; + non-removable; + pinctrl-names = "default"; + pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>; + vmmc-supply = <&vcc_io>; + status = "okay"; +}; + &gmac { assigned-clocks = <&cru SCLK_MAC>; assigned-clock-parents = <&ext_gmac>; diff --git a/board/amarula/vyasa-rk3288/vyasa-rk3288.c b/board/amarula/vyasa-rk3288/vyasa-rk3288.c index 7985671fbd..82f8c4e5b7 100644 --- a/board/amarula/vyasa-rk3288/vyasa-rk3288.c +++ b/board/amarula/vyasa-rk3288/vyasa-rk3288.c @@ -9,6 +9,13 @@ #ifndef CONFIG_TPL_BUILD #include <spl.h> +void board_boot_order(u32 *spl_boot_list) +{ + /* eMMC prior to sdcard. */ + spl_boot_list[0] = BOOT_DEVICE_MMC2; + spl_boot_list[1] = BOOT_DEVICE_MMC1; +} + int spl_start_uboot(void) { /* break into full u-boot on 'c' */ |