linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

powerpc: P3041: Remove macro CONFIG_PPC_P3041

Browse Source 
Replace CONFIG_PPC_P3041 with ARCH_P3041 in Kconfig and clean up
existing macros.

Signed-off-by: York Sun <york.sun@nxp.com>
This commit is contained in:
York Sun
2016-11-18 11:20:40 -08:00
parent 37107facbc
commit 5e5fdd2d00
9 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/cpu/mpc85xx/Kconfig
View File

@ -41,6 +41,7 @@ config TARGET_C29XPCIE
config TARGET_P3041DS
bool "Support P3041DS"
select PHYS_64BIT
select ARCH_P3041
config TARGET_P4080DS
bool "Support P4080DS"
@ -316,6 +317,9 @@ config ARCH_P2020
config ARCH_P2041
bool
config ARCH_P3041
bool
source "board/freescale/b4860qds/Kconfig"
source "board/freescale/bsc9131rdb/Kconfig"
source "board/freescale/bsc9132qds/Kconfig"

4
arch/powerpc/cpu/mpc85xx/Makefile
View File

@ -40,7 +40,7 @@ obj-$(CONFIG_SYS_DPAA_QBMAN) += portals.o
# various SoC specific assignments
obj-$(CONFIG_ARCH_P2041) += p2041_ids.o
obj-$(CONFIG_PPC_P3041) += p3041_ids.o
obj-$(CONFIG_ARCH_P3041) += p3041_ids.o
obj-$(CONFIG_PPC_P4080) += p4080_ids.o
obj-$(CONFIG_PPC_P5020) += p5020_ids.o
obj-$(CONFIG_PPC_P5040) += p5040_ids.o
@ -82,7 +82,7 @@ obj-$(CONFIG_ARCH_P1024) += p1021_serdes.o
obj-$(CONFIG_ARCH_P1025) += p1021_serdes.o
obj-$(CONFIG_ARCH_P2020) += p2020_serdes.o
obj-$(CONFIG_ARCH_P2041) += p2041_serdes.o
obj-$(CONFIG_PPC_P3041) += p3041_serdes.o
obj-$(CONFIG_ARCH_P3041) += p3041_serdes.o
obj-$(CONFIG_PPC_P4080) += p4080_serdes.o
obj-$(CONFIG_PPC_P5020) += p5020_serdes.o
obj-$(CONFIG_PPC_P5040) += p5040_serdes.o

4
arch/powerpc/cpu/mpc85xx/cmd_errata.c
View File

@ -26,7 +26,7 @@ static void check_erratum_a4849(uint32_t svr)
void __iomem *dcsr = (void *)CONFIG_SYS_DCSRBAR + 0xb0000;
unsigned int i;
#if defined(CONFIG_ARCH_P2041) || defined(CONFIG_PPC_P3041)
#if defined(CONFIG_ARCH_P2041) || defined(CONFIG_ARCH_P3041)
static const uint8_t offsets[] = {
0x50, 0x54, 0x58, 0x90, 0x94, 0x98
};
@ -45,7 +45,7 @@ static void check_erratum_a4849(uint32_t svr)
}
}
#if defined(CONFIG_ARCH_P2041) || defined(CONFIG_PPC_P3041)
#if defined(CONFIG_ARCH_P2041) || defined(CONFIG_ARCH_P3041)
x108 = 0x12;
#endif