diff options
| author | York Sun <york.sun@nxp.com> | 2016-11-21 11:25:26 -0800 |
|---|---|---|
| committer | York Sun <york.sun@nxp.com> | 2016-11-23 23:42:14 -0800 |
| commit | 78e5699523ca305e55813683e4e30257c900458d (patch) | |
| tree | a6647916a2e72fd496e2afd74cfd34f7d90cd67f /board/freescale | |
| parent | 0167369cff10cc0662052127304f82e1cce8f62f (diff) | |
| download | u-boot-78e5699523ca305e55813683e4e30257c900458d.tar.gz | |
powerpc: T104xRDB: Remove macro CONFIG_T104xRDB and T104xD4RDB
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>
Diffstat (limited to 'board/freescale')
| -rw-r--r-- | board/freescale/t104xrdb/cpld.c | 2 | ||||
| -rw-r--r-- | board/freescale/t104xrdb/cpld.h | 2 | ||||
| -rw-r--r-- | board/freescale/t104xrdb/t104xrdb.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/board/freescale/t104xrdb/cpld.c b/board/freescale/t104xrdb/cpld.c index 0ce4e470a7..95ff6a70d8 100644 --- a/board/freescale/t104xrdb/cpld.c +++ b/board/freescale/t104xrdb/cpld.c @@ -69,7 +69,7 @@ static void cpld_dump_regs(void) printf("int_status = 0x%02x\n", CPLD_READ(int_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)); -#if defined(CONFIG_T104XD4RDB) +#if defined(CONFIG_TARGET_T1040D4D4RDB) || defined(CONFIG_TARGET_T1042D4RDB) printf("int_mask = 0x%02x\n", CPLD_READ(int_mask)); #else printf("led_ctl_status = 0x%02x\n", CPLD_READ(led_ctl_status)); diff --git a/board/freescale/t104xrdb/cpld.h b/board/freescale/t104xrdb/cpld.h index 86de26cc9d..7adf5e4c3d 100644 --- a/board/freescale/t104xrdb/cpld.h +++ b/board/freescale/t104xrdb/cpld.h @@ -21,7 +21,7 @@ struct cpld_data { u8 int_status; /* 0x12 - Interrupt status Register */ u8 flash_ctl_status; /* 0x13 - Flash 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 */ #else u8 led_ctl_status; /* 0x15 - LED control and status register */ diff --git a/board/freescale/t104xrdb/t104xrdb.c b/board/freescale/t104xrdb/t104xrdb.c index 803666e2d2..d4c3d4dcb4 100644 --- a/board/freescale/t104xrdb/t104xrdb.c +++ b/board/freescale/t104xrdb/t104xrdb.c @@ -29,7 +29,7 @@ int checkboard(void) struct cpu_type *cpu = gd->arch.cpu; u8 sw; -#ifdef CONFIG_T104XD4RDB +#if defined(CONFIG_TARGET_T1040D4RDB) || defined(CONFIG_TARGET_T1042D4RDB) printf("Board: %sD4RDB\n", cpu->name); #else printf("Board: %sRDB\n", cpu->name); |