Révision | f673b4670de6006b068dad7c2312cadb09cf2c02 (tree) |
---|---|
l'heure | 2022-07-26 03:57:27 |
Auteur | Andrew Davis <afd@ti.c...> |
Commiter | Tom Rini |
defconfigs: j721e_hs_evm: Sync HS and non-HS defconfigs
Additions have been made to the non-HS defconfig without the same
being made to the HS defconfig, sync them.
Signed-off-by: Andrew Davis <afd@ti.com>
@@ -10,7 +10,6 @@ CONFIG_NR_DRAM_BANKS=2 | ||
10 | 10 | CONFIG_SOC_K3_J721E=y |
11 | 11 | CONFIG_TARGET_J721E_A72_EVM=y |
12 | 12 | CONFIG_ENV_SIZE=0x20000 |
13 | -CONFIG_ENV_OFFSET=0x680000 | |
14 | 13 | CONFIG_DM_GPIO=y |
15 | 14 | CONFIG_SPL_DM_SPI=y |
16 | 15 | CONFIG_DEFAULT_DEVICE_TREE="k3-j721e-common-proc-board" |
@@ -19,7 +18,6 @@ CONFIG_SPL_MMC=y | ||
19 | 18 | CONFIG_SPL_SERIAL=y |
20 | 19 | CONFIG_SPL_DRIVERS_MISC=y |
21 | 20 | CONFIG_SPL_STACK_R_ADDR=0x82000000 |
22 | -CONFIG_ENV_OFFSET_REDUND=0x700000 | |
23 | 21 | CONFIG_SPL_FS_FAT=y |
24 | 22 | CONFIG_SPL_LIBDISK_SUPPORT=y |
25 | 23 | CONFIG_SPL_SPI_FLASH_SUPPORT=y |
@@ -33,7 +31,7 @@ CONFIG_SPL_LOAD_FIT=y | ||
33 | 31 | CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000 |
34 | 32 | # CONFIG_USE_SPL_FIT_GENERATOR is not set |
35 | 33 | CONFIG_OF_BOARD_SETUP=y |
36 | -CONFIG_BOOTCOMMAND="run findfdt; run envboot; run init_${boot}; run main_cpsw0_qsgmii_phyinit; run boot_rprocs; run get_fit_${boot}; run get_overlaystring; run run_fit" | |
34 | +CONFIG_BOOTCOMMAND="run findfdt; run envboot; run init_${boot}; run main_cpsw0_qsgmii_phyinit; run boot_rprocs; run get_fit_${boot}; run get_overlay_${boot}; run run_fit" | |
37 | 35 | CONFIG_LOGLEVEL=7 |
38 | 36 | CONFIG_SPL_MAX_SIZE=0xc0000 |
39 | 37 | CONFIG_SPL_HAS_BSS_LINKER_SECTION=y |
@@ -44,6 +42,9 @@ CONFIG_SPL_SYS_MALLOC_SIMPLE=y | ||
44 | 42 | CONFIG_SPL_STACK_R=y |
45 | 43 | CONFIG_SYS_SPL_MALLOC=y |
46 | 44 | CONFIG_SYS_SPL_MALLOC_SIZE=0x800000 |
45 | +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y | |
46 | +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1400 | |
47 | +CONFIG_SPL_DMA=y | |
47 | 48 | CONFIG_SPL_ENV_SUPPORT=y |
48 | 49 | CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot.img" |
49 | 50 | CONFIG_SPL_I2C=y |
@@ -53,15 +54,20 @@ CONFIG_SPL_DM_SPI_FLASH=y | ||
53 | 54 | CONFIG_SPL_NOR_SUPPORT=y |
54 | 55 | CONFIG_SPL_DM_RESET=y |
55 | 56 | CONFIG_SPL_POWER_DOMAIN=y |
57 | +CONFIG_SPL_RAM_SUPPORT=y | |
58 | +CONFIG_SPL_RAM_DEVICE=y | |
56 | 59 | # CONFIG_SPL_SPI_FLASH_TINY is not set |
57 | 60 | CONFIG_SPL_SPI_FLASH_SFDP_SUPPORT=y |
58 | 61 | CONFIG_SPL_SPI_LOAD=y |
59 | 62 | CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000 |
63 | +CONFIG_SPL_USB_GADGET=y | |
64 | +CONFIG_SPL_DFU=y | |
60 | 65 | CONFIG_SPL_YMODEM_SUPPORT=y |
61 | 66 | CONFIG_SYS_MAXARGS=64 |
62 | 67 | CONFIG_CMD_ASKENV=y |
63 | 68 | CONFIG_CMD_DFU=y |
64 | 69 | # CONFIG_CMD_FLASH is not set |
70 | +CONFIG_CMD_GPIO=y | |
65 | 71 | CONFIG_CMD_GPT=y |
66 | 72 | CONFIG_CMD_I2C=y |
67 | 73 | CONFIG_CMD_MMC=y |
@@ -74,20 +80,23 @@ CONFIG_CMD_USB_MASS_STORAGE=y | ||
74 | 80 | CONFIG_CMD_TIME=y |
75 | 81 | CONFIG_CMD_EXT4_WRITE=y |
76 | 82 | CONFIG_MTDIDS_DEFAULT="nor0=47040000.spi.0,nor0=47034000.hyperbus" |
77 | -CONFIG_MTDPARTS_DEFAULT="mtdparts=47040000.spi.0:512k(ospi.tiboot3),2m(ospi.tispl),4m(ospi.u-boot),128k(ospi.env),128k(ospi.env.backup),1m(ospi.sysfw),-@8m(ospi.rootfs);47034000.hyperbus:512k(hbmc.tiboot3),2m(hbmc.tispl),4m(hbmc.u-boot),256k(hbmc.env),1m(hbmc.sysfw),-@8m(hbmc.rootfs)" | |
83 | +CONFIG_MTDPARTS_DEFAULT="mtdparts=47040000.spi.0:512k(ospi.tiboot3),2m(ospi.tispl),4m(ospi.u-boot),256k(ospi.env),1m(ospi.sysfw),256k(ospi.env.backup),57344k@8m(ospi.rootfs),256k(ospi.phypattern);47034000.hyperbus:512k(hbmc.tiboot3),2m(hbmc.tispl),4m(hbmc.u-boot),256k(hbmc.env),1m(hbmc.sysfw),-@8m(hbmc.rootfs)" | |
78 | 84 | CONFIG_CMD_UBI=y |
79 | 85 | CONFIG_MMC_SPEED_MODE_SET=y |
80 | 86 | # CONFIG_ISO_PARTITION is not set |
81 | 87 | # CONFIG_SPL_EFI_PARTITION is not set |
82 | 88 | CONFIG_OF_CONTROL=y |
83 | 89 | CONFIG_SPL_OF_CONTROL=y |
90 | +CONFIG_OF_LIST="k3-j721e-common-proc-board k3-j721e-sk" | |
91 | +CONFIG_MULTI_DTB_FIT=y | |
84 | 92 | CONFIG_SPL_MULTI_DTB_FIT=y |
85 | 93 | CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y |
86 | 94 | CONFIG_ENV_OVERWRITE=y |
87 | -CONFIG_ENV_IS_IN_MMC=y | |
95 | +CONFIG_ENV_IS_NOWHERE=y | |
96 | +CONFIG_ENV_IS_IN_FAT=y | |
88 | 97 | CONFIG_SYS_REDUNDAND_ENVIRONMENT=y |
98 | +CONFIG_ENV_FAT_DEVICE_AND_PART="1:1" | |
89 | 99 | CONFIG_SYS_RELOC_GD_ENV_ADDR=y |
90 | -CONFIG_SYS_MMC_ENV_PART=1 | |
91 | 100 | CONFIG_NET_RANDOM_ETHADDR=y |
92 | 101 | CONFIG_DM=y |
93 | 102 | CONFIG_SPL_DM=y |
@@ -103,6 +112,8 @@ CONFIG_CLK_TI_SCI=y | ||
103 | 112 | CONFIG_DFU_MMC=y |
104 | 113 | CONFIG_DFU_RAM=y |
105 | 114 | CONFIG_DFU_SF=y |
115 | +CONFIG_SYS_DFU_DATA_BUF_SIZE=0x20000 | |
116 | +CONFIG_SYS_DFU_MAX_FILE_SIZE=0x800000 | |
106 | 117 | CONFIG_DMA_CHANNELS=y |
107 | 118 | CONFIG_TI_K3_NAVSS_UDMA=y |
108 | 119 | CONFIG_USB_FUNCTION_FASTBOOT=y |
@@ -112,10 +123,18 @@ CONFIG_FASTBOOT_FLASH=y | ||
112 | 123 | CONFIG_FASTBOOT_FLASH_MMC_DEV=0 |
113 | 124 | CONFIG_FASTBOOT_CMD_OEM_FORMAT=y |
114 | 125 | CONFIG_TI_SCI_PROTOCOL=y |
126 | +CONFIG_DA8XX_GPIO=y | |
127 | +CONFIG_DM_PCA953X=y | |
115 | 128 | CONFIG_DM_I2C=y |
129 | +CONFIG_DM_I2C_GPIO=y | |
116 | 130 | CONFIG_SYS_I2C_OMAP24XX=y |
117 | 131 | CONFIG_DM_MAILBOX=y |
118 | 132 | CONFIG_K3_SEC_PROXY=y |
133 | +CONFIG_SUPPORT_EMMC_BOOT=y | |
134 | +CONFIG_MMC_IO_VOLTAGE=y | |
135 | +CONFIG_MMC_UHS_SUPPORT=y | |
136 | +CONFIG_MMC_HS200_SUPPORT=y | |
137 | +CONFIG_SPL_MMC_HS200_SUPPORT=y | |
119 | 138 | CONFIG_MMC_SDHCI=y |
120 | 139 | CONFIG_MMC_SDHCI_ADMA=y |
121 | 140 | CONFIG_SPL_MMC_SDHCI_ADMA=y |
@@ -133,10 +152,16 @@ CONFIG_DM_SPI_FLASH=y | ||
133 | 152 | CONFIG_SPI_FLASH_STMICRO=y |
134 | 153 | # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set |
135 | 154 | CONFIG_SPI_FLASH_MTD=y |
155 | +CONFIG_MULTIPLEXER=y | |
156 | +CONFIG_MUX_MMIO=y | |
136 | 157 | CONFIG_PHY_TI_DP83867=y |
137 | 158 | CONFIG_PHY_FIXED=y |
138 | 159 | CONFIG_DM_ETH=y |
139 | 160 | CONFIG_TI_AM65_CPSW_NUSS=y |
161 | +CONFIG_PHY=y | |
162 | +CONFIG_SPL_PHY=y | |
163 | +CONFIG_PHY_CADENCE_SIERRA=y | |
164 | +CONFIG_PHY_J721E_WIZ=y | |
140 | 165 | CONFIG_PINCTRL=y |
141 | 166 | # CONFIG_PINCTRL_GENERIC is not set |
142 | 167 | CONFIG_SPL_PINCTRL=y |
@@ -144,7 +169,11 @@ CONFIG_SPL_PINCTRL=y | ||
144 | 169 | CONFIG_PINCTRL_SINGLE=y |
145 | 170 | CONFIG_POWER_DOMAIN=y |
146 | 171 | CONFIG_TI_SCI_POWER_DOMAIN=y |
172 | +CONFIG_DM_REGULATOR=y | |
173 | +CONFIG_DM_REGULATOR_FIXED=y | |
174 | +CONFIG_DM_REGULATOR_GPIO=y | |
147 | 175 | CONFIG_RAM=y |
176 | +CONFIG_SPL_RAM=y | |
148 | 177 | CONFIG_REMOTEPROC_TI_K3_DSP=y |
149 | 178 | CONFIG_REMOTEPROC_TI_K3_R5F=y |
150 | 179 | CONFIG_DM_RESET=y |
@@ -170,6 +199,7 @@ CONFIG_USB_XHCI_HCD=y | ||
170 | 199 | CONFIG_USB_CDNS3=y |
171 | 200 | CONFIG_USB_CDNS3_GADGET=y |
172 | 201 | CONFIG_USB_CDNS3_HOST=y |
202 | +CONFIG_SPL_USB_CDNS3_GADGET=y | |
173 | 203 | CONFIG_USB_GADGET=y |
174 | 204 | CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" |
175 | 205 | CONFIG_USB_GADGET_VENDOR_NUM=0x0451 |
@@ -2,14 +2,14 @@ CONFIG_ARM=y | ||
2 | 2 | CONFIG_ARCH_K3=y |
3 | 3 | CONFIG_TI_SECURE_DEVICE=y |
4 | 4 | CONFIG_SYS_MALLOC_LEN=0x2000000 |
5 | -CONFIG_SYS_MALLOC_F_LEN=0x55000 | |
5 | +CONFIG_SYS_MALLOC_F_LEN=0x70000 | |
6 | 6 | CONFIG_SPL_GPIO=y |
7 | 7 | CONFIG_SPL_LIBCOMMON_SUPPORT=y |
8 | 8 | CONFIG_SPL_LIBGENERIC_SUPPORT=y |
9 | 9 | CONFIG_SOC_K3_J721E=y |
10 | +CONFIG_K3_EARLY_CONS=y | |
10 | 11 | CONFIG_TARGET_J721E_R5_EVM=y |
11 | 12 | CONFIG_ENV_SIZE=0x20000 |
12 | -CONFIG_ENV_OFFSET=0x680000 | |
13 | 13 | CONFIG_DM_GPIO=y |
14 | 14 | CONFIG_SPL_DM_SPI=y |
15 | 15 | CONFIG_DEFAULT_DEVICE_TREE="k3-j721e-r5-common-proc-board" |
@@ -18,7 +18,6 @@ CONFIG_SPL_MMC=y | ||
18 | 18 | CONFIG_SPL_SERIAL=y |
19 | 19 | CONFIG_SPL_DRIVERS_MISC=y |
20 | 20 | CONFIG_SPL_STACK_R_ADDR=0x82000000 |
21 | -CONFIG_ENV_OFFSET_REDUND=0x700000 | |
22 | 21 | CONFIG_SPL_FS_FAT=y |
23 | 22 | CONFIG_SPL_LIBDISK_SUPPORT=y |
24 | 23 | CONFIG_SPL_SPI_FLASH_SUPPORT=y |
@@ -29,12 +28,14 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x41cf5bfc | ||
29 | 28 | CONFIG_SPL_LOAD_FIT=y |
30 | 29 | CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000 |
31 | 30 | # CONFIG_USE_SPL_FIT_GENERATOR is not set |
31 | +CONFIG_OF_BOARD_SETUP=y | |
32 | 32 | CONFIG_USE_BOOTCOMMAND=y |
33 | 33 | # CONFIG_DISPLAY_CPUINFO is not set |
34 | 34 | CONFIG_SPL_MAX_SIZE=0xc0000 |
35 | 35 | CONFIG_SPL_HAS_BSS_LINKER_SECTION=y |
36 | 36 | CONFIG_SPL_BSS_START_ADDR=0x41cf5bfc |
37 | 37 | CONFIG_SPL_BSS_MAX_SIZE=0xa000 |
38 | +CONFIG_SPL_BOARD_INIT=y | |
38 | 39 | CONFIG_SPL_STACK_R=y |
39 | 40 | CONFIG_SPL_SEPARATE_BSS=y |
40 | 41 | CONFIG_SYS_SPL_MALLOC=y |
@@ -42,11 +43,16 @@ CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y | ||
42 | 43 | CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x84000000 |
43 | 44 | CONFIG_SYS_SPL_MALLOC_SIZE=0x1000000 |
44 | 45 | CONFIG_SPL_EARLY_BSS=y |
46 | +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y | |
47 | +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x400 | |
45 | 48 | CONFIG_SPL_DMA=y |
46 | 49 | CONFIG_SPL_ENV_SUPPORT=y |
50 | +CONFIG_SPL_FS_EXT4=y | |
47 | 51 | CONFIG_SPL_I2C=y |
48 | 52 | CONFIG_SPL_DM_MAILBOX=y |
53 | +CONFIG_SPL_MTD_SUPPORT=y | |
49 | 54 | CONFIG_SPL_DM_SPI_FLASH=y |
55 | +CONFIG_SPL_NOR_SUPPORT=y | |
50 | 56 | CONFIG_SPL_DM_RESET=y |
51 | 57 | CONFIG_SPL_POWER_DOMAIN=y |
52 | 58 | CONFIG_SPL_RAM_SUPPORT=y |
@@ -56,10 +62,13 @@ CONFIG_SPL_REMOTEPROC=y | ||
56 | 62 | CONFIG_SPL_SPI_FLASH_SFDP_SUPPORT=y |
57 | 63 | CONFIG_SPL_SPI_LOAD=y |
58 | 64 | CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000 |
65 | +CONFIG_SPL_USB_GADGET=y | |
66 | +CONFIG_SPL_DFU=y | |
59 | 67 | CONFIG_SPL_YMODEM_SUPPORT=y |
60 | 68 | CONFIG_HUSH_PARSER=y |
61 | 69 | CONFIG_SYS_MAXARGS=64 |
62 | 70 | CONFIG_SYS_BOOTM_LEN=0x4000000 |
71 | +CONFIG_CMD_DFU=y | |
63 | 72 | # CONFIG_CMD_FLASH is not set |
64 | 73 | CONFIG_CMD_GPT=y |
65 | 74 | CONFIG_CMD_MMC=y |
@@ -67,26 +76,33 @@ CONFIG_CMD_REMOTEPROC=y | ||
67 | 76 | # CONFIG_CMD_SETEXPR is not set |
68 | 77 | CONFIG_CMD_TIME=y |
69 | 78 | CONFIG_CMD_FAT=y |
79 | +CONFIG_CMD_MTDPARTS=y | |
70 | 80 | CONFIG_OF_CONTROL=y |
71 | 81 | CONFIG_SPL_OF_CONTROL=y |
82 | +CONFIG_SPL_MULTI_DTB_FIT=y | |
83 | +CONFIG_SPL_OF_LIST="k3-j721e-r5-common-proc-board k3-j721e-r5-sk" | |
84 | +CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y | |
72 | 85 | CONFIG_ENV_OVERWRITE=y |
73 | -CONFIG_ENV_IS_IN_MMC=y | |
74 | -CONFIG_SYS_REDUNDAND_ENVIRONMENT=y | |
75 | 86 | CONFIG_SYS_RELOC_GD_ENV_ADDR=y |
76 | -CONFIG_SYS_MMC_ENV_PART=1 | |
77 | 87 | CONFIG_DM=y |
78 | 88 | CONFIG_SPL_DM=y |
79 | 89 | CONFIG_SPL_DM_SEQ_ALIAS=y |
80 | 90 | CONFIG_REGMAP=y |
81 | 91 | CONFIG_SPL_REGMAP=y |
92 | +CONFIG_SYSCON=y | |
93 | +CONFIG_SPL_SYSCON=y | |
82 | 94 | CONFIG_SPL_OF_TRANSLATE=y |
83 | 95 | CONFIG_CLK=y |
84 | 96 | CONFIG_SPL_CLK=y |
85 | -CONFIG_CLK_TI_SCI=y | |
97 | +CONFIG_SPL_CLK_CCF=y | |
98 | +CONFIG_SPL_CLK_K3_PLL=y | |
99 | +CONFIG_SPL_CLK_K3=y | |
100 | +CONFIG_SYS_DFU_DATA_BUF_SIZE=0x5000 | |
86 | 101 | CONFIG_DMA_CHANNELS=y |
87 | 102 | CONFIG_TI_K3_NAVSS_UDMA=y |
88 | 103 | CONFIG_TI_SCI_PROTOCOL=y |
89 | 104 | CONFIG_DA8XX_GPIO=y |
105 | +CONFIG_DM_PCA953X=y | |
90 | 106 | CONFIG_DM_I2C=y |
91 | 107 | CONFIG_I2C_SET_DEFAULT_BUS_NUM=y |
92 | 108 | CONFIG_SYS_I2C_OMAP24XX=y |
@@ -94,11 +110,22 @@ CONFIG_DM_MAILBOX=y | ||
94 | 110 | CONFIG_K3_SEC_PROXY=y |
95 | 111 | CONFIG_FS_LOADER=y |
96 | 112 | CONFIG_SPL_FS_LOADER=y |
113 | +CONFIG_ESM_K3=y | |
97 | 114 | CONFIG_K3_AVS0=y |
115 | +CONFIG_ESM_PMIC=y | |
116 | +CONFIG_SUPPORT_EMMC_BOOT=y | |
117 | +CONFIG_SPL_MMC_HS200_SUPPORT=y | |
98 | 118 | CONFIG_MMC_SDHCI=y |
99 | 119 | CONFIG_SPL_MMC_SDHCI_ADMA=y |
100 | 120 | CONFIG_MMC_SDHCI_AM654=y |
101 | 121 | CONFIG_MTD=y |
122 | +CONFIG_DM_MTD=y | |
123 | +CONFIG_MTD_NOR_FLASH=y | |
124 | +CONFIG_CFI_FLASH=y | |
125 | +CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y | |
126 | +CONFIG_FLASH_CFI_MTD=y | |
127 | +CONFIG_SYS_FLASH_CFI=y | |
128 | +CONFIG_HBMC_AM654=y | |
102 | 129 | CONFIG_DM_SPI_FLASH=y |
103 | 130 | CONFIG_SPI_FLASH_SFDP_SUPPORT=y |
104 | 131 | CONFIG_SPI_FLASH_STMICRO=y |
@@ -108,7 +135,7 @@ CONFIG_SPL_PINCTRL=y | ||
108 | 135 | # CONFIG_SPL_PINCTRL_GENERIC is not set |
109 | 136 | CONFIG_PINCTRL_SINGLE=y |
110 | 137 | CONFIG_POWER_DOMAIN=y |
111 | -CONFIG_TI_SCI_POWER_DOMAIN=y | |
138 | +CONFIG_TI_POWER_DOMAIN=y | |
112 | 139 | CONFIG_DM_PMIC=y |
113 | 140 | CONFIG_PMIC_TPS65941=y |
114 | 141 | CONFIG_DM_REGULATOR=y |
@@ -133,5 +160,18 @@ CONFIG_SYSRESET_TI_SCI=y | ||
133 | 160 | CONFIG_TIMER=y |
134 | 161 | CONFIG_SPL_TIMER=y |
135 | 162 | CONFIG_OMAP_TIMER=y |
163 | +CONFIG_USB=y | |
164 | +CONFIG_DM_USB_GADGET=y | |
165 | +CONFIG_SPL_DM_USB_GADGET=y | |
166 | +CONFIG_USB_CDNS3=y | |
167 | +CONFIG_USB_CDNS3_GADGET=y | |
168 | +CONFIG_SPL_USB_CDNS3_GADGET=y | |
169 | +CONFIG_USB_GADGET=y | |
170 | +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" | |
171 | +CONFIG_USB_GADGET_VENDOR_NUM=0x0451 | |
172 | +CONFIG_USB_GADGET_PRODUCT_NUM=0x6163 | |
173 | +CONFIG_USB_GADGET_DOWNLOAD=y | |
136 | 174 | CONFIG_FS_EXT4=y |
137 | 175 | CONFIG_FS_FAT_MAX_CLUSTSIZE=16384 |
176 | +CONFIG_LIB_RATIONAL=y | |
177 | +CONFIG_SPL_LIB_RATIONAL=y |