diff options
Diffstat (limited to 'arch/powerpc/cpu')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/Kconfig | 4 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/Makefile | 4 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/b4860_ids.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/b4860_serdes.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/speed.c | 2 |
5 files changed, 10 insertions, 6 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 962ec2b..acac21e 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -18,6 +18,7 @@ config TARGET_SOCRATES config TARGET_B4420QDS bool "Support B4420QDS" + select ARCH_B4420 select SUPPORT_SPL select PHYS_64BIT @@ -257,6 +258,9 @@ config TARGET_CYRUS endchoice +config ARCH_B4420 + bool + config ARCH_B4860 bool diff --git a/arch/powerpc/cpu/mpc85xx/Makefile b/arch/powerpc/cpu/mpc85xx/Makefile index 87d8b18..c19c3e7 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -47,7 +47,7 @@ obj-$(CONFIG_ARCH_P5040) += p5040_ids.o obj-$(CONFIG_PPC_T4240) += t4240_ids.o obj-$(CONFIG_PPC_T4160) += t4240_ids.o obj-$(CONFIG_PPC_T4080) += t4240_ids.o -obj-$(CONFIG_PPC_B4420) += b4860_ids.o +obj-$(CONFIG_ARCH_B4420) += b4860_ids.o obj-$(CONFIG_ARCH_B4860) += b4860_ids.o obj-$(CONFIG_PPC_T1040) += t1040_ids.o obj-$(CONFIG_PPC_T1042) += t1040_ids.o @@ -89,7 +89,7 @@ obj-$(CONFIG_ARCH_P5040) += p5040_serdes.o obj-$(CONFIG_PPC_T4240) += t4240_serdes.o obj-$(CONFIG_PPC_T4160) += t4240_serdes.o obj-$(CONFIG_PPC_T4080) += t4240_serdes.o -obj-$(CONFIG_PPC_B4420) += b4860_serdes.o +obj-$(CONFIG_ARCH_B4420) += b4860_serdes.o obj-$(CONFIG_ARCH_B4860) += b4860_serdes.o obj-$(CONFIG_ARCH_BSC9132) += bsc9132_serdes.o obj-$(CONFIG_PPC_T1040) += t1040_serdes.o diff --git a/arch/powerpc/cpu/mpc85xx/b4860_ids.c b/arch/powerpc/cpu/mpc85xx/b4860_ids.c index 85eba0b..4ceb6f5 100644 --- a/arch/powerpc/cpu/mpc85xx/b4860_ids.c +++ b/arch/powerpc/cpu/mpc85xx/b4860_ids.c @@ -62,7 +62,7 @@ struct liodn_id_table liodn_tbl[] = { SET_DMA_LIODN(1, "fsl,elo3-dma", 147), SET_DMA_LIODN(2, "fsl,elo3-dma", 227), -#ifndef CONFIG_PPC_B4420 +#ifndef CONFIG_ARCH_B4420 SET_GUTS_LIODN("fsl,rapidio-delta", 199, rio1liodnr, 0), SET_GUTS_LIODN(NULL, 200, rio2liodnr, 0), SET_GUTS_LIODN(NULL, 201, rio1maintliodnr, 0), @@ -81,7 +81,7 @@ struct fman_liodn_id_table fman1_liodn_tbl[] = { SET_FMAN_RX_1G_LIODN(1, 3, 91), SET_FMAN_RX_1G_LIODN(1, 4, 92), SET_FMAN_RX_1G_LIODN(1, 5, 93), -#ifndef CONFIG_PPC_B4420 +#ifndef CONFIG_ARCH_B4420 SET_FMAN_RX_10G_LIODN(1, 0, 94), SET_FMAN_RX_10G_LIODN(1, 1, 95), #endif diff --git a/arch/powerpc/cpu/mpc85xx/b4860_serdes.c b/arch/powerpc/cpu/mpc85xx/b4860_serdes.c index 64db7a7..a5709dd 100644 --- a/arch/powerpc/cpu/mpc85xx/b4860_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/b4860_serdes.c @@ -180,7 +180,7 @@ static struct serdes_config serdes2_cfg_tbl[] = { }; #endif -#ifdef CONFIG_PPC_B4420 +#ifdef CONFIG_ARCH_B4420 static struct serdes_config serdes1_cfg_tbl[] = { {0x0D, {NONE, NONE, CPRI6, CPRI5, CPRI4, CPRI3, NONE, NONE} }, diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c index 2d3517b..a392414 100644 --- a/arch/powerpc/cpu/mpc85xx/speed.c +++ b/arch/powerpc/cpu/mpc85xx/speed.c @@ -202,7 +202,7 @@ void get_sys_info(sys_info_t *sys_info) } #endif -#if defined(CONFIG_ARCH_B4860) || defined(CONFIG_PPC_B4420) || \ +#if defined(CONFIG_ARCH_B4860) || defined(CONFIG_ARCH_B4420) || \ defined(CONFIG_PPC_T2080) || defined(CONFIG_PPC_T2081) #define FM1_CLK_SEL 0xe0000000 #define FM1_CLK_SHIFT 29 |