From a016735c7902d1b50940dce48980c4e302c1bfe9 Mon Sep 17 00:00:00 2001 From: York Sun Date: Mon, 21 Nov 2016 10:46:53 -0800 Subject: [PATCH] powerpc: T1040D4RDB: Separate from T1040RDB in Kconfig Use TARGET_T1040D4RDB in Kconfig to simplify config macros. Replace CONFIG_T1040D4RDB with TARGET_T1040D4RDB and clean up existing macros. Signed-off-by: York Sun --- arch/powerpc/cpu/mpc85xx/Kconfig | 6 ++++++ board/freescale/t104xrdb/Kconfig | 2 +- board/freescale/t104xrdb/eth.c | 2 +- board/freescale/t104xrdb/t104xrdb.c | 2 +- configs/T1040D4RDB_NAND_defconfig | 4 ++-- configs/T1040D4RDB_SDCARD_defconfig | 4 ++-- configs/T1040D4RDB_SECURE_BOOT_defconfig | 4 ++-- configs/T1040D4RDB_SPIFLASH_defconfig | 4 ++-- configs/T1040D4RDB_defconfig | 4 ++-- include/configs/T104xRDB.h | 14 +++++++------- scripts/config_whitelist.txt | 1 - 11 files changed, 26 insertions(+), 21 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index bad4af63ba..59585366e6 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -218,6 +218,12 @@ config TARGET_T1040RDB select SUPPORT_SPL select PHYS_64BIT +config TARGET_T1040D4RDB + bool "Support T1040D4RDB" + select ARCH_T1040 + select SUPPORT_SPL + select PHYS_64BIT + config TARGET_T1042RDB bool "Support T1042RDB" select SUPPORT_SPL diff --git a/board/freescale/t104xrdb/Kconfig b/board/freescale/t104xrdb/Kconfig index 5b6095b02a..2a633c050c 100644 --- a/board/freescale/t104xrdb/Kconfig +++ b/board/freescale/t104xrdb/Kconfig @@ -1,4 +1,4 @@ -if TARGET_T1040RDB || TARGET_T1042RDB +if TARGET_T1040RDB || TARGET_T1040D4RDB || TARGET_T1042RDB config SYS_BOARD default "t104xrdb" diff --git a/board/freescale/t104xrdb/eth.c b/board/freescale/t104xrdb/eth.c index 52cd112249..ea9f450b6f 100644 --- a/board/freescale/t104xrdb/eth.c +++ b/board/freescale/t104xrdb/eth.c @@ -43,7 +43,7 @@ int board_eth_init(bd_t *bis) int idx = i - FM1_DTSEC1; switch (fm_info_get_enet_if(i)) { -#if defined(CONFIG_T1040RDB) || defined(CONFIG_T1040D4RDB) +#if defined(CONFIG_T1040RDB) || defined(CONFIG_TARGET_T1040D4RDB) case PHY_INTERFACE_MODE_SGMII: /* T1040RDB & T1040D4RDB only supports SGMII on * DTSEC3 diff --git a/board/freescale/t104xrdb/t104xrdb.c b/board/freescale/t104xrdb/t104xrdb.c index 6bad6a4540..803666e2d2 100644 --- a/board/freescale/t104xrdb/t104xrdb.c +++ b/board/freescale/t104xrdb/t104xrdb.c @@ -105,7 +105,7 @@ int misc_init_r(void) CPLD_WRITE(misc_ctl_status, CPLD_READ(misc_ctl_status) | MISC_CTL_SG_SEL | MISC_CTL_AURORA_SEL); -#if defined(CONFIG_T1040D4RDB) +#if defined(CONFIG_TARGET_T1040D4RDB) if (hwconfig("qe-tdm")) { CPLD_WRITE(sfp_ctl_status, CPLD_READ(sfp_ctl_status) | MISC_MUX_QE_TDM); diff --git a/configs/T1040D4RDB_NAND_defconfig b/configs/T1040D4RDB_NAND_defconfig index 71f439f8ca..e692e77e3f 100644 --- a/configs/T1040D4RDB_NAND_defconfig +++ b/configs/T1040D4RDB_NAND_defconfig @@ -7,12 +7,12 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_MPC85xx=y -CONFIG_TARGET_T1040RDB=y +CONFIG_TARGET_T1040D4RDB=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND,T104XD4RDB,SYS_FSL_DDR4" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,NAND,T104XD4RDB,SYS_FSL_DDR4" CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/T1040D4RDB_SDCARD_defconfig b/configs/T1040D4RDB_SDCARD_defconfig index 35a261f4a8..4b9faabe14 100644 --- a/configs/T1040D4RDB_SDCARD_defconfig +++ b/configs/T1040D4RDB_SDCARD_defconfig @@ -7,12 +7,12 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_MPC85xx=y -CONFIG_TARGET_T1040RDB=y +CONFIG_TARGET_T1040D4RDB=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD,T104XD4RDB,SYS_FSL_DDR4" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SDCARD,T104XD4RDB,SYS_FSL_DDR4" CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/T1040D4RDB_SECURE_BOOT_defconfig b/configs/T1040D4RDB_SECURE_BOOT_defconfig index 08ad19ca2d..b942ade88e 100644 --- a/configs/T1040D4RDB_SECURE_BOOT_defconfig +++ b/configs/T1040D4RDB_SECURE_BOOT_defconfig @@ -1,12 +1,12 @@ CONFIG_PPC=y CONFIG_MPC85xx=y -CONFIG_TARGET_T1040RDB=y +CONFIG_TARGET_T1040D4RDB=y # CONFIG_SYS_MALLOC_F is not set CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="T1040D4RDB,T104XD4RDB,SYS_FSL_DDR4,SECURE_BOOT" +CONFIG_SYS_EXTRA_OPTIONS="T104XD4RDB,SYS_FSL_DDR4,SECURE_BOOT" CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/T1040D4RDB_SPIFLASH_defconfig b/configs/T1040D4RDB_SPIFLASH_defconfig index d9e1ce5408..c24abe9637 100644 --- a/configs/T1040D4RDB_SPIFLASH_defconfig +++ b/configs/T1040D4RDB_SPIFLASH_defconfig @@ -8,12 +8,12 @@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_MPC85xx=y -CONFIG_TARGET_T1040RDB=y +CONFIG_TARGET_T1040D4RDB=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH,T104XD4RDB,SYS_FSL_DDR4" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH,T104XD4RDB,SYS_FSL_DDR4" CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/T1040D4RDB_defconfig b/configs/T1040D4RDB_defconfig index 46219e6ab9..a4459ab562 100644 --- a/configs/T1040D4RDB_defconfig +++ b/configs/T1040D4RDB_defconfig @@ -1,11 +1,11 @@ CONFIG_PPC=y CONFIG_MPC85xx=y -CONFIG_TARGET_T1040RDB=y +CONFIG_TARGET_T1040D4RDB=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="T1040D4RDB,T104XD4RDB,SYS_FSL_DDR4" +CONFIG_SYS_EXTRA_OPTIONS="T104XD4RDB,SYS_FSL_DDR4" CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 77318091df..89b35bedd3 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -68,7 +68,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042_pi_nand_rcw.cfg #define CONFIG_SYS_FSL_PBL_RCW \ $(SRCTREE)/board/freescale/t104xrdb/t1042_nand_rcw.cfg #endif -#ifdef CONFIG_T1040D4RDB +#ifdef CONFIG_TARGET_T1040D4RDB #define CONFIG_SYS_FSL_PBL_RCW \ $(SRCTREE)/board/freescale/t104xrdb/t1040d4_nand_rcw.cfg #endif @@ -102,7 +102,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042_pi_spi_rcw.cfg #define CONFIG_SYS_FSL_PBL_RCW \ $(SRCTREE)/board/freescale/t104xrdb/t1042_spi_rcw.cfg #endif -#ifdef CONFIG_T1040D4RDB +#ifdef CONFIG_TARGET_T1040D4RDB #define CONFIG_SYS_FSL_PBL_RCW \ $(SRCTREE)/board/freescale/t104xrdb/t1040d4_spi_rcw.cfg #endif @@ -136,7 +136,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042_pi_sd_rcw.cfg #define CONFIG_SYS_FSL_PBL_RCW \ $(SRCTREE)/board/freescale/t104xrdb/t1042_sd_rcw.cfg #endif -#ifdef CONFIG_T1040D4RDB +#ifdef CONFIG_TARGET_T1040D4RDB #define CONFIG_SYS_FSL_PBL_RCW \ $(SRCTREE)/board/freescale/t104xrdb/t1040d4_sd_rcw.cfg #endif @@ -348,7 +348,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define CPLD_DIU_SEL_DFP 0xc0 #endif -#if defined(CONFIG_T1040D4RDB) +#if defined(CONFIG_TARGET_T1040D4RDB) #define CPLD_INT_MASK_ALL 0xFF #define CPLD_INT_MASK_THERM 0x80 #define CPLD_INT_MASK_DVI_DFP 0x40 @@ -760,7 +760,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #ifdef CONFIG_FMAN_ENET #if defined(CONFIG_T1040RDB) || defined(CONFIG_T1042RDB) #define CONFIG_SYS_SGMII1_PHY_ADDR 0x03 -#elif defined(CONFIG_T1040D4RDB) +#elif defined(CONFIG_TARGET_T1040D4RDB) #define CONFIG_SYS_SGMII1_PHY_ADDR 0x01 #elif defined(CONFIG_T1042D4RDB) #define CONFIG_SYS_SGMII1_PHY_ADDR 0x02 @@ -777,7 +777,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #endif /* Enable VSC9953 L2 Switch driver on T1040 SoC */ -#if defined(CONFIG_T1040RDB) || defined(CONFIG_T1040D4RDB) +#if defined(CONFIG_T1040RDB) || defined(CONFIG_TARGET_T1040D4RDB) #define CONFIG_VSC9953 #define CONFIG_CMD_ETHSW #ifdef CONFIG_T1040RDB @@ -887,7 +887,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define FDTFILE "t1042rdb_pi/t1042rdb_pi.dtb" #elif defined(CONFIG_T1042RDB) #define FDTFILE "t1042rdb/t1042rdb.dtb" -#elif defined(CONFIG_T1040D4RDB) +#elif defined(CONFIG_TARGET_T1040D4RDB) #define FDTFILE "t1042rdb/t1040d4rdb.dtb" #elif defined(CONFIG_T1042D4RDB) #define FDTFILE "t1042rdb/t1042d4rdb.dtb" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 6f791d50cc..e0ba692035 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -7827,7 +7827,6 @@ CONFIG_SYS_ZYNQ_SPI_WAIT CONFIG_SYS_i2C_FSL CONFIG_T1023RDB CONFIG_T1024RDB -CONFIG_T1040D4RDB CONFIG_T1040QDS CONFIG_T1040RDB CONFIG_T1042D4RDB -- 2.30.2