diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-20 14:54:42 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-20 14:54:42 -0500 |
| commit | cd304e218012de4ac2e3d55e869b2102af4fdcb2 (patch) | |
| tree | 26a200f7fe98dcd809b7bf90ab152ab4161fa653 /include | |
| parent | c7819d409ab7671991bf906482b7adcc21266f75 (diff) | |
| parent | db48e11b1eccf23f3f9ba26e886a798e74df6a01 (diff) | |
| download | u-boot-cd304e218012de4ac2e3d55e869b2102af4fdcb2.tar.gz | |
Merge tag 'u-boot-stm32-20200117' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm
- stm32mp1: split SOC and board and cleanup config
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/stm32mp1.h | 39 |
1 files changed, 31 insertions, 8 deletions
diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h index d42a7860be..a66534e027 100644 --- a/include/configs/stm32mp1.h +++ b/include/configs/stm32mp1.h @@ -33,9 +33,10 @@ #define CONFIG_SYS_CBSIZE SZ_1K /* - * Needed by "loadb" + * default load address used for command tftp, bootm , loadb, ... */ -#define CONFIG_SYS_LOAD_ADDR STM32_DDR_BASE +#define CONFIG_LOADADDR 0xc2000000 +#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* ATAGs */ #define CONFIG_CMDLINE_TAG @@ -98,12 +99,34 @@ #if !defined(CONFIG_SPL_BUILD) -#define BOOT_TARGET_DEVICES(func) \ - func(MMC, mmc, 1) \ - func(UBIFS, ubifs, 0) \ - func(MMC, mmc, 0) \ - func(MMC, mmc, 2) \ - func(PXE, pxe, na) +#ifdef CONFIG_CMD_MMC +#define BOOT_TARGET_MMC0(func) func(MMC, mmc, 0) +#define BOOT_TARGET_MMC1(func) func(MMC, mmc, 1) +#define BOOT_TARGET_MMC2(func) func(MMC, mmc, 2) +#else +#define BOOT_TARGET_MMC0(func) +#define BOOT_TARGET_MMC1(func) +#define BOOT_TARGET_MMC2(func) +#endif + +#ifdef CONFIG_NET +#define BOOT_TARGET_PXE(func) func(PXE, pxe, na) +#else +#define BOOT_TARGET_PXE(func) +#endif + +#ifdef CONFIG_CMD_UBIFS +#define BOOT_TARGET_UBIFS(func) func(UBIFS, ubifs, 0) +#else +#define BOOT_TARGET_UBIFS(func) +#endif + +#define BOOT_TARGET_DEVICES(func) \ + BOOT_TARGET_MMC1(func) \ + BOOT_TARGET_UBIFS(func) \ + BOOT_TARGET_MMC0(func) \ + BOOT_TARGET_MMC2(func) \ + BOOT_TARGET_PXE(func) /* * bootcmd for stm32mp1: |