diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-27 13:19:47 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-27 13:19:47 -0400 |
| commit | 8c56ea5c1e033f16993e5427300399ef848234bb (patch) | |
| tree | 9c92d106a8cadca5b522e503e75c1ba936175f2d /include/configs | |
| parent | e4b8dd9b34021241cd05d5cc9d24b4ae34657830 (diff) | |
| parent | 06d1dd2cdc3c69122e58b38fd11b2a4e524a37e2 (diff) | |
Merge branch 'u-boot-stm32_20190827' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm
- Fixes and update related to STM32MP1 platforms
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/stm32mp1.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h index 24f7b9d463..92660fe2a0 100644 --- a/include/configs/stm32mp1.h +++ b/include/configs/stm32mp1.h @@ -10,11 +10,6 @@ #include <linux/sizes.h> #include <asm/arch/stm32.h> -/* - * Number of clock ticks in 1 sec - */ -#define CONFIG_SYS_HZ 1000 - #ifndef CONFIG_STM32MP1_TRUSTED /* PSCI support */ #define CONFIG_ARMV7_PSCI_1_0 @@ -52,7 +47,6 @@ /* SPL support */ #ifdef CONFIG_SPL -/* BOOTROM load address */ /* SPL use DDR */ #define CONFIG_SPL_BSS_START_ADDR 0xC0200000 #define CONFIG_SPL_BSS_MAX_SIZE 0x00100000 @@ -85,7 +79,9 @@ #endif /* Dynamic MTD partition support */ +#if defined(CONFIG_STM32_QSPI) || defined(CONFIG_NAND_STM32_FMC2) #define CONFIG_SYS_MTDPARTS_RUNTIME +#endif /*****************************************************************************/ #ifdef CONFIG_DISTRO_DEFAULTS @@ -146,6 +142,7 @@ * and the ramdisk at the end. */ #define CONFIG_EXTRA_ENV_SETTINGS \ + "bootdelay=1\0" \ "kernel_addr_r=0xc2000000\0" \ "fdt_addr_r=0xc4000000\0" \ "scriptaddr=0xc4100000\0" \ @@ -154,7 +151,8 @@ "ramdisk_addr_r=0xc4400000\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ - "env_default=1\0" \ + "altbootcmd=run bootcmd\0" \ + "env_default=1\0" \ "env_check=if test $env_default -eq 1;"\ " then env set env_default 0;env save;fi\0" \ STM32MP_BOOTCMD \ |