Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit edd1653f04b3fae7e377be5f89e592f2b6266426

Authored by Adam Ford
Committed by Tom Rini
1 parent fc760cc6e8
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

Convert CONFIG_SPL_OMAP3_ID_NAND to Kconfig 

This converts the following to Kconfig:
   CONFIG_SPL_OMAP3_ID_NAND

Signed-off-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

Showing 11 changed files with 7 additions and 13 deletions Side-by-side Diff

... ... @@ -2835,10 +2835,6 @@
2835 2835 Define this if you need to first read the OOB and then the
2836 2836 data. This is used, for example, on davinci platforms.
2837 2837  
2838   - CONFIG_SPL_OMAP3_ID_NAND
2839   - Support for an OMAP3-specific set of functions to return the
2840   - ID and MFR of the first attached NAND chip, if present.
2841   -
2842 2838 CONFIG_SPL_RAM_DEVICE
2843 2839 Support for running image already present in ram, in SPL binary
2844 2840  
arch/arm/mach-omap2/Kconfig
Diff comments   View file @ edd1653
... ... @@ -20,6 +20,7 @@
20 20 imply SPL_LIBGENERIC_SUPPORT
21 21 imply SPL_MMC_SUPPORT
22 22 imply SPL_NAND_SUPPORT
  23 + imply SPL_OMAP3_ID_NAND
23 24 imply SPL_POWER_SUPPORT
24 25 imply SPL_SERIAL_SUPPORT
25 26 imply SYS_I2C_OMAP24XX
arch/arm/mach-omap2/omap3/Kconfig
Diff comments   View file @ edd1653
... ... @@ -149,6 +149,12 @@
149 149  
150 150 endchoice
151 151  
  152 +config SPL_OMAP3_ID_NAND
  153 + bool "Support OMAP3-specific ID and MFR function"
  154 + help
  155 + Support for an OMAP3-specific set of functions to return the
  156 + ID and MFR of the first attached NAND chip, if present.
  157 +
152 158 config SYS_SOC
153 159 default "omap3"
154 160  
include/configs/cm_t35.h
Diff comments   View file @ edd1653
... ... @@ -258,7 +258,6 @@
258 258 #define CONFIG_SPL_NAND_BASE
259 259 #define CONFIG_SPL_NAND_DRIVERS
260 260 #define CONFIG_SPL_NAND_ECC
261   -#define CONFIG_SPL_OMAP3_ID_NAND
262 261  
263 262 /* NAND boot config */
264 263 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
include/configs/omap3_beagle.h
Diff comments   View file @ edd1653
... ... @@ -251,7 +251,6 @@
251 251 #define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
252 252  
253 253 /* Defines for SPL */
254   -#define CONFIG_SPL_OMAP3_ID_NAND
255 254  
256 255 /* NAND boot config */
257 256 #define CONFIG_SYS_NAND_BUSWIDTH_16BIT
include/configs/omap3_cairo.h
Diff comments   View file @ edd1653
... ... @@ -177,7 +177,6 @@
177 177 #define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
178 178  
179 179 /* Defines for SPL */
180   -#define CONFIG_SPL_OMAP3_ID_NAND
181 180  
182 181 /* NAND boot config */
183 182 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
include/configs/omap3_evm.h
Diff comments   View file @ edd1653
... ... @@ -73,7 +73,6 @@
73 73 #define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
74 74 #define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
75 75 #define CONFIG_ENV_OVERWRITE
76   -#define CONFIG_SPL_OMAP3_ID_NAND
77 76 #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
78 77 #define CONFIG_MTD_PARTITIONS /* required for UBI partition support */
79 78 #endif /* CONFIG_NAND */
include/configs/omap3_igep00x0.h
Diff comments   View file @ edd1653
... ... @@ -119,7 +119,6 @@
119 119 #define CONFIG_SYS_ONENAND_BLOCK_SIZE (128*1024)
120 120  
121 121 /* NAND config */
122   -#define CONFIG_SPL_OMAP3_ID_NAND
123 122 #define CONFIG_SYS_NAND_BUSWIDTH_16BIT
124 123 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
125 124 #define CONFIG_SYS_NAND_PAGE_COUNT 64
include/configs/omap3_logic.h
Diff comments   View file @ edd1653
... ... @@ -253,8 +253,6 @@
253 253  
254 254 /* Defines for SPL */
255 255  
256   -#define CONFIG_SPL_OMAP3_ID_NAND
257   -
258 256 /* NAND: SPL falcon mode configs */
259 257 #ifdef CONFIG_SPL_OS_BOOT
260 258 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000
include/configs/tao3530.h
Diff comments   View file @ edd1653
... ... @@ -239,7 +239,6 @@
239 239 #define CONFIG_SPL_NAND_BASE
240 240 #define CONFIG_SPL_NAND_DRIVERS
241 241 #define CONFIG_SPL_NAND_ECC
242   -#define CONFIG_SPL_OMAP3_ID_NAND
243 242  
244 243 /* NAND boot config */
245 244 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
scripts/config_whitelist.txt
Diff comments   View file @ edd1653
... ... @@ -2223,7 +2223,6 @@
2223 2223 CONFIG_SPL_NAND_SOFTECC
2224 2224 CONFIG_SPL_NAND_WORKSPACE
2225 2225 CONFIG_SPL_NO_CPU_SUPPORT_CODE
2226   -CONFIG_SPL_OMAP3_ID_NAND
2227 2226 CONFIG_SPL_PAD_TO
2228 2227 CONFIG_SPL_PANIC_ON_RAW_IMAGE
2229 2228 CONFIG_SPL_PBL_PAD