diff options
author | York Sun <york.sun@nxp.com> | 2016-11-21 22:08:49 +0300 |
---|---|---|
committer | York Sun <york.sun@nxp.com> | 2016-11-24 10:42:14 +0300 |
commit | 0167369cff10cc0662052127304f82e1cce8f62f (patch) | |
tree | 33dee6336fe7df914d35b3c37f38416c41ea11f9 | |
parent | 319ed24a8a8225a4f6055dcd8c6a5077c51b763f (diff) | |
download | u-boot-0167369cff10cc0662052127304f82e1cce8f62f.tar.xz |
powerpc: T1042RDB: Remove macro CONFIG_T1042RDB
Use TARGET_T1042RDB instead.
Signed-off-by: York Sun <york.sun@nxp.com>
-rw-r--r-- | board/freescale/t104xrdb/eth.c | 2 | ||||
-rw-r--r-- | configs/T1042RDB_SECURE_BOOT_defconfig | 2 | ||||
-rw-r--r-- | configs/T1042RDB_defconfig | 1 | ||||
-rw-r--r-- | include/configs/T104xRDB.h | 10 | ||||
-rw-r--r-- | scripts/config_whitelist.txt | 1 |
5 files changed, 7 insertions, 9 deletions
diff --git a/board/freescale/t104xrdb/eth.c b/board/freescale/t104xrdb/eth.c index 9d8ead4f60..ab8c8bb2aa 100644 --- a/board/freescale/t104xrdb/eth.c +++ b/board/freescale/t104xrdb/eth.c @@ -52,7 +52,7 @@ int board_eth_init(bd_t *bis) CONFIG_SYS_SGMII1_PHY_ADDR); break; #endif -#ifdef CONFIG_T1042RDB +#ifdef CONFIG_TARGET_T1042RDB case PHY_INTERFACE_MODE_SGMII: /* T1042RDB doesn't supports SGMII on DTSEC1 & DTSEC2 */ if ((FM1_DTSEC1 == i) || (FM1_DTSEC2 == i)) diff --git a/configs/T1042RDB_SECURE_BOOT_defconfig b/configs/T1042RDB_SECURE_BOOT_defconfig index 32c5910bff..2e6e44162c 100644 --- a/configs/T1042RDB_SECURE_BOOT_defconfig +++ b/configs/T1042RDB_SECURE_BOOT_defconfig @@ -6,7 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,T1042RDB" +CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT" CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/T1042RDB_defconfig b/configs/T1042RDB_defconfig index e865de313b..2223e6d6c9 100644 --- a/configs/T1042RDB_defconfig +++ b/configs/T1042RDB_defconfig @@ -5,7 +5,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="T1042RDB" 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 a4f55f0717..5d013f1e09 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -64,7 +64,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1040_nand_rcw.cfg #define CONFIG_SYS_FSL_PBL_RCW \ $(SRCTREE)/board/freescale/t104xrdb/t1042_pi_nand_rcw.cfg #endif -#ifdef CONFIG_T1042RDB +#ifdef CONFIG_TARGET_T1042RDB #define CONFIG_SYS_FSL_PBL_RCW \ $(SRCTREE)/board/freescale/t104xrdb/t1042_nand_rcw.cfg #endif @@ -98,7 +98,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1040_spi_rcw.cfg #define CONFIG_SYS_FSL_PBL_RCW \ $(SRCTREE)/board/freescale/t104xrdb/t1042_pi_spi_rcw.cfg #endif -#ifdef CONFIG_T1042RDB +#ifdef CONFIG_TARGET_T1042RDB #define CONFIG_SYS_FSL_PBL_RCW \ $(SRCTREE)/board/freescale/t104xrdb/t1042_spi_rcw.cfg #endif @@ -132,7 +132,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1040_sd_rcw.cfg #define CONFIG_SYS_FSL_PBL_RCW \ $(SRCTREE)/board/freescale/t104xrdb/t1042_pi_sd_rcw.cfg #endif -#ifdef CONFIG_T1042RDB +#ifdef CONFIG_TARGET_T1042RDB #define CONFIG_SYS_FSL_PBL_RCW \ $(SRCTREE)/board/freescale/t104xrdb/t1042_sd_rcw.cfg #endif @@ -758,7 +758,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #endif #ifdef CONFIG_FMAN_ENET -#if defined(CONFIG_TARGET_T1040RDB) || defined(CONFIG_T1042RDB) +#if defined(CONFIG_TARGET_T1040RDB) || defined(CONFIG_TARGET_T1042RDB) #define CONFIG_SYS_SGMII1_PHY_ADDR 0x03 #elif defined(CONFIG_TARGET_T1040D4RDB) #define CONFIG_SYS_SGMII1_PHY_ADDR 0x01 @@ -885,7 +885,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define FDTFILE "t1040rdb/t1040rdb.dtb" #elif defined(CONFIG_TARGET_T1042RDB_PI) #define FDTFILE "t1042rdb_pi/t1042rdb_pi.dtb" -#elif defined(CONFIG_T1042RDB) +#elif defined(CONFIG_TARGET_T1042RDB) #define FDTFILE "t1042rdb/t1042rdb.dtb" #elif defined(CONFIG_TARGET_T1040D4RDB) #define FDTFILE "t1042rdb/t1040d4rdb.dtb" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 9360da3ad7..33e97339b9 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -7827,7 +7827,6 @@ CONFIG_SYS_i2C_FSL CONFIG_T1023RDB CONFIG_T1024RDB CONFIG_T1040QDS -CONFIG_T1042RDB CONFIG_T104XD4RDB CONFIG_T104xRDB CONFIG_T2080QDS |