summaryrefslogtreecommitdiff
path: root/arch/powerpc/cpu/mpc83xx
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/cpu/mpc83xx')
-rw-r--r--arch/powerpc/cpu/mpc83xx/Kconfig68
-rw-r--r--arch/powerpc/cpu/mpc83xx/hrcw/Kconfig3
-rw-r--r--arch/powerpc/cpu/mpc83xx/speed.c41
3 files changed, 7 insertions, 105 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index ff85834c460..1d5704848ae 100644
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -8,52 +8,6 @@ choice
prompt "Target select"
optional
-config TARGET_MPC8308_P1M
- bool "Support mpc8308_p1m"
- select ARCH_MPC8308
-
-config TARGET_SBC8349
- bool "Support sbc8349"
- select ARCH_MPC8349
-
-config TARGET_VE8313
- bool "Support ve8313"
- select ARCH_MPC8313
-
-config TARGET_VME8349
- bool "Support vme8349"
- select ARCH_MPC8349
-
-config TARGET_CADDY2
- bool "Support caddy2"
- select ARCH_MPC8349
-
-config TARGET_MPC8313ERDB_NOR
- bool "Support MPC8313ERDB_NOR"
- select ARCH_MPC8313
- select BOARD_EARLY_INIT_F
- select SUPPORT_SPL
-
-config TARGET_MPC8313ERDB_NAND
- bool "Support MPC8313ERDB_NAND"
- select ARCH_MPC8313
- select BOARD_EARLY_INIT_F
- select SUPPORT_SPL
-
-config TARGET_MPC8315ERDB
- bool "Support MPC8315ERDB"
- select ARCH_MPC8315
- select BOARD_EARLY_INIT_F
-
-config TARGET_MPC8323ERDB
- bool "Support MPC8323ERDB"
- select ARCH_MPC832X
-
-config TARGET_MPC832XEMDS
- bool "Support MPC832XEMDS"
- select ARCH_MPC832X
- select BOARD_EARLY_INIT_F
-
config TARGET_MPC8349EMDS
bool "Support MPC8349EMDS"
select ARCH_MPC8349
@@ -121,11 +75,6 @@ config TARGET_KMTEPR2
select VENDOR_KM
select KM_ENABLE_FULL_DM_DTS_SUPPORT
-config TARGET_TQM834X
- bool "Support TQM834x"
- select ARCH_MPC8349
-
-
config TARGET_GAZERBEAM
bool "Support gazerbeam"
select ARCH_MPC8308
@@ -212,14 +161,6 @@ config ARCH_MPC8313
select MPC83XX_SECOND_I2C_SUPPORT
select FSL_ELBC
-config ARCH_MPC8315
- bool
- select ARCH_MPC831X
- select MPC83XX_PCIE1_SUPPORT
- select MPC83XX_PCIE2_SUPPORT
- select MPC83XX_SATA_SUPPORT
- select FSL_ELBC
-
config ARCH_MPC832X
bool
select MPC83XX_QUICC_ENGINE
@@ -302,19 +243,10 @@ endmenu
config FSL_ELBC
bool
-source "board/esd/vme8349/Kconfig"
-source "board/freescale/mpc8313erdb/Kconfig"
-source "board/freescale/mpc8315erdb/Kconfig"
-source "board/freescale/mpc8323erdb/Kconfig"
-source "board/freescale/mpc832xemds/Kconfig"
source "board/freescale/mpc8349emds/Kconfig"
source "board/freescale/mpc837xerdb/Kconfig"
source "board/ids/ids8313/Kconfig"
source "board/keymile/Kconfig"
-source "board/mpc8308_p1m/Kconfig"
-source "board/sbc8349/Kconfig"
-source "board/tqc/tqm834x/Kconfig"
-source "board/ve8313/Kconfig"
source "board/gdsys/mpc8308/Kconfig"
endmenu
diff --git a/arch/powerpc/cpu/mpc83xx/hrcw/Kconfig b/arch/powerpc/cpu/mpc83xx/hrcw/Kconfig
index c657a47b114..75ec9c9a346 100644
--- a/arch/powerpc/cpu/mpc83xx/hrcw/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/hrcw/Kconfig
@@ -19,7 +19,7 @@ config DDR_MC_CLOCK_MODE_1_2
bool "1 : 2"
config DDR_MC_CLOCK_MODE_1_1
- depends on ARCH_MPC8315 || ARCH_MPC8349 || ARCH_MPC8360 || ARCH_MPC837X
+ depends on ARCH_MPC8349 || ARCH_MPC8360 || ARCH_MPC837X
bool "1 : 1"
endchoice
@@ -143,7 +143,6 @@ config CORE_PLL_VCO_DIVIDER_4
bool "4"
config CORE_PLL_VCO_DIVIDER_8
- depends on !ARCH_MPC8315
bool "8"
endchoice
diff --git a/arch/powerpc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c
index 58e197f1208..e5db96b328d 100644
--- a/arch/powerpc/cpu/mpc83xx/speed.c
+++ b/arch/powerpc/cpu/mpc83xx/speed.c
@@ -104,9 +104,6 @@ int get_clocks(void)
#if !defined(CONFIG_ARCH_MPC832X)
u32 i2c2_clk;
#endif
-#if defined(CONFIG_ARCH_MPC8315)
- u32 tdm_clk;
-#endif
#if defined(CONFIG_FSL_ESDHC)
u32 sdhc_clk;
#endif
@@ -130,7 +127,7 @@ int get_clocks(void)
u32 pciexp1_clk;
u32 pciexp2_clk;
#endif
-#if defined(CONFIG_ARCH_MPC837X) || defined(CONFIG_ARCH_MPC8315)
+#if defined(CONFIG_ARCH_MPC837X)
u32 sata_clk;
#endif
@@ -200,8 +197,8 @@ int get_clocks(void)
}
#endif
-#if defined(CONFIG_ARCH_MPC8308) || defined(CONFIG_ARCH_MPC8315) || \
- defined(CONFIG_ARCH_MPC834X) || defined(CONFIG_ARCH_MPC837X)
+#if defined(CONFIG_ARCH_MPC8308) || defined(CONFIG_ARCH_MPC834X) || \
+ defined(CONFIG_ARCH_MPC837X)
switch ((sccr & SCCR_TSEC2CM) >> SCCR_TSEC2CM_SHIFT) {
case 0:
tsec2_clk = 0;
@@ -294,25 +291,6 @@ int get_clocks(void)
return -8;
}
#endif
-#if defined(CONFIG_ARCH_MPC8315)
- switch ((sccr & SCCR_TDMCM) >> SCCR_TDMCM_SHIFT) {
- case 0:
- tdm_clk = 0;
- break;
- case 1:
- tdm_clk = csb_clk;
- break;
- case 2:
- tdm_clk = csb_clk / 2;
- break;
- case 3:
- tdm_clk = csb_clk / 3;
- break;
- default:
- /* unknown SCCR_TDMCM value */
- return -8;
- }
-#endif
#if defined(CONFIG_ARCH_MPC834X)
i2c1_clk = tsec2_clk;
@@ -372,7 +350,7 @@ int get_clocks(void)
}
#endif
-#if defined(CONFIG_ARCH_MPC837X) || defined(CONFIG_ARCH_MPC8315)
+#if defined(CONFIG_ARCH_MPC837X)
switch ((sccr & SCCR_SATA1CM) >> SCCR_SATA1CM_SHIFT) {
case 0:
sata_clk = 0;
@@ -462,9 +440,6 @@ int get_clocks(void)
#if defined(CONFIG_ARCH_MPC834X)
gd->arch.usbmph_clk = usbmph_clk;
#endif
-#if defined(CONFIG_ARCH_MPC8315)
- gd->arch.tdm_clk = tdm_clk;
-#endif
#if defined(CONFIG_FSL_ESDHC)
gd->arch.sdhc_clk = sdhc_clk;
#endif
@@ -491,7 +466,7 @@ int get_clocks(void)
gd->arch.pciexp1_clk = pciexp1_clk;
gd->arch.pciexp2_clk = pciexp2_clk;
#endif
-#if defined(CONFIG_ARCH_MPC837X) || defined(CONFIG_ARCH_MPC8315)
+#if defined(CONFIG_ARCH_MPC837X)
gd->arch.sata_clk = sata_clk;
#endif
gd->pci_clk = pci_sync_in;
@@ -559,10 +534,6 @@ static int do_clocks(struct cmd_tbl *cmdtp, int flag, int argc,
printf(" I2C2: %-4s MHz\n",
strmhz(buf, gd->arch.i2c2_clk));
#endif
-#if defined(CONFIG_ARCH_MPC8315)
- printf(" TDM: %-4s MHz\n",
- strmhz(buf, gd->arch.tdm_clk));
-#endif
#if defined(CONFIG_FSL_ESDHC)
printf(" SDHC: %-4s MHz\n",
strmhz(buf, gd->arch.sdhc_clk));
@@ -590,7 +561,7 @@ static int do_clocks(struct cmd_tbl *cmdtp, int flag, int argc,
printf(" PCIEXP2: %-4s MHz\n",
strmhz(buf, gd->arch.pciexp2_clk));
#endif
-#if defined(CONFIG_ARCH_MPC837X) || defined(CONFIG_ARCH_MPC8315)
+#if defined(CONFIG_ARCH_MPC837X)
printf(" SATA: %-4s MHz\n",
strmhz(buf, gd->arch.sata_clk));
#endif