Commit 484fff6478cef43d78af7ed8e8865bd7750183de
1 parent
e5cc150945
Exists in
v2017.01-smarct4x
and in
25 other branches
powerpc: P1020: Remove macro CONFIG_P1020
Replace CONFIG_P1020 with ARCH_P1020 in Kconfig and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com>
Showing 6 changed files with 11 additions and 9 deletions Side-by-side Diff
arch/powerpc/cpu/mpc85xx/Kconfig
| ... | ... | @@ -120,20 +120,25 @@ |
| 120 | 120 | bool "Support P1020MBG-PC" |
| 121 | 121 | select SUPPORT_SPL |
| 122 | 122 | select SUPPORT_TPL |
| 123 | + select ARCH_P1020 | |
| 124 | + | |
| 123 | 125 | config TARGET_P1020RDB_PC |
| 124 | 126 | bool "Support P1020RDB-PC" |
| 125 | 127 | select SUPPORT_SPL |
| 126 | 128 | select SUPPORT_TPL |
| 129 | + select ARCH_P1020 | |
| 127 | 130 | |
| 128 | 131 | config TARGET_P1020RDB_PD |
| 129 | 132 | bool "Support P1020RDB-PD" |
| 130 | 133 | select SUPPORT_SPL |
| 131 | 134 | select SUPPORT_TPL |
| 135 | + select ARCH_P1020 | |
| 132 | 136 | |
| 133 | 137 | config TARGET_P1020UTM |
| 134 | 138 | bool "Support P1020UTM" |
| 135 | 139 | select SUPPORT_SPL |
| 136 | 140 | select SUPPORT_TPL |
| 141 | + select ARCH_P1020 | |
| 137 | 142 | |
| 138 | 143 | config TARGET_P1021RDB |
| 139 | 144 | bool "Support P1021RDB" |
| ... | ... | @@ -226,6 +231,7 @@ |
| 226 | 231 | |
| 227 | 232 | config TARGET_UCP1020 |
| 228 | 233 | bool "Support uCP1020" |
| 234 | + select ARCH_P1020 | |
| 229 | 235 | |
| 230 | 236 | config TARGET_CYRUS |
| 231 | 237 | bool "Support Varisys Cyrus" |
| ... | ... | @@ -276,6 +282,9 @@ |
| 276 | 282 | bool |
| 277 | 283 | |
| 278 | 284 | config ARCH_P1011 |
| 285 | + bool | |
| 286 | + | |
| 287 | +config ARCH_P1020 | |
| 279 | 288 | bool |
| 280 | 289 | |
| 281 | 290 | config ARCH_P1022 |
arch/powerpc/cpu/mpc85xx/Makefile
| ... | ... | @@ -74,7 +74,7 @@ |
| 74 | 74 | obj-$(CONFIG_ARCH_MPC8572) += mpc8572_serdes.o |
| 75 | 75 | obj-$(CONFIG_ARCH_P1010) += p1010_serdes.o |
| 76 | 76 | obj-$(CONFIG_ARCH_P1011) += p1021_serdes.o |
| 77 | -obj-$(CONFIG_P1020) += p1021_serdes.o | |
| 77 | +obj-$(CONFIG_ARCH_P1020) += p1021_serdes.o | |
| 78 | 78 | obj-$(CONFIG_P1021) += p1021_serdes.o |
| 79 | 79 | obj-$(CONFIG_ARCH_P1022) += p1022_serdes.o |
| 80 | 80 | obj-$(CONFIG_ARCH_P1023) += p1023_serdes.o |
arch/powerpc/include/asm/config_mpc85xx.h
| ... | ... | @@ -183,7 +183,7 @@ |
| 183 | 183 | #define CONFIG_SYS_FSL_ERRATUM_A004508 |
| 184 | 184 | #define CONFIG_SYS_FSL_ERRATUM_A005125 |
| 185 | 185 | |
| 186 | -#elif defined(CONFIG_P1020) | |
| 186 | +#elif defined(CONFIG_ARCH_P1020) | |
| 187 | 187 | #define CONFIG_MAX_CPUS 2 |
| 188 | 188 | #define CONFIG_SYS_FSL_NUM_LAWS 12 |
| 189 | 189 | #define CONFIG_SYS_PPC_E500_DEBUG_TLB 2 |
include/configs/UCP1020.h
| ... | ... | @@ -27,7 +27,6 @@ |
| 27 | 27 | #define CONFIG_UCP1020_REV_1_3 |
| 28 | 28 | |
| 29 | 29 | #define CONFIG_BOARDNAME "uCP1020-64EE512-0U1-XR-T1" |
| 30 | -#define CONFIG_P1020 | |
| 31 | 30 | |
| 32 | 31 | #define CONFIG_TSEC_ENET |
| 33 | 32 | #define CONFIG_TSEC1 |
| ... | ... | @@ -59,7 +58,6 @@ |
| 59 | 58 | #define CONFIG_UCP1020_REV_1_3 |
| 60 | 59 | |
| 61 | 60 | #define CONFIG_BOARDNAME_LOCAL "uCP1020-64EEE512-OU1-XR" |
| 62 | -#define CONFIG_P1020 | |
| 63 | 61 | |
| 64 | 62 | #define CONFIG_TSEC_ENET |
| 65 | 63 | #define CONFIG_TSEC1 |
include/configs/p1_p2_rdb_pc.h
| ... | ... | @@ -12,7 +12,6 @@ |
| 12 | 12 | |
| 13 | 13 | #if defined(CONFIG_TARGET_P1020MBG) |
| 14 | 14 | #define CONFIG_BOARDNAME "P1020MBG-PC" |
| 15 | -#define CONFIG_P1020 | |
| 16 | 15 | #define CONFIG_VSC7385_ENET |
| 17 | 16 | #define CONFIG_SLIC |
| 18 | 17 | #define __SW_BOOT_MASK 0x03 |
| ... | ... | @@ -23,7 +22,6 @@ |
| 23 | 22 | |
| 24 | 23 | #if defined(CONFIG_TARGET_P1020UTM) |
| 25 | 24 | #define CONFIG_BOARDNAME "P1020UTM-PC" |
| 26 | -#define CONFIG_P1020 | |
| 27 | 25 | #define __SW_BOOT_MASK 0x03 |
| 28 | 26 | #define __SW_BOOT_NOR 0xe0 |
| 29 | 27 | #define __SW_BOOT_SD 0x50 |
| ... | ... | @@ -33,7 +31,6 @@ |
| 33 | 31 | #if defined(CONFIG_TARGET_P1020RDB_PC) |
| 34 | 32 | #define CONFIG_BOARDNAME "P1020RDB-PC" |
| 35 | 33 | #define CONFIG_NAND_FSL_ELBC |
| 36 | -#define CONFIG_P1020 | |
| 37 | 34 | #define CONFIG_VSC7385_ENET |
| 38 | 35 | #define CONFIG_SLIC |
| 39 | 36 | #define __SW_BOOT_MASK 0x03 |
| ... | ... | @@ -61,7 +58,6 @@ |
| 61 | 58 | #if defined(CONFIG_TARGET_P1020RDB_PD) |
| 62 | 59 | #define CONFIG_BOARDNAME "P1020RDB-PD" |
| 63 | 60 | #define CONFIG_NAND_FSL_ELBC |
| 64 | -#define CONFIG_P1020 | |
| 65 | 61 | #define CONFIG_VSC7385_ENET |
| 66 | 62 | #define CONFIG_SLIC |
| 67 | 63 | #define __SW_BOOT_MASK 0x03 |