diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2015-08-30 16:55:48 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-09-02 21:28:25 -0600 |
| commit | 6460fc42a1fe4de24a68a64cba7ce84b1fe5bcb1 (patch) | |
| tree | 3e3d4467c55ce11451bc477c7c2b41dd4deae4ad | |
| parent | 139230e7220c94a8417eb5188f4a2a1dbc443ac3 (diff) | |
| download | blackbird-obmc-uboot-6460fc42a1fe4de24a68a64cba7ce84b1fe5bcb1.tar.gz blackbird-obmc-uboot-6460fc42a1fe4de24a68a64cba7ce84b1fe5bcb1.zip | |
rockchip: Add config_distro_bootcmd support
Now that MMC works in U-Boot add config distro command support to start
Linux in a standard fashion. One oddity here is that linux fails to load
when the fdt is relocated to above 512MB, so set fdt_high to make sure it's
loaded below that.
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | include/configs/rk3288_common.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index ce7fa75fa2..e8aec28624 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -92,6 +92,27 @@ #ifndef CONFIG_SPL_BUILD #include <config_distro_defaults.h> + +#define ENV_MEM_LAYOUT_SETTINGS \ + "scriptaddr=0x00000000\0" \ + "pxefile_addr_r=0x00100000\0" \ + "fdt_addr_r=0x01f00000\0" \ + "kernel_addr_r=0x02000000\0" \ + "ramdisk_addr_r=0x04000000\0" + +/* First try to boot from SD (index 0), then eMMC (index 1 */ +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(MMC, mmc, 1) + +#include <config_distro_bootcmd.h> + +/* Linux fails to load the fdt if it's loaded above 512M on a Rock 2 board, so + * limit the fdt reallocation to that */ +#define CONFIG_EXTRA_ENV_SETTINGS \ + "fdt_high=0x1fffffff\0" \ + ENV_MEM_LAYOUT_SETTINGS \ + BOOTENV #endif #endif |
