Use separated TARGET_T1042RDB_PI to simplify config options. Remove macro CONFIG_T1042RDB_PI.
Signed-off-by: York Sun york.sun@nxp.com ---
arch/powerpc/cpu/mpc85xx/Kconfig | 6 ++++++ board/freescale/t104xrdb/Kconfig | 2 +- configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig | 4 ++-- configs/T1042RDB_PI_NAND_defconfig | 4 ++-- configs/T1042RDB_PI_SDCARD_defconfig | 4 ++-- configs/T1042RDB_PI_SPIFLASH_defconfig | 4 ++-- configs/T1042RDB_PI_defconfig | 3 +-- include/configs/T104xRDB.h | 16 ++++++++-------- scripts/config_whitelist.txt | 1 - 9 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index ef41869..980439e 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -230,6 +230,12 @@ config TARGET_T1042RDB select SUPPORT_SPL select PHYS_64BIT
+config TARGET_T1042RDB_PI + bool "Support T1042RDB_PI" + select ARCH_T1042 + select SUPPORT_SPL + select PHYS_64BIT + config TARGET_T208XQDS bool "Support T208xQDS" select SUPPORT_SPL diff --git a/board/freescale/t104xrdb/Kconfig b/board/freescale/t104xrdb/Kconfig index 2a633c0..410c9a5 100644 --- a/board/freescale/t104xrdb/Kconfig +++ b/board/freescale/t104xrdb/Kconfig @@ -1,4 +1,4 @@ -if TARGET_T1040RDB || TARGET_T1040D4RDB || TARGET_T1042RDB +if TARGET_T1040RDB || TARGET_T1040D4RDB || TARGET_T1042RDB || TARGET_T1042RDB_PI
config SYS_BOARD default "t104xrdb" diff --git a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig index 4fbb792..c07a29c 100644 --- a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig +++ b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig @@ -8,12 +8,12 @@ CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_VIDEO=y CONFIG_MPC85xx=y -CONFIG_TARGET_T1042RDB=y +CONFIG_TARGET_T1042RDB_PI=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,NAND,SECURE_BOOT" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,NAND,SECURE_BOOT" CONFIG_BOOTDELAY=0 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set diff --git a/configs/T1042RDB_PI_NAND_defconfig b/configs/T1042RDB_PI_NAND_defconfig index e15c3c4..d8aa1f7 100644 --- a/configs/T1042RDB_PI_NAND_defconfig +++ b/configs/T1042RDB_PI_NAND_defconfig @@ -8,12 +8,12 @@ CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_VIDEO=y CONFIG_MPC85xx=y -CONFIG_TARGET_T1042RDB=y +CONFIG_TARGET_T1042RDB_PI=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,NAND" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,NAND" CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set diff --git a/configs/T1042RDB_PI_SDCARD_defconfig b/configs/T1042RDB_PI_SDCARD_defconfig index 860b59e..af98400 100644 --- a/configs/T1042RDB_PI_SDCARD_defconfig +++ b/configs/T1042RDB_PI_SDCARD_defconfig @@ -8,12 +8,12 @@ CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_VIDEO=y CONFIG_MPC85xx=y -CONFIG_TARGET_T1042RDB=y +CONFIG_TARGET_T1042RDB_PI=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SDCARD" CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set diff --git a/configs/T1042RDB_PI_SPIFLASH_defconfig b/configs/T1042RDB_PI_SPIFLASH_defconfig index 483980b..369944d 100644 --- a/configs/T1042RDB_PI_SPIFLASH_defconfig +++ b/configs/T1042RDB_PI_SPIFLASH_defconfig @@ -9,12 +9,12 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_VIDEO=y CONFIG_MPC85xx=y -CONFIG_TARGET_T1042RDB=y +CONFIG_TARGET_T1042RDB_PI=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH" CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set diff --git a/configs/T1042RDB_PI_defconfig b/configs/T1042RDB_PI_defconfig index 6e66ffc..4a9bd3a 100644 --- a/configs/T1042RDB_PI_defconfig +++ b/configs/T1042RDB_PI_defconfig @@ -1,12 +1,11 @@ CONFIG_PPC=y CONFIG_VIDEO=y CONFIG_MPC85xx=y -CONFIG_TARGET_T1042RDB=y +CONFIG_TARGET_T1042RDB_PI=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="T1042RDB_PI" CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 2553966..35675ac 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -60,7 +60,7 @@ #define CONFIG_SYS_FSL_PBL_RCW \ $(SRCTREE)/board/freescale/t104xrdb/t1040_nand_rcw.cfg #endif -#ifdef CONFIG_T1042RDB_PI +#ifdef CONFIG_TARGET_T1042RDB_PI #define CONFIG_SYS_FSL_PBL_RCW \ $(SRCTREE)/board/freescale/t104xrdb/t1042_pi_nand_rcw.cfg #endif @@ -94,7 +94,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_nand_rcw.cfg #define CONFIG_SYS_FSL_PBL_RCW \ $(SRCTREE)/board/freescale/t104xrdb/t1040_spi_rcw.cfg #endif -#ifdef CONFIG_T1042RDB_PI +#ifdef CONFIG_TARGET_T1042RDB_PI #define CONFIG_SYS_FSL_PBL_RCW \ $(SRCTREE)/board/freescale/t104xrdb/t1042_pi_spi_rcw.cfg #endif @@ -128,7 +128,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_spi_rcw.cfg #define CONFIG_SYS_FSL_PBL_RCW \ $(SRCTREE)/board/freescale/t104xrdb/t1040_sd_rcw.cfg #endif -#ifdef CONFIG_T1042RDB_PI +#ifdef CONFIG_TARGET_T1042RDB_PI #define CONFIG_SYS_FSL_PBL_RCW \ $(SRCTREE)/board/freescale/t104xrdb/t1042_pi_sd_rcw.cfg #endif @@ -342,7 +342,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define CPLD_LBMAP_RESET 0xFF #define CPLD_LBMAP_SHIFT 0x03
-#if defined(CONFIG_T1042RDB_PI) +#if defined(CONFIG_TARGET_T1042RDB_PI) #define CPLD_DIU_SEL_DFP 0x80 #elif defined(CONFIG_T1042D4RDB) #define CPLD_DIU_SEL_DFP 0xc0 @@ -516,7 +516,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500) #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600)
-#if defined(CONFIG_T1042RDB_PI) || defined(CONFIG_T1042D4RDB) +#if defined(CONFIG_TARGET_T1042RDB_PI) || defined(CONFIG_T1042D4RDB) /* Video */ #define CONFIG_FSL_DIU_FB
@@ -551,7 +551,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define I2C_MUX_CH_DEFAULT 0x8 #endif
-#if defined(CONFIG_T1042RDB_PI) || defined(CONFIG_T104XD4RDB) +#if defined(CONFIG_TARGET_T1042RDB_PI) || defined(CONFIG_T104XD4RDB) /* LDI/DVI Encoder for display */ #define CONFIG_SYS_I2C_LDI_ADDR 0x38 #define CONFIG_SYS_I2C_DVI_ADDR 0x75 @@ -803,7 +803,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg /* * Command line configuration. */ -#ifdef CONFIG_T1042RDB_PI +#ifdef CONFIG_TARGET_T1042RDB_PI #define CONFIG_CMD_DATE #endif #define CONFIG_CMD_ERRATA @@ -883,7 +883,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
#ifdef CONFIG_TARGET_T1040RDB #define FDTFILE "t1040rdb/t1040rdb.dtb" -#elif defined(CONFIG_T1042RDB_PI) +#elif defined(CONFIG_TARGET_T1042RDB_PI) #define FDTFILE "t1042rdb_pi/t1042rdb_pi.dtb" #elif defined(CONFIG_T1042RDB) #define FDTFILE "t1042rdb/t1042rdb.dtb" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 62813ef..4c488a0 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -7829,7 +7829,6 @@ CONFIG_T1024RDB CONFIG_T1040QDS CONFIG_T1042D4RDB CONFIG_T1042RDB -CONFIG_T1042RDB_PI CONFIG_T104XD4RDB CONFIG_T104xRDB CONFIG_T2080QDS