Commit 281ed4c74b375926d5d674c75ecf71da3dfd4fa9
1 parent
f33f3e07f3
Exists in
v2017.01-smarct4x
and in
25 other branches
powerpc: MPC8548: Move CONFIG_MPC8548 to Kconfig option
Replace CONFIG_MPC8548 with ARCH_MPC8548 in Kconfig. Signed-off-by: York Sun <york.sun@nxp.com>
Showing 10 changed files with 14 additions and 12 deletions Side-by-side Diff
- arch/powerpc/cpu/mpc85xx/Kconfig
- arch/powerpc/cpu/mpc85xx/Makefile
- arch/powerpc/cpu/mpc85xx/cpu_init.c
- arch/powerpc/include/asm/config_mpc85xx.h
- arch/powerpc/include/asm/immap_85xx.h
- board/xes/common/fsl_8xxx_pci.c
- include/configs/MPC8548CDS.h
- include/configs/sbc8548.h
- include/configs/xpedite520x.h
- scripts/config_whitelist.txt
arch/powerpc/cpu/mpc85xx/Kconfig
| ... | ... | @@ -10,6 +10,7 @@ |
| 10 | 10 | |
| 11 | 11 | config TARGET_SBC8548 |
| 12 | 12 | bool "Support sbc8548" |
| 13 | + select ARCH_MPC8548 | |
| 13 | 14 | |
| 14 | 15 | config TARGET_SOCRATES |
| 15 | 16 | bool "Support socrates" |
| ... | ... | @@ -63,6 +64,7 @@ |
| 63 | 64 | |
| 64 | 65 | config TARGET_MPC8548CDS |
| 65 | 66 | bool "Support MPC8548CDS" |
| 67 | + select ARCH_MPC8548 | |
| 66 | 68 | |
| 67 | 69 | config TARGET_MPC8555CDS |
| 68 | 70 | bool "Support MPC8555CDS" |
| ... | ... | @@ -156,6 +158,7 @@ |
| 156 | 158 | |
| 157 | 159 | config TARGET_XPEDITE520X |
| 158 | 160 | bool "Support xpedite520x" |
| 161 | + select ARCH_MPC8548 | |
| 159 | 162 | |
| 160 | 163 | config TARGET_XPEDITE537X |
| 161 | 164 | bool "Support xpedite537x" |
| ... | ... | @@ -171,6 +174,9 @@ |
| 171 | 174 | select PHYS_64BIT |
| 172 | 175 | |
| 173 | 176 | endchoice |
| 177 | + | |
| 178 | +config ARCH_MPC8548 | |
| 179 | + bool | |
| 174 | 180 | |
| 175 | 181 | source "board/freescale/b4860qds/Kconfig" |
| 176 | 182 | source "board/freescale/bsc9131rdb/Kconfig" |
arch/powerpc/cpu/mpc85xx/Makefile
| ... | ... | @@ -68,7 +68,7 @@ |
| 68 | 68 | obj-$(CONFIG_PPC_C29X) += c29x_serdes.o |
| 69 | 69 | obj-$(CONFIG_MPC8536) += mpc8536_serdes.o |
| 70 | 70 | obj-$(CONFIG_MPC8544) += mpc8544_serdes.o |
| 71 | -obj-$(CONFIG_MPC8548) += mpc8548_serdes.o | |
| 71 | +obj-$(CONFIG_ARCH_MPC8548) += mpc8548_serdes.o | |
| 72 | 72 | obj-$(CONFIG_MPC8568) += mpc8568_serdes.o |
| 73 | 73 | obj-$(CONFIG_MPC8569) += mpc8569_serdes.o |
| 74 | 74 | obj-$(CONFIG_MPC8572) += mpc8572_serdes.o |
arch/powerpc/cpu/mpc85xx/cpu_init.c
| ... | ... | @@ -442,7 +442,7 @@ |
| 442 | 442 | #if defined(CONFIG_SECURE_BOOT) && !defined(CONFIG_SYS_RAMBOOT) |
| 443 | 443 | struct law_entry law; |
| 444 | 444 | #endif |
| 445 | -#ifdef CONFIG_MPC8548 | |
| 445 | +#ifdef CONFIG_ARCH_MPC8548 | |
| 446 | 446 | ccsr_local_ecm_t *ecm = (void *)(CONFIG_SYS_MPC85xx_ECM_ADDR); |
| 447 | 447 | uint svr = get_svr(); |
| 448 | 448 |
arch/powerpc/include/asm/config_mpc85xx.h
| ... | ... | @@ -66,7 +66,7 @@ |
| 66 | 66 | #define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000 |
| 67 | 67 | #define CONFIG_SYS_FSL_ERRATUM_A005125 |
| 68 | 68 | |
| 69 | -#elif defined(CONFIG_MPC8548) | |
| 69 | +#elif defined(CONFIG_ARCH_MPC8548) | |
| 70 | 70 | #define CONFIG_MAX_CPUS 1 |
| 71 | 71 | #define CONFIG_SYS_FSL_NUM_LAWS 10 |
| 72 | 72 | #define CONFIG_SYS_FSL_DDRC_GEN2 |
arch/powerpc/include/asm/immap_85xx.h
| ... | ... | @@ -124,10 +124,10 @@ |
| 124 | 124 | u8 res[4096 - 1 * sizeof(struct fsl_i2c_base)]; |
| 125 | 125 | } ccsr_i2c_t; |
| 126 | 126 | |
| 127 | -#if defined(CONFIG_MPC8540) \ | |
| 128 | - || defined(CONFIG_MPC8541) \ | |
| 129 | - || defined(CONFIG_MPC8548) \ | |
| 130 | - || defined(CONFIG_MPC8555) | |
| 127 | +#if defined(CONFIG_MPC8540) || \ | |
| 128 | + defined(CONFIG_MPC8541) || \ | |
| 129 | + defined(CONFIG_ARCH_MPC8548) || \ | |
| 130 | + defined(CONFIG_MPC8555) | |
| 131 | 131 | /* DUART Registers */ |
| 132 | 132 | typedef struct ccsr_duart { |
| 133 | 133 | u8 res1[1280]; |
board/xes/common/fsl_8xxx_pci.c
| ... | ... | @@ -55,7 +55,7 @@ |
| 55 | 55 | } else { |
| 56 | 56 | printf("PCI1: disabled\n"); |
| 57 | 57 | } |
| 58 | -#elif defined CONFIG_MPC8548 | |
| 58 | +#elif defined CONFIG_ARCH_MPC8548 | |
| 59 | 59 | volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); |
| 60 | 60 | /* PCI1 not present on MPC8572 */ |
| 61 | 61 | setbits_be32(&gur->devdisr, MPC85xx_DEVDISR_PCI1); |
include/configs/MPC8548CDS.h
| ... | ... | @@ -16,7 +16,6 @@ |
| 16 | 16 | /* High Level Configuration Options */ |
| 17 | 17 | #define CONFIG_BOOKE 1 /* BOOKE */ |
| 18 | 18 | #define CONFIG_E500 1 /* BOOKE e500 family */ |
| 19 | -#define CONFIG_MPC8548 1 /* MPC8548 specific */ | |
| 20 | 19 | #define CONFIG_MPC8548CDS 1 /* MPC8548CDS board specific */ |
| 21 | 20 | |
| 22 | 21 | #ifndef CONFIG_SYS_TEXT_BASE |
include/configs/sbc8548.h
include/configs/xpedite520x.h