diff options
| author | Tom Rini <trini@konsulko.com> | 2020-02-01 15:31:04 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-02-01 15:31:04 -0500 |
| commit | 427da6f0280ba1ce07e06941dd18a435fabd18fb (patch) | |
| tree | 9375e0449d817471c3dc81e6507ec13bd04798d2 /include | |
| parent | 80e99adbe47d1c8590f9b971ac52257fdc51a5ec (diff) | |
| parent | c8343e93220a487f332441cff780a702ca2ce3a9 (diff) | |
| download | u-boot-427da6f0280ba1ce07e06941dd18a435fabd18fb.tar.gz u-boot-427da6f0280ba1ce07e06941dd18a435fabd18fb.tar.xz u-boot-427da6f0280ba1ce07e06941dd18a435fabd18fb.zip | |
Merge tag 'u-boot-rockchip-20200130' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- Support redundant boot for rk3399
- Support binman for rockchip platform
- Update ram driver and add ddr4 support for rk3328
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/evb_rk3399.h | 4 | ||||
| -rw-r--r-- | include/configs/rk3399_common.h | 5 | ||||
| -rw-r--r-- | include/configs/rockchip-common.h | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/include/configs/evb_rk3399.h b/include/configs/evb_rk3399.h index b9c4d683f4..c0b0358893 100644 --- a/include/configs/evb_rk3399.h +++ b/include/configs/evb_rk3399.h @@ -8,7 +8,9 @@ #include <configs/rk3399_common.h> -#define CONFIG_SYS_MMC_ENV_DEV 0 +#if defined(CONFIG_ENV_IS_IN_MMC) +# define CONFIG_SYS_MMC_ENV_DEV 0 +#endif #define SDRAM_BANK_SIZE (2UL << 30) diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 127ca1f09c..89a8a44bbe 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -63,7 +63,10 @@ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "partitions=" PARTS_DEFAULT \ ROCKCHIP_DEVICE_SETTINGS \ - BOOTENV + BOOTENV \ + "altbootcmd=" \ + "setenv boot_syslinux_conf extlinux/extlinux-rollback.conf;" \ + "run distro_bootcmd\0" #endif diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 68e1105a4b..b55e09a9ca 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -9,6 +9,9 @@ #define CONFIG_SYS_NS16550_MEM32 +/* ((CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR - 64) * 512) */ +#define CONFIG_SPL_PAD_TO 8355840 + #ifndef CONFIG_SPL_BUILD /* First try to boot from SD (index 0), then eMMC (index 1) */ |