Commit 0a3f407a7f4246790775c172cbe5e1097b137bf9
Committed by
Tom Rini
Tom Rini
1 parent
881e7bccfb
Exists in
smarc_8mq_lf_v2020.04
and in
17 other branches
configs: dra7xx_evm: Enable SPL_DM
Enable SPL_DM on all DRA7 based platforms. Reviewed-by: Tom Rini <trini@konsulko.com> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Showing 4 changed files with 11 additions and 15 deletions Side-by-side Diff
configs/dra7xx_evm_defconfig
| 1 | 1 | CONFIG_ARM=y |
| 2 | 2 | CONFIG_OMAP54XX=y |
| 3 | -CONFIG_TARGET_DRA7XX_EVM=y | |
| 3 | +CONFIG_SYS_MALLOC_F_LEN=0x2000 | |
| 4 | 4 | # CONFIG_SPL_NAND_SUPPORT is not set |
| 5 | +CONFIG_TARGET_DRA7XX_EVM=y | |
| 5 | 6 | CONFIG_SPL_SPI_FLASH_SUPPORT=y |
| 6 | 7 | CONFIG_SPL_SPI_SUPPORT=y |
| 7 | 8 | CONFIG_ARMV7_LPAE=y |
| 8 | 9 | |
| ... | ... | @@ -14,7 +15,9 @@ |
| 14 | 15 | CONFIG_VERSION_VARIABLE=y |
| 15 | 16 | CONFIG_BOARD_EARLY_INIT_F=y |
| 16 | 17 | CONFIG_SPL=y |
| 18 | +CONFIG_SPL_SYS_MALLOC_SIMPLE=y | |
| 17 | 19 | CONFIG_SPL_STACK_R=y |
| 20 | +CONFIG_SPL_SEPARATE_BSS=y | |
| 18 | 21 | CONFIG_SPL_DMA_SUPPORT=y |
| 19 | 22 | CONFIG_SPL_OS_BOOT=y |
| 20 | 23 | CONFIG_HUSH_PARSER=y |
| 21 | 24 | |
| ... | ... | @@ -52,8 +55,10 @@ |
| 52 | 55 | CONFIG_CMD_FS_GENERIC=y |
| 53 | 56 | CONFIG_ISO_PARTITION=y |
| 54 | 57 | CONFIG_OF_CONTROL=y |
| 58 | +CONFIG_SPL_OF_CONTROL=y | |
| 55 | 59 | CONFIG_OF_LIST="dra7-evm dra72-evm dra72-evm-revc dra71-evm" |
| 56 | 60 | CONFIG_DM=y |
| 61 | +CONFIG_SPL_DM=y | |
| 57 | 62 | # CONFIG_BLK is not set |
| 58 | 63 | CONFIG_DFU_MMC=y |
| 59 | 64 | CONFIG_DFU_RAM=y |
| ... | ... | @@ -96,5 +101,4 @@ |
| 96 | 101 | CONFIG_G_DNL_MANUFACTURER="Texas Instruments" |
| 97 | 102 | CONFIG_G_DNL_VENDOR_NUM=0x0451 |
| 98 | 103 | CONFIG_G_DNL_PRODUCT_NUM=0xd022 |
| 99 | -CONFIG_SPL_OF_LIBFDT=y |
configs/dra7xx_hs_evm_defconfig
| ... | ... | @@ -20,7 +20,9 @@ |
| 20 | 20 | CONFIG_VERSION_VARIABLE=y |
| 21 | 21 | CONFIG_BOARD_EARLY_INIT_F=y |
| 22 | 22 | CONFIG_SPL=y |
| 23 | +CONFIG_SPL_SYS_MALLOC_SIMPLE=y | |
| 23 | 24 | CONFIG_SPL_STACK_R=y |
| 25 | +CONFIG_SPL_SEPARATE_BSS=y | |
| 24 | 26 | CONFIG_SPL_DMA_SUPPORT=y |
| 25 | 27 | CONFIG_HUSH_PARSER=y |
| 26 | 28 | CONFIG_FASTBOOT=y |
| 27 | 29 | |
| ... | ... | @@ -57,8 +59,10 @@ |
| 57 | 59 | CONFIG_CMD_FS_GENERIC=y |
| 58 | 60 | CONFIG_ISO_PARTITION=y |
| 59 | 61 | CONFIG_OF_CONTROL=y |
| 62 | +CONFIG_SPL_OF_CONTROL=y | |
| 60 | 63 | CONFIG_OF_LIST="dra7-evm dra72-evm dra72-evm-revc dra71-evm" |
| 61 | 64 | CONFIG_DM=y |
| 65 | +CONFIG_SPL_DM=y | |
| 62 | 66 | # CONFIG_BLK is not set |
| 63 | 67 | CONFIG_DFU_MMC=y |
| 64 | 68 | CONFIG_DFU_RAM=y |
| ... | ... | @@ -101,5 +105,4 @@ |
| 101 | 105 | CONFIG_G_DNL_MANUFACTURER="Texas Instruments" |
| 102 | 106 | CONFIG_G_DNL_VENDOR_NUM=0x0451 |
| 103 | 107 | CONFIG_G_DNL_PRODUCT_NUM=0xd022 |
| 104 | -CONFIG_SPL_OF_LIBFDT=y |
include/configs/dra7xx_evm.h
| ... | ... | @@ -122,11 +122,6 @@ |
| 122 | 122 | #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 |
| 123 | 123 | #define CONFIG_QSPI_QUAD_SUPPORT |
| 124 | 124 | |
| 125 | -#ifdef CONFIG_SPL_BUILD | |
| 126 | -#undef CONFIG_DM_SPI | |
| 127 | -#undef CONFIG_DM_SPI_FLASH | |
| 128 | -#endif | |
| 129 | - | |
| 130 | 125 | /* |
| 131 | 126 | * Default to using SPI for environment, etc. |
| 132 | 127 | * 0x000000 - 0x040000 : QSPI.SPL (256KiB) |
include/configs/ti_omap5_common.h
| ... | ... | @@ -42,7 +42,7 @@ |
| 42 | 42 | * Hardware drivers |
| 43 | 43 | */ |
| 44 | 44 | #define CONFIG_SYS_NS16550_CLK 48000000 |
| 45 | -#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL) | |
| 45 | +#if !defined(CONFIG_DM_SERIAL) | |
| 46 | 46 | #define CONFIG_SYS_NS16550_SERIAL |
| 47 | 47 | #define CONFIG_SYS_NS16550_REG_SIZE (-4) |
| 48 | 48 | #endif |
| 49 | 49 | |
| 50 | 50 | |
| ... | ... | @@ -160,14 +160,8 @@ |
| 160 | 160 | #define CONFIG_SPL_NAND_AM33XX_BCH /* ELM support */ |
| 161 | 161 | #endif |
| 162 | 162 | |
| 163 | -/* | |
| 164 | - * Disable MMC DM for SPL build and can be re-enabled after adding | |
| 165 | - * DM support in SPL | |
| 166 | - */ | |
| 167 | 163 | #ifdef CONFIG_SPL_BUILD |
| 168 | -#undef CONFIG_DM_MMC | |
| 169 | 164 | #undef CONFIG_TIMER |
| 170 | -#undef CONFIG_DM_ETH | |
| 171 | 165 | #endif |
| 172 | 166 | |
| 173 | 167 | #endif /* __CONFIG_TI_OMAP5_COMMON_H */ |