Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 15:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

powerpc: T104xRDB: Remove macro CONFIG_T104xRDB and T104xD4RDB

Browse source 
CONFIG_T104xRDB is defined in T104xRDB.h, so it is always enabled for
all T1040RDB, T1040D4RDB, T1042RDB, T1042D4RDB, T1042RDB_PI.
CONFIG_T104XD4RDB is defined for all T1040D4RDB, T1042D4RDB.

Signed-off-by: York Sun <york.sun@nxp.com>
This commit is contained in:
York Sun 2016-11-21 11:25:26 -08:00
parent 0167369cff
commit 78e5699523
16 changed files with 22 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/powerpc/include/asm/fsl_secure_boot.h
View file

@ -32,8 +32,11 @@
defined(CONFIG_T2080RDB) || \ defined(CONFIG_T2080RDB) || \
defined(CONFIG_T1040QDS) || \ defined(CONFIG_T1040QDS) || \
defined(CONFIG_T104xD4QDS) || \ defined(CONFIG_T104xD4QDS) || \
defined(CONFIG_T104xRDB) || \ defined(CONFIG_TARGET_T1040RDB) || \
defined(CONFIG_T104xD4RDB) || \ defined(CONFIG_TARGET_T1040D4RDB) || \
defined(CONFIG_TARGET_T1042RDB) || \
defined(CONFIG_TARGET_T1042D4RDB) || \
defined(CONFIG_TARGET_T1042RDB_PI) || \
defined(CONFIG_ARCH_T1023) || \ defined(CONFIG_ARCH_T1023) || \
defined(CONFIG_ARCH_T1024) defined(CONFIG_ARCH_T1024)
#ifndef CONFIG_SYS_RAMBOOT #ifndef CONFIG_SYS_RAMBOOT

2
board/freescale/t104xrdb/cpld.c
View file

@ -69,7 +69,7 @@ static void cpld_dump_regs(void)
printf("int_status = 0x%02x\n", CPLD_READ(int_status)); printf("int_status = 0x%02x\n", CPLD_READ(int_status));
printf("flash_ctl_status = 0x%02x\n", CPLD_READ(flash_ctl_status)); printf("flash_ctl_status = 0x%02x\n", CPLD_READ(flash_ctl_status));
printf("fan_ctl_status = 0x%02x\n", CPLD_READ(fan_ctl_status)); printf("fan_ctl_status = 0x%02x\n", CPLD_READ(fan_ctl_status));
#if defined(CONFIG_T104XD4RDB) #if defined(CONFIG_TARGET_T1040D4D4RDB) || defined(CONFIG_TARGET_T1042D4RDB)
printf("int_mask = 0x%02x\n", CPLD_READ(int_mask)); printf("int_mask = 0x%02x\n", CPLD_READ(int_mask));
#else #else
printf("led_ctl_status = 0x%02x\n", CPLD_READ(led_ctl_status)); printf("led_ctl_status = 0x%02x\n", CPLD_READ(led_ctl_status));

2
board/freescale/t104xrdb/cpld.h
View file

@ -21,7 +21,7 @@ struct cpld_data {
u8 int_status; /* 0x12 - Interrupt status Register */ u8 int_status; /* 0x12 - Interrupt status Register */
u8 flash_ctl_status; /* 0x13 - Flash control and status register */ u8 flash_ctl_status; /* 0x13 - Flash control and status register */
u8 fan_ctl_status; /* 0x14 - Fan control and status register */ u8 fan_ctl_status; /* 0x14 - Fan control and status register */
#if defined(CONFIG_T104XD4RDB) #if defined(CONFIG_TARGET_T1040D4RDB) || defined(CONFIG_TARGET_T1042D4RDB)
u8 int_mask; /* 0x15 - Interrupt mask Register */ u8 int_mask; /* 0x15 - Interrupt mask Register */
#else #else
u8 led_ctl_status; /* 0x15 - LED control and status register */ u8 led_ctl_status; /* 0x15 - LED control and status register */

2
board/freescale/t104xrdb/t104xrdb.c
View file

@ -29,7 +29,7 @@ int checkboard(void)
struct cpu_type *cpu = gd->arch.cpu; struct cpu_type *cpu = gd->arch.cpu;
u8 sw; u8 sw;
#ifdef CONFIG_T104XD4RDB #if defined(CONFIG_TARGET_T1040D4RDB) || defined(CONFIG_TARGET_T1042D4RDB)
printf("Board: %sD4RDB\n", cpu->name); printf("Board: %sD4RDB\n", cpu->name);
#else #else
printf("Board: %sRDB\n", cpu->name); printf("Board: %sRDB\n", cpu->name);

2
configs/T1040D4RDB_NAND_defconfig
View file

@ -12,7 +12,7 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,NAND,T104XD4RDB,SYS_FSL_DDR4" CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,NAND,SYS_FSL_DDR4"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_CONSOLE=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y

2
configs/T1040D4RDB_SDCARD_defconfig
View file

@ -12,7 +12,7 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SDCARD,T104XD4RDB,SYS_FSL_DDR4" CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SDCARD,SYS_FSL_DDR4"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_CONSOLE=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y

2
configs/T1040D4RDB_SECURE_BOOT_defconfig
View file

@ -6,7 +6,7 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="T104XD4RDB,SYS_FSL_DDR4,SECURE_BOOT" CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,SECURE_BOOT"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_CONSOLE=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y

2
configs/T1040D4RDB_SPIFLASH_defconfig
View file

@ -13,7 +13,7 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH,T104XD4RDB,SYS_FSL_DDR4" CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH,SYS_FSL_DDR4"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_CONSOLE=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y

2
configs/T1040D4RDB_defconfig
View file

@ -5,7 +5,7 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="T104XD4RDB,SYS_FSL_DDR4" CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_CONSOLE=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y

2
configs/T1042D4RDB_NAND_defconfig
View file

@ -13,7 +13,7 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,NAND,T104XD4RDB,SYS_FSL_DDR4" CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,NAND,SYS_FSL_DDR4"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_CONSOLE=y
# CONFIG_CONSOLE_MUX is not set # CONFIG_CONSOLE_MUX is not set

2
configs/T1042D4RDB_SDCARD_defconfig
View file

@ -13,7 +13,7 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SDCARD,T104XD4RDB,SYS_FSL_DDR4" CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SDCARD,SYS_FSL_DDR4"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_CONSOLE=y
# CONFIG_CONSOLE_MUX is not set # CONFIG_CONSOLE_MUX is not set

2
configs/T1042D4RDB_SECURE_BOOT_defconfig
View file

@ -7,7 +7,7 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="T104XD4RDB,SYS_FSL_DDR4,SECURE_BOOT" CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,SECURE_BOOT"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_CONSOLE=y
# CONFIG_CONSOLE_MUX is not set # CONFIG_CONSOLE_MUX is not set

2
configs/T1042D4RDB_SPIFLASH_defconfig
View file

@ -14,7 +14,7 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH,T104XD4RDB,SYS_FSL_DDR4" CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH,SYS_FSL_DDR4"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_CONSOLE=y
# CONFIG_CONSOLE_MUX is not set # CONFIG_CONSOLE_MUX is not set

2
configs/T1042D4RDB_defconfig
View file

@ -6,7 +6,7 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="T104XD4RDB,SYS_FSL_DDR4" CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_CONSOLE=y
# CONFIG_CONSOLE_MUX is not set # CONFIG_CONSOLE_MUX is not set

14
include/configs/T104xRDB.h
View file

@ -10,8 +10,6 @@
/* /*
* T104x RDB board configuration file * T104x RDB board configuration file
*/ */
#define CONFIG_T104xRDB
#define CONFIG_E500 /* BOOKE e500 family */ #define CONFIG_E500 /* BOOKE e500 family */
#include <asm/config_mpc85xx.h> #include <asm/config_mpc85xx.h>
@ -547,11 +545,11 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
/* I2C bus multiplexer */ /* I2C bus multiplexer */
#define I2C_MUX_PCA_ADDR 0x70 #define I2C_MUX_PCA_ADDR 0x70
#if defined(CONFIG_T104xRDB) || defined(CONFIG_T104XD4RDB)
#define I2C_MUX_CH_DEFAULT 0x8 #define I2C_MUX_CH_DEFAULT 0x8
#endif
#if defined(CONFIG_TARGET_T1042RDB_PI) || defined(CONFIG_T104XD4RDB) #if defined(CONFIG_TARGET_T1042RDB_PI) || \
defined(CONFIG_TARGET_T1040D4RDB) || \
defined(CONFIG_TARGET_T1042D4RDB)
/* LDI/DVI Encoder for display */ /* LDI/DVI Encoder for display */
#define CONFIG_SYS_I2C_LDI_ADDR 0x38 #define CONFIG_SYS_I2C_LDI_ADDR 0x38
#define CONFIG_SYS_I2C_DVI_ADDR 0x75 #define CONFIG_SYS_I2C_DVI_ADDR 0x75
@ -706,10 +704,8 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
#define CONFIG_SYS_DPAA_FMAN #define CONFIG_SYS_DPAA_FMAN
#define CONFIG_SYS_DPAA_PME #define CONFIG_SYS_DPAA_PME
#if defined(CONFIG_T104xRDB) || defined(CONFIG_T104XD4RDB)
#define CONFIG_QE #define CONFIG_QE
#define CONFIG_U_QE #define CONFIG_U_QE
#endif
/* Default address of microcode for the Linux Fman driver */ /* Default address of microcode for the Linux Fman driver */
#if defined(CONFIG_SPIFLASH) #if defined(CONFIG_SPIFLASH)
@ -735,7 +731,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
#define CONFIG_SYS_FMAN_FW_ADDR 0xEFF00000 #define CONFIG_SYS_FMAN_FW_ADDR 0xEFF00000
#endif #endif
#if defined(CONFIG_T104xRDB) || defined(CONFIG_T104XD4RDB)
#if defined(CONFIG_SPIFLASH) #if defined(CONFIG_SPIFLASH)
#define CONFIG_SYS_QE_FW_ADDR 0x130000 #define CONFIG_SYS_QE_FW_ADDR 0x130000
#elif defined(CONFIG_SDCARD) #elif defined(CONFIG_SDCARD)
@ -745,7 +740,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
#else #else
#define CONFIG_SYS_QE_FW_ADDR 0xEFF10000 #define CONFIG_SYS_QE_FW_ADDR 0xEFF10000
#endif #endif
#endif
#define CONFIG_SYS_QE_FMAN_FW_LENGTH 0x10000 #define CONFIG_SYS_QE_FMAN_FW_LENGTH 0x10000
#define CONFIG_SYS_FDT_PAD (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH) #define CONFIG_SYS_FDT_PAD (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
@ -768,7 +762,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
#define CONFIG_SYS_SGMII3_PHY_ADDR 0x01 #define CONFIG_SYS_SGMII3_PHY_ADDR 0x01
#endif #endif
#ifdef CONFIG_T104XD4RDB #if defined(CONFIG_TARGET_T1040D4RDB) || defined(CONFIG_TARGET_T1042D4RDB)
#define CONFIG_SYS_RGMII1_PHY_ADDR 0x04 #define CONFIG_SYS_RGMII1_PHY_ADDR 0x04
#define CONFIG_SYS_RGMII2_PHY_ADDR 0x05 #define CONFIG_SYS_RGMII2_PHY_ADDR 0x05
#else #else

2
scripts/config_whitelist.txt
View file

@ -7827,8 +7827,6 @@ CONFIG_SYS_i2C_FSL
CONFIG_T1023RDB CONFIG_T1023RDB
CONFIG_T1024RDB CONFIG_T1024RDB
CONFIG_T1040QDS CONFIG_T1040QDS
CONFIG_T104XD4RDB
CONFIG_T104xRDB
CONFIG_T2080QDS CONFIG_T2080QDS
CONFIG_T2080RDB CONFIG_T2080RDB
CONFIG_T2081QDS CONFIG_T2081QDS