arm: imx: convert MX23/28 and MXS NAND to Kconfig
Subsystems (5)
v2 cover arm: imx: convert MX23/28 and MXS NAND to Kconfig
From: Stefan Agner <[email protected]>
This converts i.MX23/28 to Kconfig. This helps to properly add dependencies for GPMI NAND (NAND_MXS) configs. Patch 4 is from a previous patchset "mtd: nand: mxs_nand:
improve ECC support".
--
Stefan
Changes in v2:
- Move to arch/arm/mach-imx/mxs/Kconfig
- Fix SoC name
- Move to arch/arm/mach-imx/mxs/Kconfig
Stefan Agner (4):
arm: imx: mx23: Move MX23 selection to Kconfig
arm: imx: mx28: Move MX28 selection to Kconfig
spl: use ARCH_MX23/28 to specify SPL_LDSCRIPT
Convert CONFIG_NAND_MXS to Kconfig
arch/arm/Kconfig | 89 ++++++--------------------------- arch/arm/mach-imx/mxs/Kconfig | 78 +++++++++++++++++++++++++++++ configs/apx4devkit_defconfig | 6 ++- configs/aristainetos2_defconfig | 3 +- configs/aristainetos2b_defconfig | 3 +- configs/aristainetos_defconfig | 3 +- configs/bg0900_defconfig | 6 ++- configs/cm_fx6_defconfig | 11 +--- configs/colibri_imx7_defconfig | 3 +- configs/gwventana_nand_defconfig | 3 +- configs/m28evk_defconfig | 6 ++- configs/mx23_olinuxino_defconfig | 3 +- configs/mx23evk_defconfig | 3 +- configs/mx28evk_auart_console_defconfig | 6 ++- configs/mx28evk_defconfig | 6 ++- configs/mx28evk_nand_defconfig | 6 ++- configs/mx28evk_spi_defconfig | 6 ++- configs/mx6sabreauto_defconfig | 3 +- configs/mx6sxsabreauto_defconfig | 3 +- configs/pcm058_defconfig | 3 +- configs/pfla02_defconfig | 3 ++ configs/platinum_picon_defconfig | 3 +- configs/platinum_titanium_defconfig | 3 +- configs/sansa_fuze_plus_defconfig | 1 + configs/sc_sps_1_defconfig | 3 +- configs/titanium_defconfig | 3 +- configs/ts4600_defconfig | 3 +- configs/xfi3_defconfig | 3 +- drivers/mtd/nand/Kconfig | 2 +- include/configs/apx4devkit.h | 1 - include/configs/aristainetos-common.h | 1 - include/configs/bg0900.h | 3 -- include/configs/cm_fx6.h | 1 - include/configs/colibri_imx7.h | 2 - include/configs/gw_ventana.h | 1 - include/configs/m28evk.h | 1 - include/configs/mx23_olinuxino.h | 1 - include/configs/mx23evk.h | 1 - include/configs/mx28evk.h | 1 - include/configs/mx6sabreauto.h | 1 - include/configs/mx6sxsabreauto.h | 1 - include/configs/mxs.h | 1 - include/configs/pcm058.h | 1 - include/configs/pfla02.h | 1 - include/configs/platinum.h | 1 - include/configs/sansa_fuze_plus.h | 3 -- include/configs/sc_sps_1.h | 1 - include/configs/titanium.h | 1 - include/configs/ts4600.h | 3 -- include/configs/xfi3.h | 3 -- scripts/config_whitelist.txt | 2 - 51 files changed, 160 insertions(+), 146 deletions(-) create mode 100644 arch/arm/mach-imx/mxs/Kconfig
Signature · 1 line
2.16.1
PATCH v2 1/4 arm: imx: mx23: Move MX23 selection to Kconfig
From: Stefan Agner <[email protected]>
The motivation for moving MX23 selection to Kconfig is to be able to better handle NAND MXS selection through Kconfig.
This selection method also aligns with the way other i.MX SoCs are selected in U-Boot.
---
Changes in v2:
- Move to arch/arm/mach-imx/mxs/Kconfig
- Fix SoC name
arch/arm/Kconfig | 38 ++++++++------------------------------ arch/arm/mach-imx/mxs/Kconfig | 35 +++++++++++++++++++++++++++++++++++ configs/mx23_olinuxino_defconfig | 3 ++- configs/mx23evk_defconfig | 3 ++- configs/sansa_fuze_plus_defconfig | 1 + configs/xfi3_defconfig | 3 ++- include/configs/mx23_olinuxino.h | 1 - include/configs/mx23evk.h | 1 - include/configs/sansa_fuze_plus.h | 3 --- include/configs/xfi3.h | 3 --- scripts/config_whitelist.txt | 1 - 11 files changed, 50 insertions(+), 42 deletions(-) create mode 100644 arch/arm/mach-imx/mxs/Kconfig
arch/arm/Kconfig +8 -30
@@ -402,25 +402,12 @@ config TARGET_APX4DEVKIT select SUPPORT_SPL select PL011_SERIAL -config TARGET_XFI3 - bool "Support xfi3" - select CPU_ARM926EJS - select SUPPORT_SPL - select PL011_SERIAL - config TARGET_M28EVK bool "Support m28evk" select CPU_ARM926EJS select SUPPORT_SPL select PL011_SERIAL -config TARGET_MX23EVK - bool "Support mx23evk" - select CPU_ARM926EJS - select SUPPORT_SPL - select BOARD_EARLY_INIT_F - select PL011_SERIAL - config TARGET_MX28EVK bool "Support mx28evk" select CPU_ARM926EJS
@@ -428,25 +415,12 @@ config TARGET_MX28EVK select BOARD_EARLY_INIT_F select PL011_SERIAL -config TARGET_MX23_OLINUXINO - bool "Support mx23_olinuxino" - select CPU_ARM926EJS - select SUPPORT_SPL - select BOARD_EARLY_INIT_F - select PL011_SERIAL - config TARGET_BG0900 bool "Support bg0900" select CPU_ARM926EJS select SUPPORT_SPL select PL011_SERIAL -config TARGET_SANSA_FUZE_PLUS - bool "Support sansa_fuze_plus" - select CPU_ARM926EJS - select SUPPORT_SPL - select PL011_SERIAL - config TARGET_SC_SPS_1 bool "Support sc_sps_1" select CPU_ARM926EJS
@@ -666,6 +640,12 @@ config ARCH_MX8M select DM select SUPPORT_SPL +config ARCH_MX23 + bool "NXP i.MX23 family" + select CPU_ARM926EJS + select PL011_SERIAL + select SUPPORT_SPL + config ARCH_MX25 bool "NXP MX25" select CPU_ARM926EJS
@@ -1270,6 +1250,8 @@ source "arch/arm/mach-imx/mx7ulp/Kconfig" source "arch/arm/mach-imx/mx8m/Kconfig" +source "arch/arm/mach-imx/mxs/Kconfig" + source "arch/arm/mach-omap2/Kconfig" source "arch/arm/cpu/armv8/fsl-layerscape/Kconfig"
@@ -1328,7 +1310,6 @@ source "board/broadcom/bcmnsp/Kconfig" source "board/broadcom/bcmns2/Kconfig" source "board/cavium/thunderx/Kconfig" source "board/cirrus/edb93xx/Kconfig" -source "board/creative/xfi3/Kconfig" source "board/eets/pdu001/Kconfig" source "board/freescale/ls2080a/Kconfig" source "board/freescale/ls2080aqds/Kconfig"
@@ -1344,7 +1325,6 @@ source "board/freescale/ls1046ardb/Kconfig" source "board/freescale/ls1012aqds/Kconfig" source "board/freescale/ls1012ardb/Kconfig" source "board/freescale/ls1012afrdm/Kconfig" -source "board/freescale/mx23evk/Kconfig" source "board/freescale/mx28evk/Kconfig" source "board/freescale/mx31ads/Kconfig" source "board/freescale/mx31pdk/Kconfig"
@@ -1358,10 +1338,8 @@ source "board/hisilicon/hikey/Kconfig" source "board/hisilicon/poplar/Kconfig" source "board/imx31_phycore/Kconfig" source "board/isee/igep003x/Kconfig" -source "board/olimex/mx23_olinuxino/Kconfig" source "board/phytec/pcm051/Kconfig" source "board/ppcag/bg0900/Kconfig" -source "board/sandisk/sansa_fuze_plus/Kconfig" source "board/schulercontrol/sc_sps_1/Kconfig" source "board/silica/pengwyn/Kconfig" source "board/spear/spear300/Kconfig"
arch/arm/mach-imx/mxs/Kconfig new file +35 -0
@@ -0,0 +1,35 @@ +if ARCH_MX23 + +config MX23 + bool + default y + +choice + prompt "MX23 board select" + optional + +config TARGET_MX23_OLINUXINO + bool "Support mx23_olinuxino" + select BOARD_EARLY_INIT_F + +config TARGET_MX23EVK + bool "Support mx23evk" + select BOARD_EARLY_INIT_F + +config TARGET_SANSA_FUZE_PLUS + bool "Support sansa_fuze_plus" + +config TARGET_XFI3 + bool "Support xfi3" + +endchoice + +config SYS_SOC + default "mxs" + +source "board/olimex/mx23_olinuxino/Kconfig" +source "board/freescale/mx23evk/Kconfig" +source "board/sandisk/sansa_fuze_plus/Kconfig" +source "board/creative/xfi3/Kconfig" + +endif
configs/mx23_olinuxino_defconfig +2 -1
@@ -1,8 +1,9 @@ CONFIG_ARM=y -CONFIG_TARGET_MX23_OLINUXINO=y +CONFIG_ARCH_MX23=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_TARGET_MX23_OLINUXINO=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y
configs/mx23evk_defconfig +2 -1
@@ -1,8 +1,9 @@ CONFIG_ARM=y -CONFIG_TARGET_MX23EVK=y +CONFIG_ARCH_MX23=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_TARGET_MX23EVK=y CONFIG_SPL_SERIAL_SUPPORT=y # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/sansa_fuze_plus_defconfig +1 -0
@@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX23=y CONFIG_TARGET_SANSA_FUZE_PLUS=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/xfi3_defconfig +2 -1
@@ -1,8 +1,9 @@ CONFIG_ARM=y -CONFIG_TARGET_XFI3=y +CONFIG_ARCH_MX23=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_TARGET_XFI3=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y
include/configs/mx23_olinuxino.h +0 -1
@@ -7,7 +7,6 @@#define __CONFIGS_MX23_OLINUXINO_H__/* System configurations */ -#define CONFIG_MX23 /* i.MX23 SoC */ #define CONFIG_MACH_TYPE 4105/* U-Boot Commands */
include/configs/mx23evk.h +0 -1
@@ -10,7 +10,6 @@#define __CONFIGS_MX23EVK_H__/* System configurations */ -#define CONFIG_MX23 /* i.MX23 SoC */ #define CONFIG_MACH_TYPE MACH_TYPE_MX23EVK/* U-Boot Commands */
include/configs/sansa_fuze_plus.h +0 -3
@@ -6,9 +6,6 @@#ifndef __CONFIGS_SANSA_FUZE_PLUS_H__#define __CONFIGS_SANSA_FUZE_PLUS_H__ -/* System configurations */ -#define CONFIG_MX23 /* i.MX23 SoC */ -/* U-Boot Commands */ /* Memory configuration */
include/configs/xfi3.h +0 -3
@@ -6,9 +6,6 @@#ifndef __CONFIGS_XFI3_H__#define __CONFIGS_XFI3_H__ -/* System configurations */ -#define CONFIG_MX23 /* i.MX23 SoC */ -/* U-Boot Commands */ /* Memory configuration */
scripts/config_whitelist.txt +0 -1
@@ -1409,7 +1409,6 @@ CONFIG_MVSATA_IDE_USE_PORT1 CONFIG_MV_ETH_RXQ CONFIG_MV_I2C_NUM CONFIG_MV_I2C_REG -CONFIG_MX23 CONFIG_MX25_CLK32 CONFIG_MX25_HCLK_FREQ CONFIG_MX27
Signature · 1 line
2.16.1
PATCH v2 1/4 arm: imx: mx23: Move MX23 selection to Kconfig
Quoted 9 lines · Stefan Agner
From: Stefan Agner <[email protected]>
The motivation for moving MX23 selection to
Kconfigis to be able to better handle NAND MXS selection throughKconfig.This selection method also aligns with the way other i.MX SoCs are selected in U-Boot.
Signed-off-by Stefan Agner <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH v2 2/4 arm: imx: mx28: Move MX28 selection to Kconfig
In reply to Stefan AgnerFrom: Stefan Agner <[email protected]>
The motivation for moving MX28 selection to Kconfig is to be able to better handle NAND MXS selection through Kconfig.
This selection method also aligns with the way other i.MX SoCs are selected in U-Boot.
---
Changes in v2:
- Move to arch/arm/mach-imx/mxs/Kconfig
arch/arm/Kconfig | 49 ++++----------------------------- arch/arm/mach-imx/mxs/Kconfig | 43 +++++++++++++++++++++++++++++ configs/apx4devkit_defconfig | 3 +- configs/bg0900_defconfig | 3 +- configs/m28evk_defconfig | 3 +- configs/mx28evk_auart_console_defconfig | 3 +- configs/mx28evk_defconfig | 3 +- configs/mx28evk_nand_defconfig | 3 +- configs/mx28evk_spi_defconfig | 3 +- configs/sc_sps_1_defconfig | 3 +- configs/ts4600_defconfig | 3 +- include/configs/apx4devkit.h | 1 - include/configs/bg0900.h | 3 -- include/configs/m28evk.h | 1 - include/configs/mx28evk.h | 1 - include/configs/sc_sps_1.h | 1 - include/configs/ts4600.h | 3 -- scripts/config_whitelist.txt | 1 - 18 files changed, 67 insertions(+), 63 deletions(-)
arch/arm/Kconfig +6 -43
@@ -396,37 +396,6 @@ config TARGET_APF27 select CPU_ARM926EJS select SUPPORT_SPL -config TARGET_APX4DEVKIT - bool "Support apx4devkit" - select CPU_ARM926EJS - select SUPPORT_SPL - select PL011_SERIAL - -config TARGET_M28EVK - bool "Support m28evk" - select CPU_ARM926EJS - select SUPPORT_SPL - select PL011_SERIAL - -config TARGET_MX28EVK - bool "Support mx28evk" - select CPU_ARM926EJS - select SUPPORT_SPL - select BOARD_EARLY_INIT_F - select PL011_SERIAL - -config TARGET_BG0900 - bool "Support bg0900" - select CPU_ARM926EJS - select SUPPORT_SPL - select PL011_SERIAL - -config TARGET_SC_SPS_1 - bool "Support sc_sps_1" - select CPU_ARM926EJS - select SUPPORT_SPL - select PL011_SERIAL - config ORION5X bool "Marvell Orion" select CPU_ARM926EJS
@@ -650,6 +619,12 @@ config ARCH_MX25 bool "NXP MX25" select CPU_ARM926EJS +config ARCH_MX28 + bool "NXP i.MX28 family" + select CPU_ARM926EJS + select PL011_SERIAL + select SUPPORT_SPL + config ARCH_MX7ULP bool "NXP MX7ULP" select CPU_V7
@@ -767,12 +742,6 @@ config ARCH_SUNXI imply SPL_SERIAL_SUPPORT imply USB_GADGET -config TARGET_TS4600 - bool "Support TS4600" - select CPU_ARM926EJS - select SUPPORT_SPL - select PL011_SERIAL - config ARCH_VF610 bool "Freescale Vybrid" select CPU_V7
@@ -1294,7 +1263,6 @@ source "arch/arm/cpu/armv8/Kconfig" source "arch/arm/mach-imx/Kconfig" -source "board/aries/m28evk/Kconfig" source "board/bosch/shc/Kconfig" source "board/CarMediaLab/flea3/Kconfig" source "board/Marvell/aspenite/Kconfig"
@@ -1302,7 +1270,6 @@ source "board/Marvell/gplugd/Kconfig" source "board/armadeus/apf27/Kconfig" source "board/armltd/vexpress/Kconfig" source "board/armltd/vexpress64/Kconfig" -source "board/bluegiga/apx4devkit/Kconfig" source "board/broadcom/bcm23550_w1d/Kconfig" source "board/broadcom/bcm28155_ap/Kconfig" source "board/broadcom/bcmcygnus/Kconfig"
@@ -1325,7 +1292,6 @@ source "board/freescale/ls1046ardb/Kconfig" source "board/freescale/ls1012aqds/Kconfig" source "board/freescale/ls1012ardb/Kconfig" source "board/freescale/ls1012afrdm/Kconfig" -source "board/freescale/mx28evk/Kconfig" source "board/freescale/mx31ads/Kconfig" source "board/freescale/mx31pdk/Kconfig" source "board/freescale/mx35pdk/Kconfig"
@@ -1339,8 +1305,6 @@ source "board/hisilicon/poplar/Kconfig" source "board/imx31_phycore/Kconfig" source "board/isee/igep003x/Kconfig" source "board/phytec/pcm051/Kconfig" -source "board/ppcag/bg0900/Kconfig" -source "board/schulercontrol/sc_sps_1/Kconfig" source "board/silica/pengwyn/Kconfig" source "board/spear/spear300/Kconfig" source "board/spear/spear310/Kconfig"
@@ -1352,7 +1316,6 @@ source "board/tcl/sl50/Kconfig" source "board/birdland/bav335x/Kconfig" source "board/timll/devkit3250/Kconfig" source "board/toradex/colibri_pxa270/Kconfig" -source "board/technologic/ts4600/Kconfig" source "board/vscom/baltos/Kconfig" source "board/woodburn/Kconfig" source "board/work-microwave/work_92105/Kconfig"
arch/arm/mach-imx/mxs/Kconfig +43 -0
46 lines not on this page · raw message
configs/apx4devkit_defconfig +2 -1
@@ -1,8 +1,9 @@ CONFIG_ARM=y -CONFIG_TARGET_APX4DEVKIT=y +CONFIG_ARCH_MX28=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_TARGET_APX4DEVKIT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_BOOTDELAY=1 CONFIG_VERSION_VARIABLE=y
configs/bg0900_defconfig +2 -1
@@ -1,8 +1,9 @@ CONFIG_ARM=y -CONFIG_TARGET_BG0900=y +CONFIG_ARCH_MX28=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_TARGET_BG0900=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y
configs/m28evk_defconfig +2 -1
@@ -1,8 +1,9 @@ CONFIG_ARM=y -CONFIG_TARGET_M28EVK=y +CONFIG_ARCH_MX28=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_TARGET_M28EVK=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_FIT=y CONFIG_BOOTDELAY=3
configs/mx28evk_auart_console_defconfig +2 -1
@@ -1,8 +1,9 @@ CONFIG_ARM=y -CONFIG_TARGET_MX28EVK=y +CONFIG_ARCH_MX28=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_TARGET_MX28EVK=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SYS_EXTRA_OPTIONS="MXS_AUART,MXS_AUART_BASE=MXS_UARTAPP3_BASE" # CONFIG_CONSOLE_MUX is not set
configs/mx28evk_defconfig +2 -1
@@ -1,8 +1,9 @@ CONFIG_ARM=y -CONFIG_TARGET_MX28EVK=y +CONFIG_ARCH_MX28=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_TARGET_MX28EVK=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_FIT=y # CONFIG_CONSOLE_MUX is not set
configs/mx28evk_nand_defconfig +2 -1
@@ -1,8 +1,9 @@ CONFIG_ARM=y -CONFIG_TARGET_MX28EVK=y +CONFIG_ARCH_MX28=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_TARGET_MX28EVK=y CONFIG_SPL_SERIAL_SUPPORT=y # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/mx28evk_spi_defconfig +2 -1
@@ -1,8 +1,9 @@ CONFIG_ARM=y -CONFIG_TARGET_MX28EVK=y +CONFIG_ARCH_MX28=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_TARGET_MX28EVK=y CONFIG_SPL_SERIAL_SUPPORT=y # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/sc_sps_1_defconfig +2 -1
@@ -1,8 +1,9 @@ CONFIG_ARM=y -CONFIG_TARGET_SC_SPS_1=y +CONFIG_ARCH_MX28=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_TARGET_SC_SPS_1=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y
configs/ts4600_defconfig +2 -1
@@ -1,7 +1,8 @@ CONFIG_ARM=y -CONFIG_TARGET_TS4600=y +CONFIG_ARCH_MX28=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_TARGET_TS4600=y CONFIG_FIT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_CPUINFO is not set
include/configs/apx4devkit.h +0 -1
@@ -15,7 +15,6 @@#define __CONFIGS_APX4DEVKIT_H__/* System configurations */ -#define CONFIG_MX28 /* i.MX28 SoC */ #define CONFIG_MACH_TYPE MACH_TYPE_APX4DEVKIT/* Memory configuration */
include/configs/bg0900.h +0 -3
@@ -6,9 +6,6 @@#ifndef __CONFIGS_BG0900_H__#define __CONFIGS_BG0900_H__ -/* System configurations */ -#define CONFIG_MX28 /* i.MX28 SoC */ -/* Memory configuration */ #define CONFIG_NR_DRAM_BANKS 1/* 1 bank of DRAM */ #define PHYS_SDRAM_1 0x40000000/* Base address */
include/configs/m28evk.h +0 -1
@@ -8,7 +8,6 @@#define __CONFIGS_M28EVK_H__/* System configurations */ -#define CONFIG_MX28 /* i.MX28 SoC */ #define CONFIG_MACH_TYPE MACH_TYPE_M28EVK#define CONFIG_TIMESTAMP /* Print image info with timestamp */
include/configs/mx28evk.h +0 -1
@@ -12,7 +12,6 @@#define __CONFIGS_MX28EVK_H__/* System configurations */ -#define CONFIG_MX28 /* i.MX28 SoC */ #define CONFIG_MACH_TYPE MACH_TYPE_MX28EVK/* Memory configuration */
include/configs/sc_sps_1.h +0 -1
@@ -10,7 +10,6 @@#define __CONFIGS_SC_SPS_1_H__/* System configuration */ -#define CONFIG_MX28 /* i.MX28 SoC */ #define CONFIG_MACH_TYPE MACH_TYPE_SC_SPS_1/* U-Boot Commands */
include/configs/ts4600.h +0 -3
@@ -14,9 +14,6 @@#ifndef __CONFIGS_TS4600_H__#define __CONFIGS_TS4600_H__ -/* System configurations */ -#define CONFIG_MX28 /* i.MX28 SoC */ -/* U-Boot Commands */ /* Memory configuration */
scripts/config_whitelist.txt +0 -1
@@ -1414,7 +1414,6 @@ CONFIG_MX25_HCLK_FREQ CONFIG_MX27 CONFIG_MX27_CLK32 CONFIG_MX27_TIMER_HIGH_PRECISION -CONFIG_MX28 CONFIG_MX28_FEC_MAC_IN_OCOTP CONFIG_MX31 CONFIG_MX31_CLK32
Signature · 1 line
2.16.1
PATCH v2 2/4 arm: imx: mx28: Move MX28 selection to Kconfig
Quoted 9 lines · Stefan Agner
From: Stefan Agner <[email protected]>
The motivation for moving MX28 selection to
Kconfigis to be able to better handle NAND MXS selection throughKconfig.This selection method also aligns with the way other i.MX SoCs are selected in U-Boot.
Signed-off-by Stefan Agner <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH v2 3/4 spl: use ARCH_MX23/28 to specify SPL_LDSCRIPT
In reply to Stefan AgnerFrom: Stefan Agner <[email protected]>
Simplify SPL_LDSCRIPT config by using the new arch Kconfig configurations ARCH_MX23 and ARCH_MX28.
---
Changes in v2: None
arch/arm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/Kconfig +1 -1
@@ -1326,7 +1326,7 @@ source "arch/arm/Kconfig.debug" endmenu config SPL_LDSCRIPT - default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if TARGET_APX4DEVKIT || TARGET_BG0900 || TARGET_M28EVK || TARGET_MX23_OLINUXINO || TARGET_MX23EVK || TARGET_MX28EVK || TARGET_SANSA_FUZE_PLUS || TARGET_SC_SPS_1 || TARGET_TS4600 || TARGET_XFI3 + default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if ARCH_MX23 || ARCH_MX28 default "arch/arm/cpu/arm1136/u-boot-spl.lds" if CPU_ARM1136 default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64
Signature · 1 line
2.16.1
PATCH v2 3/4 spl: use ARCH_MX23/28 to specify SPL_LDSCRIPT
Quoted 6 lines · Stefan Agner
From: Stefan Agner <[email protected]>
Simplify
SPL_LDSCRIPTconfig by using the new archKconfigconfigurationsARCH_MX23andARCH_MX28.Signed-off-by Stefan Agner <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH v2 4/4 Convert CONFIG_NAND_MXS to Kconfig
In reply to Stefan AgnerFrom: Stefan Agner <[email protected]>
This converts CONFIG_NAND_MXS to Kconfig.
---
Changes in v2: None
configs/apx4devkit_defconfig | 3 ++- configs/aristainetos2_defconfig | 3 ++- configs/aristainetos2b_defconfig | 3 ++- configs/aristainetos_defconfig | 3 ++- configs/bg0900_defconfig | 3 ++- configs/cm_fx6_defconfig | 11 ++--------- configs/colibri_imx7_defconfig | 3 ++- configs/gwventana_nand_defconfig | 3 ++- configs/m28evk_defconfig | 3 ++- configs/mx28evk_auart_console_defconfig | 3 ++- configs/mx28evk_defconfig | 3 ++- configs/mx28evk_nand_defconfig | 3 ++- configs/mx28evk_spi_defconfig | 3 ++- configs/mx6sabreauto_defconfig | 3 ++- configs/mx6sxsabreauto_defconfig | 3 ++- configs/pcm058_defconfig | 3 ++- configs/pfla02_defconfig | 3 +++ configs/platinum_picon_defconfig | 3 ++- configs/platinum_titanium_defconfig | 3 ++- configs/titanium_defconfig | 3 ++- drivers/mtd/nand/Kconfig | 2 +- include/configs/aristainetos-common.h | 1 - include/configs/cm_fx6.h | 1 - include/configs/colibri_imx7.h | 2 -- include/configs/gw_ventana.h | 1 - include/configs/mx6sabreauto.h | 1 - include/configs/mx6sxsabreauto.h | 1 - include/configs/mxs.h | 1 - include/configs/pcm058.h | 1 - include/configs/pfla02.h | 1 - include/configs/platinum.h | 1 - include/configs/titanium.h | 1 - 32 files changed, 42 insertions(+), 40 deletions(-)
configs/apx4devkit_defconfig +2 -1
@@ -14,7 +14,6 @@ CONFIG_SPL=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y
@@ -28,6 +27,8 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:128k(bootstrap),1024k(boot),768k(env CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_MXS=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y
configs/aristainetos2_defconfig +2 -1
@@ -14,7 +14,6 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y
@@ -31,6 +30,8 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_MTD_UBI_FASTMAP=y
configs/aristainetos2b_defconfig +2 -1
@@ -14,7 +14,6 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y
@@ -31,6 +30,8 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_MTD_UBI_FASTMAP=y
configs/aristainetos_defconfig +2 -1
@@ -14,7 +14,6 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y
@@ -31,6 +30,8 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_MTD_UBI_FASTMAP=y
configs/bg0900_defconfig +2 -1
@@ -17,7 +17,6 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y
@@ -27,6 +26,8 @@ CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_DOS_PARTITION=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y
configs/cm_fx6_defconfig +2 -9
@@ -20,9 +20,7 @@ CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd; run legacy_bootcmd" CONFIG_SPL=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x80 CONFIG_SPL_I2C_SUPPORT=y -CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="CM-FX6 # " -CONFIG_CMD_BOOTZ=y # CONFIG_CMD_XIMG is not set CONFIG_CMD_GREPENV=y CONFIG_CMD_EEPROM=y
@@ -35,20 +33,13 @@ CONFIG_CMD_I2C=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_SATA=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_PING=y CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nor0=spi0.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:768k(uboot),256k(uboot-environment),-(reserved)"
@@ -57,6 +48,8 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DWC_AHSATA=y CONFIG_DM_KEYBOARD=y CONFIG_DM_MMC=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_SPI_FLASH_EON=y
configs/colibri_imx7_defconfig +2 -1
@@ -23,7 +23,6 @@ CONFIG_CMD_DFU=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_NAND_TORTURE=y CONFIG_CMD_USB=y
@@ -45,6 +44,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_DFU_MMC=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y
configs/gwventana_nand_defconfig +2 -1
@@ -36,7 +36,6 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x20000 CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_PCI=y CONFIG_CMD_USB=y
@@ -57,6 +56,8 @@ CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y CONFIG_DM=y CONFIG_DWC_AHSATA=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_PHYLIB=y CONFIG_NETDEVICES=y CONFIG_E1000=y
configs/m28evk_defconfig +2 -1
@@ -22,7 +22,6 @@ CONFIG_CMD_GREPENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y
@@ -42,6 +41,8 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(u-boot),512k(env1),512k(env2),14m CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_MXS=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_USB=y
configs/mx28evk_auart_console_defconfig +2 -1
@@ -17,7 +17,6 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y
@@ -37,6 +36,8 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),5 CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_MMC=y CONFIG_MMC_MXS=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_USB=y
configs/mx28evk_defconfig +2 -1
@@ -17,7 +17,6 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y
@@ -37,6 +36,8 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),5 CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_MMC=y CONFIG_MMC_MXS=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_USB=y
configs/mx28evk_nand_defconfig +2 -1
@@ -16,7 +16,6 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y
@@ -36,6 +35,8 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),5 CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_MXS=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_USB=y
configs/mx28evk_spi_defconfig +2 -1
@@ -16,7 +16,6 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y
@@ -36,6 +35,8 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),5 CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_MMC_MXS=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_USB=y
configs/mx6sabreauto_defconfig +2 -1
@@ -23,7 +23,6 @@ CONFIG_CMD_DFU=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_PART=y CONFIG_CMD_SF=y
@@ -40,6 +39,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DFU_MMC=y CONFIG_DFU_SF=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y
configs/mx6sxsabreauto_defconfig +2 -1
@@ -10,7 +10,6 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y
@@ -31,6 +30,8 @@ CONFIG_DM_GPIO=y CONFIG_DM_PCA953X=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y
configs/pcm058_defconfig +2 -1
@@ -26,7 +26,6 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_DHCP=y
@@ -48,6 +47,8 @@ CONFIG_EFI_PARTITION=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y CONFIG_MTD=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y
configs/pfla02_defconfig +3 -0
@@ -26,6 +26,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +# CONFIG_CMD_NAND is not set CONFIG_CMD_SF=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y
@@ -45,6 +46,8 @@ CONFIG_EFI_PARTITION=y # CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_DM=y CONFIG_MTD=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y
configs/platinum_picon_defconfig +2 -1
@@ -23,7 +23,6 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set
@@ -41,6 +40,8 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:14M(spl),2M(uboot),512k(env1),512k(env2),495M(ubi0),14M(res0),2M(res1),512k(res2),512k(res3),-(ubi1)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_PHYLIB=y CONFIG_USB=y CONFIG_USB_STORAGE=y
configs/platinum_titanium_defconfig +2 -1
@@ -23,7 +23,6 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set
@@ -41,6 +40,8 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:14M(spl),2M(uboot),512k(env1),512k(env2),-(ubi)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y
configs/titanium_defconfig +2 -1
@@ -11,7 +11,6 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set
@@ -29,6 +28,8 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:16M(uboot),512k(env1),512k(env2),-(ubi)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y
drivers/mtd/nand/Kconfig +1 -1
@@ -140,7 +140,7 @@ config NAND_MXC config NAND_MXS bool "MXS NAND support" - depends on MX6 || MX7 + depends on MX23 || MX28 || MX6 || MX7 imply CMD_NAND help This enables NAND driver for the NAND flash controller on the
include/configs/aristainetos-common.h +0 -1
@@ -176,7 +176,6 @@#define CONFIG_SYS_I2C_NOPROBES { {0, 0x00} }/* NAND stuff */ -#define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1#define CONFIG_SYS_NAND_BASE 0x40000000#define CONFIG_SYS_NAND_5_ADDR_CYCLE
include/configs/cm_fx6.h +0 -1
@@ -182,7 +182,6 @@#define CONFIG_SYS_NAND_BASE 0x40000000#define CONFIG_SYS_NAND_MAX_CHIPS 1#define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_NAND_MXS #define CONFIG_SYS_NAND_ONFI_DETECTION /* APBH DMA is required for NAND support */ #define CONFIG_APBH_DMA
include/configs/colibri_imx7.h +0 -2
@@ -158,8 +158,6 @@#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE#endif -#define CONFIG_NAND_MXS -/* NAND stuff */ #define CONFIG_SYS_MAX_NAND_DEVICE 1#define CONFIG_SYS_NAND_BASE 0x40000000
include/configs/gw_ventana.h +0 -1
@@ -67,7 +67,6 @@#elif defined(CONFIG_SPL_NAND_SUPPORT )/* Enable NAND support */ #ifdef CONFIG_CMD_NAND -#define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1#define CONFIG_SYS_NAND_BASE 0x40000000#define CONFIG_SYS_NAND_5_ADDR_CYCLE
include/configs/mx6sabreauto.h +0 -1
@@ -66,7 +66,6 @@#define CONFIG_SYS_I2C_SPEED 100000/* NAND stuff */ -#define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1#define CONFIG_SYS_NAND_BASE 0x40000000#define CONFIG_SYS_NAND_5_ADDR_CYCLE
include/configs/mx6sxsabreauto.h +0 -1
@@ -119,7 +119,6 @@#define CONFIG_SYS_I2C_SPEED 100000/* NAND stuff */ -#define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1#define CONFIG_SYS_NAND_BASE 0x40000000#define CONFIG_SYS_NAND_5_ADDR_CYCLE
include/configs/mxs.h +0 -1
@@ -136,7 +136,6 @@/* NAND */ #ifdef CONFIG_CMD_NAND -#define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1#define CONFIG_SYS_NAND_BASE 0x60000000#define CONFIG_SYS_NAND_5_ADDR_CYCLE
include/configs/pcm058.h +0 -1
@@ -58,7 +58,6 @@#ifndef CONFIG_SPL_BUILD /* Enable NAND support */ -#define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1#define CONFIG_SYS_NAND_BASE 0x40000000#define CONFIG_SYS_NAND_5_ADDR_CYCLE
include/configs/pfla02.h +0 -1
@@ -57,7 +57,6 @@#define CONFIG_CMD_NAND /* Enable NAND support */ #define CONFIG_CMD_NAND_TRIMFFS -#define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1#define CONFIG_SYS_NAND_BASE 0x40000000#define CONFIG_SYS_NAND_5_ADDR_CYCLE
include/configs/platinum.h +0 -1
@@ -66,7 +66,6 @@#ifdef CONFIG_CMD_NAND /* NAND config */ -#define CONFIG_NAND_MXS #ifndef CONFIG_SYS_NAND_MAX_CHIPS #define CONFIG_SYS_NAND_MAX_CHIPS 2#endif
include/configs/titanium.h +0 -1
@@ -142,7 +142,6 @@#ifdef CONFIG_CMD_NAND /* NAND stuff */ -#define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1#define CONFIG_SYS_NAND_BASE 0x40000000#define CONFIG_SYS_NAND_5_ADDR_CYCLE
Signature · 1 line
2.16.1
PATCH v2 4/4 Convert CONFIG_NAND_MXS to Kconfig
Quoted 5 lines · Stefan Agner
From: Stefan Agner <[email protected]>
This converts
CONFIG_NAND_MXStoKconfig.Signed-off-by Stefan Agner <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom