Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc: T1042D4RDB: Separate from T1042RDB in Kconfig

Browse Source 
Use TARGET_T1042D4RDB in Kconfig to simplify config options.
Remove macro CONFIG_T1042D4RDB.

Signed-off-by: York Sun <york.sun@nxp.com>
master
York Sun 8 years ago
parent 55ed8ae367
commit 319ed24a8a
10 changed files with 27 additions and 20 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      arch/powerpc/cpu/mpc85xx/Kconfig
  2. 4
      board/freescale/t104xrdb/Kconfig
  3. 2
      board/freescale/t104xrdb/eth.c
  4. 4
      configs/T1042D4RDB_NAND_defconfig
  5. 4
      configs/T1042D4RDB_SDCARD_defconfig
  6. 4
      configs/T1042D4RDB_SECURE_BOOT_defconfig
  7. 4
      configs/T1042D4RDB_SPIFLASH_defconfig
  8. 4
      configs/T1042D4RDB_defconfig
  9. 14
      include/configs/T104xRDB.h
  10. 1
      scripts/config_whitelist.txt

6
arch/powerpc/cpu/mpc85xx/Kconfig
Unescape View File

@ -230,6 +230,12 @@ config TARGET_T1042RDB
select SUPPORT_SPL
select PHYS_64BIT
config TARGET_T1042D4RDB
bool "Support T1042D4RDB"
select ARCH_T1042
select SUPPORT_SPL
select PHYS_64BIT
config TARGET_T1042RDB_PI
bool "Support T1042RDB_PI"
select ARCH_T1042

4
board/freescale/t104xrdb/Kconfig
Unescape View File

@ -1,4 +1,6 @@
if TARGET_T1040RDB || TARGET_T1040D4RDB || TARGET_T1042RDB || TARGET_T1042RDB_PI
if TARGET_T1040RDB || TARGET_T1040D4RDB || \
TARGET_T1042RDB || TARGET_T1042D4RDB || \
TARGET_T1042RDB_PI
config SYS_BOARD
default "t104xrdb"

2
board/freescale/t104xrdb/eth.c
Unescape View File

@ -62,7 +62,7 @@ int board_eth_init(bd_t *bis)
CONFIG_SYS_SGMII1_PHY_ADDR);
break;
#endif
#ifdef CONFIG_T1042D4RDB
#ifdef CONFIG_TARGET_T1042D4RDB
case PHY_INTERFACE_MODE_SGMII:
/* T1042D4RDB supports SGMII on DTSEC1, DTSEC2
* & DTSEC3

4
configs/T1042D4RDB_NAND_defconfig
Unescape View File

@ -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_T1042D4RDB=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="T1042D4RDB,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_CONSOLE_MUX is not set

4
configs/T1042D4RDB_SDCARD_defconfig
Unescape View File

@ -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_T1042D4RDB=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="T1042D4RDB,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_CONSOLE_MUX is not set

4
configs/T1042D4RDB_SECURE_BOOT_defconfig
Unescape View File

@ -1,13 +1,13 @@
CONFIG_PPC=y
CONFIG_VIDEO=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T1042RDB=y
CONFIG_TARGET_T1042D4RDB=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="T1042D4RDB,T104XD4RDB,SYS_FSL_DDR4,SECURE_BOOT"
CONFIG_SYS_EXTRA_OPTIONS="T104XD4RDB,SYS_FSL_DDR4,SECURE_BOOT"
CONFIG_BOOTDELAY=10
CONFIG_SILENT_CONSOLE=y
# CONFIG_CONSOLE_MUX is not set

4
configs/T1042D4RDB_SPIFLASH_defconfig
Unescape View File

@ -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_T1042D4RDB=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="T1042D4RDB,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_CONSOLE_MUX is not set

4
configs/T1042D4RDB_defconfig
Unescape View File

@ -1,12 +1,12 @@
CONFIG_PPC=y
CONFIG_VIDEO=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T1042RDB=y
CONFIG_TARGET_T1042D4RDB=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="T1042D4RDB,T104XD4RDB,SYS_FSL_DDR4"
CONFIG_SYS_EXTRA_OPTIONS="T104XD4RDB,SYS_FSL_DDR4"
CONFIG_BOOTDELAY=10
CONFIG_SILENT_CONSOLE=y
# CONFIG_CONSOLE_MUX is not set

14
include/configs/T104xRDB.h
Unescape View File

@ -72,7 +72,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042_nand_rcw.cfg
#define CONFIG_SYS_FSL_PBL_RCW \
$(SRCTREE)/board/freescale/t104xrdb/t1040d4_nand_rcw.cfg
#endif
#ifdef CONFIG_T1042D4RDB
#ifdef CONFIG_TARGET_T1042D4RDB
#define CONFIG_SYS_FSL_PBL_RCW \
$(SRCTREE)/board/freescale/t104xrdb/t1042d4_nand_rcw.cfg
#endif
@ -106,7 +106,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042_spi_rcw.cfg
#define CONFIG_SYS_FSL_PBL_RCW \
$(SRCTREE)/board/freescale/t104xrdb/t1040d4_spi_rcw.cfg
#endif
#ifdef CONFIG_T1042D4RDB
#ifdef CONFIG_TARGET_T1042D4RDB
#define CONFIG_SYS_FSL_PBL_RCW \
$(SRCTREE)/board/freescale/t104xrdb/t1042d4_spi_rcw.cfg
#endif
@ -140,7 +140,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042_sd_rcw.cfg
#define CONFIG_SYS_FSL_PBL_RCW \
$(SRCTREE)/board/freescale/t104xrdb/t1040d4_sd_rcw.cfg
#endif
#ifdef CONFIG_T1042D4RDB
#ifdef CONFIG_TARGET_T1042D4RDB
#define CONFIG_SYS_FSL_PBL_RCW \
$(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
#endif
@ -344,7 +344,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
#if defined(CONFIG_TARGET_T1042RDB_PI)
#define CPLD_DIU_SEL_DFP 0x80
#elif defined(CONFIG_T1042D4RDB)
#elif defined(CONFIG_TARGET_T1042D4RDB)
#define CPLD_DIU_SEL_DFP 0xc0
#endif
@ -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_TARGET_T1042RDB_PI) || defined(CONFIG_T1042D4RDB)
#if defined(CONFIG_TARGET_T1042RDB_PI) || defined(CONFIG_TARGET_T1042D4RDB)
/* Video */
#define CONFIG_FSL_DIU_FB
@ -762,7 +762,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
#define CONFIG_SYS_SGMII1_PHY_ADDR 0x03
#elif defined(CONFIG_TARGET_T1040D4RDB)
#define CONFIG_SYS_SGMII1_PHY_ADDR 0x01
#elif defined(CONFIG_T1042D4RDB)
#elif defined(CONFIG_TARGET_T1042D4RDB)
#define CONFIG_SYS_SGMII1_PHY_ADDR 0x02
#define CONFIG_SYS_SGMII2_PHY_ADDR 0x03
#define CONFIG_SYS_SGMII3_PHY_ADDR 0x01
@ -889,7 +889,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
#define FDTFILE "t1042rdb/t1042rdb.dtb"
#elif defined(CONFIG_TARGET_T1040D4RDB)
#define FDTFILE "t1042rdb/t1040d4rdb.dtb"
#elif defined(CONFIG_T1042D4RDB)
#elif defined(CONFIG_TARGET_T1042D4RDB)
#define FDTFILE "t1042rdb/t1042d4rdb.dtb"
#endif

1
scripts/config_whitelist.txt
Unescape View File

@ -7827,7 +7827,6 @@ CONFIG_SYS_i2C_FSL
CONFIG_T1023RDB
CONFIG_T1024RDB
CONFIG_T1040QDS
CONFIG_T1042D4RDB
CONFIG_T1042RDB
CONFIG_T104XD4RDB
CONFIG_T104xRDB

Write Preview
Loading…
Cancel
Save