ppc: Remove MPC8349EMDS board and ARCH_MPC8349 support

This board has not been converted to CONFIG_DM by the deadline.
Remove it.

Cc: Priyanka Jain <priyanka.jain@nxp.com>
Signed-off-by: Tom Rini <trini@konsulko.com>

10 files changed, 45 insertions, 214 deletions

diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index fcf4ef2..cff98f7 100644
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -8,22 +8,6 @@ choice
 	prompt "Target select"
 	optional
 
-config TARGET_MPC8349EMDS
-	bool "Support MPC8349EMDS"
-	select ARCH_MPC8349
-	select BOARD_EARLY_INIT_F
-	select SYS_FSL_DDR
-	select SYS_FSL_DDR_BE
-	select SYS_FSL_HAS_DDR2
-
-config TARGET_MPC8349EMDS_SDRAM
-	bool "Support MPC8349EMDS_SDRAM"
-	select ARCH_MPC8349
-	select BOARD_EARLY_INIT_F
-	select SYS_FSL_DDR
-	select SYS_FSL_DDR_BE
-	select SYS_FSL_HAS_DDR2
-
 config TARGET_MPC837XERDB
 	bool "Support MPC837XERDB"
 	select ARCH_MPC837X
@@ -173,15 +157,6 @@ config ARCH_MPC834X
 	bool
 	select SYS_CACHE_SHIFT_5
 
-config ARCH_MPC8349
-	bool
-	select ARCH_MPC834X
-	select MPC83XX_PCI_SUPPORT
-	select MPC83XX_TSEC1_SUPPORT
-	select MPC83XX_TSEC2_SUPPORT
-	select MPC83XX_LDP_PIN
-	select MPC83XX_SECOND_I2C
-
 config ARCH_MPC8360
 	bool
 	select MPC83XX_QUICC_ENGINE
@@ -220,36 +195,9 @@ source "arch/powerpc/cpu/mpc83xx/sysio/Kconfig"
 source "arch/powerpc/cpu/mpc83xx/arbiter/Kconfig"
 source "arch/powerpc/cpu/mpc83xx/initreg/Kconfig"
 
-menu "Legacy options"
-
-if ARCH_MPC8349
-
-#TODO(mario.six@gdsys.cc): Remove when mpc83xx PCI has been converted to DM/DT
-choice
-	prompt "PMC slot configuration"
-
-config PCI_ALL_PCI1
-	bool "All PMC slots on PCI1"
-
-config PCI_ONE_PCI1
-	bool "First PMC1 on PCI1"
-
-config PCI_TWO_PCI1
-	bool "First two PMC1 on PCI1"
-
-endchoice
-
-config PCI_64BIT
-	bool "PMC2 is 64bit"
-
-endif
-
-endmenu
-
 config FSL_ELBC
 	bool
 
-source "board/freescale/mpc8349emds/Kconfig"
 source "board/freescale/mpc837xerdb/Kconfig"
 source "board/ids/ids8313/Kconfig"
 source "board/keymile/Kconfig"
diff --git a/arch/powerpc/cpu/mpc83xx/elbc/Kconfig.elbc0 b/arch/powerpc/cpu/mpc83xx/elbc/Kconfig.elbc0
index 23e81ab..208eed0 100644
--- a/arch/powerpc/cpu/mpc83xx/elbc/Kconfig.elbc0
+++ b/arch/powerpc/cpu/mpc83xx/elbc/Kconfig.elbc0
@@ -22,7 +22,7 @@ config BR0_PORTSIZE_16BIT
 
 config BR0_PORTSIZE_32BIT
 	depends on !BR0_MACHINE_FCM
-	depends on ARCH_MPC8349 || ARCH_MPC8360 || ARCH_MPC8379
+	depends on ARCH_MPC8360 || ARCH_MPC8379
 	bool "32-bit"
 
 endchoice
@@ -58,11 +58,11 @@ config BR0_MACHINE_GPCM
 	bool "GPCM"
 
 config BR0_MACHINE_FCM
-	depends on !ARCH_MPC832X && !ARCH_MPC8349 && !ARCH_MPC8360
+	depends on !ARCH_MPC832X && !ARCH_MPC8360
 	bool "FCM"
 
 config BR0_MACHINE_SDRAM
-	depends on ARCH_MPC8349 || ARCH_MPC8360
+	depends on ARCH_MPC8360
 	bool "SDRAM"
 
 config BR0_MACHINE_UPMA
diff --git a/arch/powerpc/cpu/mpc83xx/elbc/Kconfig.elbc1 b/arch/powerpc/cpu/mpc83xx/elbc/Kconfig.elbc1
index 08dcc7d..1dc3e75 100644
--- a/arch/powerpc/cpu/mpc83xx/elbc/Kconfig.elbc1
+++ b/arch/powerpc/cpu/mpc83xx/elbc/Kconfig.elbc1
@@ -22,7 +22,7 @@ config BR1_PORTSIZE_16BIT
 
 config BR1_PORTSIZE_32BIT
 	depends on !BR1_MACHINE_FCM
-	depends on ARCH_MPC8349 || ARCH_MPC8360 || ARCH_MPC8379
+	depends on ARCH_MPC8360 || ARCH_MPC8379
 	bool "32-bit"
 
 endchoice
@@ -58,11 +58,11 @@ config BR1_MACHINE_GPCM
 	bool "GPCM"
 
 config BR1_MACHINE_FCM
-	depends on !ARCH_MPC832X && !ARCH_MPC8349 && !ARCH_MPC8360
+	depends on !ARCH_MPC832X && !ARCH_MPC8360
 	bool "FCM"
 
 config BR1_MACHINE_SDRAM
-	depends on ARCH_MPC8349 || ARCH_MPC8360
+	depends on ARCH_MPC8360
 	bool "SDRAM"
 
 config BR1_MACHINE_UPMA
diff --git a/arch/powerpc/cpu/mpc83xx/elbc/Kconfig.elbc2 b/arch/powerpc/cpu/mpc83xx/elbc/Kconfig.elbc2
index 298d87f..a9b2546 100644
--- a/arch/powerpc/cpu/mpc83xx/elbc/Kconfig.elbc2
+++ b/arch/powerpc/cpu/mpc83xx/elbc/Kconfig.elbc2
@@ -22,7 +22,7 @@ config BR2_PORTSIZE_16BIT
 
 config BR2_PORTSIZE_32BIT
 	depends on !BR2_MACHINE_FCM
-	depends on ARCH_MPC8349 || ARCH_MPC8360 || ARCH_MPC8379
+	depends on ARCH_MPC8360 || ARCH_MPC8379
 	bool "32-bit"
 
 endchoice
@@ -58,11 +58,11 @@ config BR2_MACHINE_GPCM
 	bool "GPCM"
 
 config BR2_MACHINE_FCM
-	depends on !ARCH_MPC832X && !ARCH_MPC8349 && !ARCH_MPC8360
+	depends on !ARCH_MPC832X && !ARCH_MPC8360
 	bool "FCM"
 
 config BR2_MACHINE_SDRAM
-	depends on ARCH_MPC8349 || ARCH_MPC8360
+	depends on ARCH_MPC8360
 	bool "SDRAM"
 
 config BR2_MACHINE_UPMA
diff --git a/arch/powerpc/cpu/mpc83xx/elbc/Kconfig.elbc3 b/arch/powerpc/cpu/mpc83xx/elbc/Kconfig.elbc3
index 963831b..94442cd 100644
--- a/arch/powerpc/cpu/mpc83xx/elbc/Kconfig.elbc3
+++ b/arch/powerpc/cpu/mpc83xx/elbc/Kconfig.elbc3
@@ -22,7 +22,7 @@ config BR3_PORTSIZE_16BIT
 
 config BR3_PORTSIZE_32BIT
 	depends on !BR3_MACHINE_FCM
-	depends on ARCH_MPC8349 || ARCH_MPC8360 || ARCH_MPC8379
+	depends on ARCH_MPC8360 || ARCH_MPC8379
 	bool "32-bit"
 
 endchoice
@@ -58,11 +58,11 @@ config BR3_MACHINE_GPCM
 	bool "GPCM"
 
 config BR3_MACHINE_FCM
-	depends on !ARCH_MPC832X && !ARCH_MPC8349 && !ARCH_MPC8360
+	depends on !ARCH_MPC832X && !ARCH_MPC8360
 	bool "FCM"
 
 config BR3_MACHINE_SDRAM
-	depends on ARCH_MPC8349 || ARCH_MPC8360
+	depends on ARCH_MPC8360
 	bool "SDRAM"
 
 config BR3_MACHINE_UPMA
diff --git a/arch/powerpc/cpu/mpc83xx/elbc/Kconfig.elbc4 b/arch/powerpc/cpu/mpc83xx/elbc/Kconfig.elbc4
index 0063dab..5d69385 100644
--- a/arch/powerpc/cpu/mpc83xx/elbc/Kconfig.elbc4
+++ b/arch/powerpc/cpu/mpc83xx/elbc/Kconfig.elbc4
@@ -22,7 +22,7 @@ config BR4_PORTSIZE_16BIT
 
 config BR4_PORTSIZE_32BIT
 	depends on !BR4_MACHINE_FCM
-	depends on ARCH_MPC8349 || ARCH_MPC8360 || ARCH_MPC8379
+	depends on ARCH_MPC8360 || ARCH_MPC8379
 	bool "32-bit"
 
 endchoice
@@ -58,11 +58,11 @@ config BR4_MACHINE_GPCM
 	bool "GPCM"
 
 config BR4_MACHINE_FCM
-	depends on !ARCH_MPC832X && !ARCH_MPC8349 && !ARCH_MPC8360
+	depends on !ARCH_MPC832X && !ARCH_MPC8360
 	bool "FCM"
 
 config BR4_MACHINE_SDRAM
-	depends on ARCH_MPC8349 || ARCH_MPC8360
+	depends on ARCH_MPC8360
 	bool "SDRAM"
 
 config BR4_MACHINE_UPMA
diff --git a/arch/powerpc/cpu/mpc83xx/hid/Kconfig b/arch/powerpc/cpu/mpc83xx/hid/Kconfig
index c367ad2..1f61108 100644
--- a/arch/powerpc/cpu/mpc83xx/hid/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/hid/Kconfig
@@ -434,7 +434,7 @@ config HID2_IWLCK_1
 config HID2_IWLCK_2
 	bool "Way 0 through 2 locked"
 
-if ARCH_MPC8349 || ARCH_MPC8360 || ARCH_MPC8379
+if ARCH_MPC8360 || ARCH_MPC8379
 
 config HID2_IWLCK_3
 	bool "Way 0 through 3 locked"
@@ -470,7 +470,7 @@ config HID2_DWLCK_1
 config HID2_DWLCK_2
 	bool "Way 0 through 2 locked"
 
-if ARCH_MPC8349 || ARCH_MPC8360 || ARCH_MPC8379
+if ARCH_MPC8360 || ARCH_MPC8379
 
 config HID2_DWLCK_3
 	bool "Way 0 through 3 locked"
diff --git a/arch/powerpc/cpu/mpc83xx/hrcw/Kconfig b/arch/powerpc/cpu/mpc83xx/hrcw/Kconfig
index 75ec9c9..71fa738 100644
--- a/arch/powerpc/cpu/mpc83xx/hrcw/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/hrcw/Kconfig
@@ -7,7 +7,7 @@ config LBMC_CLOCK_MODE_1_1
 	bool "1 : 1"
 
 config LBMC_CLOCK_MODE_1_2
-	depends on ARCH_MPC8349 || ARCH_MPC8360 || ARCH_MPC837X
+	depends on ARCH_MPC8360 || ARCH_MPC837X
 	bool "1 : 2"
 
 endchoice
@@ -19,12 +19,12 @@ config DDR_MC_CLOCK_MODE_1_2
 	bool "1 : 2"
 
 config DDR_MC_CLOCK_MODE_1_1
-	depends on ARCH_MPC8349 || ARCH_MPC8360 || ARCH_MPC837X
+	depends on ARCH_MPC8360 || ARCH_MPC837X
 	bool "1 : 1"
 
 endchoice
 
-if !ARCH_MPC8313 && !ARCH_MPC832X && !ARCH_MPC8349
+if !ARCH_MPC8313 && !ARCH_MPC832X
 
 choice
 	prompt "System PLL VCO division"
@@ -67,43 +67,43 @@ config SYSTEM_PLL_FACTOR_6_1
 	bool "6 : 1"
 
 config SYSTEM_PLL_FACTOR_7_1
-	depends on ARCH_MPC8349 || ARCH_MPV8360 || ARCH_MPC837X
+	depends on ARCH_MPV8360 || ARCH_MPC837X
 	bool "7 : 1"
 
 config SYSTEM_PLL_FACTOR_8_1
-	depends on ARCH_MPC8349 || ARCH_MPV8360 || ARCH_MPC837X
+	depends on ARCH_MPV8360 || ARCH_MPC837X
 	bool "8 : 1"
 
 config SYSTEM_PLL_FACTOR_9_1
-	depends on ARCH_MPC8349 || ARCH_MPV8360 || ARCH_MPC837X
+	depends on ARCH_MPV8360 || ARCH_MPC837X
 	bool "9 : 1"
 
 config SYSTEM_PLL_FACTOR_10_1
-	depends on ARCH_MPC8349 || ARCH_MPV8360 || ARCH_MPC837X
+	depends on ARCH_MPV8360 || ARCH_MPC837X
 	bool "10 : 1"
 
 config SYSTEM_PLL_FACTOR_11_1
-	depends on ARCH_MPC8349 || ARCH_MPV8360 || ARCH_MPC837X
+	depends on ARCH_MPV8360 || ARCH_MPC837X
 	bool "11 : 1"
 
 config SYSTEM_PLL_FACTOR_12_1
-	depends on ARCH_MPC8349 || ARCH_MPV8360 || ARCH_MPC837X
+	depends on ARCH_MPV8360 || ARCH_MPC837X
 	bool "12 : 1"
 
 config SYSTEM_PLL_FACTOR_13_1
-	depends on ARCH_MPC8349 || ARCH_MPV8360 || ARCH_MPC837X
+	depends on ARCH_MPV8360 || ARCH_MPC837X
 	bool "13 : 1"
 
 config SYSTEM_PLL_FACTOR_14_1
-	depends on ARCH_MPC8349 || ARCH_MPV8360 || ARCH_MPC837X
+	depends on ARCH_MPV8360 || ARCH_MPC837X
 	bool "14 : 1"
 
 config SYSTEM_PLL_FACTOR_15_1
-	depends on ARCH_MPC8349 || ARCH_MPV8360 || ARCH_MPC837X
+	depends on ARCH_MPV8360 || ARCH_MPC837X
 	bool "15 : 1"
 
 config SYSTEM_PLL_FACTOR_16_1
-	depends on ARCH_MPC8349 || ARCH_MPV8360
+	depends on ARCH_MPV8360
 	bool "16 : 1"
 
 endchoice
@@ -310,21 +310,6 @@ config PCI_HOST_MODE_ENABLE
 
 endchoice
 
-if ARCH_MPC8349
-
-choice
-	prompt "PCI 64-bit mode"
-
-config PCI_64BIT_MODE_DISABLE
-	bool "Disabled"
-
-config PCI_64BIT_MODE_ENABLE
-	bool "Enabled"
-
-endchoice
-
-endif
-
 choice
 	prompt "PCI internal arbiter 1 mode"
 
@@ -336,21 +321,6 @@ config PCI_INT_ARBITER1_ENABLE
 
 endchoice
 
-if ARCH_MPC8349
-
-choice
-	prompt "PCI internal arbiter 2 mode"
-
-config PCI_INT_ARBITER2_DISABLE
-	bool "Disabled"
-
-config PCI_INT_ARBITER2_ENABLE
-	bool "Enabled"
-
-endchoice
-
-endif
-
 if ARCH_MPC8360
 
 choice
@@ -425,10 +395,6 @@ config BOOT_ROM_INTERFACE_PCI1
 	depends on MPC83XX_PCI_SUPPORT
 	bool "PCI1"
 
-config BOOT_ROM_INTERFACE_PCI2
-	depends on MPC83XX_PCI_SUPPORT && ARCH_MPC8349
-	bool "PCI2"
-
 config BOOT_ROM_INTERFACE_ON_CHIP_BOOT_ROM
 	depends on ARCH_MPC837X
 	bool "PCI2"
@@ -448,15 +414,15 @@ config BOOT_ROM_INTERFACE_GPCM_16BIT
 	bool "Local bus GPCM - 16-bit ROM"
 
 config BOOT_ROM_INTERFACE_GPCM_32BIT
-	depends on ARCH_MPC8349 || ARCH_MPC8360 || ARCH_MPC837X
+	depends on ARCH_MPC8360 || ARCH_MPC837X
 	bool "Local bus GPCM - 32-bit ROM"
 
 config BOOT_ROM_INTERFACE_NAND_FLASH_8BIT_SMALL
-	depends on !ARCH_MPC832X && !ARCH_MPC8349 && !ARCH_MPC8360
+	depends on !ARCH_MPC832X && !ARCH_MPC8360
 	bool "Local bus NAND Flash- 8-bit small page ROM"
 
 config BOOT_ROM_INTERFACE_NAND_FLASH_8BIT_LARGE
-	depends on !ARCH_MPC832X && !ARCH_MPC8349 && !ARCH_MPC8360
+	depends on !ARCH_MPC832X && !ARCH_MPC8360
 	bool "Local bus NAND Flash- 8-bit large page ROM"
 
 endchoice
@@ -467,11 +433,10 @@ choice
 	prompt "TSEC1 mode"
 
 config TSEC1_MODE_MII
-	depends on !ARCH_MPC8349
 	bool "MII"
 
 config TSEC1_MODE_RMII
-	depends on ARCH_MPC831X && !ARCH_MPC8349
+	depends on ARCH_MPC831X
 	bool "RMII"
 
 config TSEC1_MODE_RGMII
@@ -481,14 +446,6 @@ config TSEC1_MODE_RTBI
 	depends on ARCH_MPC831X || ARCH_MPC837X
 	bool "RTBI"
 
-config TSEC1_MODE_GMII
-	depends on ARCH_MPC8349
-	bool "GMII"
-
-config TSEC1_MODE_TBI
-	depends on ARCH_MPC8349
-	bool "TBI"
-
 config TSEC1_MODE_SGMII
 	depends on ARCH_MPC831X || ARCH_MPC837X
 	bool "SGMII"
@@ -503,11 +460,10 @@ choice
 	prompt "TSEC2 mode"
 
 config TSEC2_MODE_MII
-	depends on !ARCH_MPC8349
 	bool "MII"
 
 config TSEC2_MODE_RMII
-	depends on ARCH_MPC831X && !ARCH_MPC8349
+	depends on ARCH_MPC831X
 	bool "RMII"
 
 config TSEC2_MODE_RGMII
@@ -517,14 +473,6 @@ config TSEC2_MODE_RTBI
 	depends on ARCH_MPC831X || ARCH_MPC837X
 	bool "RTBI"
 
-config TSEC2_MODE_GMII
-	depends on ARCH_MPC8349
-	bool "GMII"
-
-config TSEC2_MODE_TBI
-	depends on ARCH_MPC8349
-	bool "TBI"
-
 config TSEC2_MODE_SGMII
 	depends on ARCH_MPC831X || ARCH_MPC837X
 	bool "SGMII"
@@ -559,7 +507,7 @@ endchoice
 
 endif
 
-if ARCH_MPC831X || ARCH_MPC832X || ARCH_MPC8349 || ARCH_MPC8360
+if ARCH_MPC831X || ARCH_MPC832X || ARCH_MPC8360
 
 choice
 	prompt "LALE timing"
@@ -603,7 +551,7 @@ config DDR_MC_CLOCK_MODE
 
 config SYSTEM_PLL_VCO_DIV
 	int
-	default 0 if ARCH_MPC8349 || ARCH_MPC832X
+	default 0 if ARCH_MPC832X
 	default 2 if ARCH_MPC8313
 	default 0 if SYSTEM_PLL_VCO_DIV_2 && !ARCH_MPC8360 && !ARCH_MPC837X
 	default 1 if SYSTEM_PLL_VCO_DIV_4 && !ARCH_MPC8360 && !ARCH_MPC837X
@@ -675,7 +623,6 @@ config BOOT_ROM_INTERFACE
 	hex
 	default 0x0 if BOOT_ROM_INTERFACE_DDR_SDRAM
 	default 0x4 if BOOT_ROM_INTERFACE_PCI1
-	default 0x8 if BOOT_ROM_INTERFACE_PCI2
 	default 0x8 if BOOT_ROM_INTERFACE_ESDHC
 	default 0xc if BOOT_ROM_INTERFACE_SPI
 	default 0xc if BOOT_ROM_INTERFACE_ON_CHIP_BOOT_ROM
@@ -690,26 +637,18 @@ config TSEC1_MODE
 	default 0x0 if !MPC83XX_TSEC1_SUPPORT
 	default 0x0 if TSEC1_MODE_MII
 	default 0x1 if TSEC1_MODE_RMII
-	default 0x3 if TSEC1_MODE_RGMII && !ARCH_MPC8349
-	default 0x5 if TSEC1_MODE_RTBI && !ARCH_MPC8349
+	default 0x3 if TSEC1_MODE_RGMII
+	default 0x5 if TSEC1_MODE_RTBI
 	default 0x6 if TSEC1_MODE_SGMII
-	default 0x0 if TSEC1_MODE_RGMII && ARCH_MPC8349
-	default 0x1 if TSEC1_MODE_RTBI && ARCH_MPC8349
-	default 0x2 if TSEC1_MODE_GMII
-	default 0x3 if TSEC1_MODE_TBI
 
 config TSEC2_MODE
 	hex
 	default 0x0 if !MPC83XX_TSEC2_SUPPORT
 	default 0x0 if TSEC2_MODE_MII
 	default 0x1 if TSEC2_MODE_RMII
-	default 0x3 if TSEC2_MODE_RGMII && !ARCH_MPC8349
-	default 0x5 if TSEC2_MODE_RTBI && !ARCH_MPC8349
+	default 0x3 if TSEC2_MODE_RGMII
+	default 0x5 if TSEC2_MODE_RTBI
 	default 0x6 if TSEC2_MODE_SGMII
-	default 0x0 if TSEC2_MODE_RGMII && ARCH_MPC8349
-	default 0x1 if TSEC2_MODE_RTBI && ARCH_MPC8349
-	default 0x2 if TSEC2_MODE_GMII
-	default 0x3 if TSEC2_MODE_TBI
 
 config SECONDARY_DDR_IO
 	int
@@ -792,9 +731,7 @@ config PCI_HOST_MODE
 
 config PCI_64BIT_MODE
 	int
-	default 0 if !ARCH_MPC8349
-	default 0 if PCI_64BIT_MODE_DISABLE
-	default 1 if PCI_64BIT_MODE_ENABLE
+	default 0
 
 config PCI_INT_ARBITER1
 	int
@@ -804,9 +741,7 @@ config PCI_INT_ARBITER1
 
 config PCI_INT_ARBITER2
 	int
-	default 0 if !ARCH_MPC8349
-	default 0 if PCI_INT_ARBITER2_DISABLE
-	default 1 if PCI_INT_ARBITER2_ENABLE
+	default 0
 
 config PCI_CLOCK_OUTPUT_DRIVE
 	int
diff --git a/arch/powerpc/cpu/mpc83xx/hrcw/hrcw.h b/arch/powerpc/cpu/mpc83xx/hrcw/hrcw.h
index 7d66ba7..0f34267 100644
--- a/arch/powerpc/cpu/mpc83xx/hrcw/hrcw.h
+++ b/arch/powerpc/cpu/mpc83xx/hrcw/hrcw.h
@@ -1,11 +1,3 @@
-#ifdef CONFIG_ARCH_MPC8349
-#define TSEC1_MODE_SHIFT 17
-#define TSEC2_MODE_SHIFT 19
-#else
-#define TSEC1_MODE_SHIFT 18
-#define TSEC2_MODE_SHIFT 21
-#endif
-
 #define CONFIG_SYS_HRCW_LOW (\
 	(CONFIG_LBMC_CLOCK_MODE << (31 - 0)) |\
 	(CONFIG_DDR_MC_CLOCK_MODE << (31 - 1)) |\
@@ -28,8 +20,8 @@
 	(CONFIG_BOOT_SEQUENCER << (31 - 7)) |\
 	(CONFIG_SOFTWARE_WATCHDOG << (31 - 8)) |\
 	(CONFIG_BOOT_ROM_INTERFACE << (31 - 13)) |\
-	(CONFIG_TSEC1_MODE << (31 - TSEC1_MODE_SHIFT)) |\
-	(CONFIG_TSEC2_MODE << (31 - TSEC2_MODE_SHIFT)) |\
+	(CONFIG_TSEC1_MODE << (31 - 18)) |\
+	(CONFIG_TSEC2_MODE << (31 - 21)) |\
 	(CONFIG_SECONDARY_DDR_IO << (31 - 27)) |\
 	(CONFIG_TRUE_LITTLE_ENDIAN << (31 - 28)) |\
 	(CONFIG_LALE_TIMING << (31 - 29)) |\
diff --git a/arch/powerpc/cpu/mpc83xx/initreg/Kconfig.spcr b/arch/powerpc/cpu/mpc83xx/initreg/Kconfig.spcr
index f32309e..33e1295 100644
--- a/arch/powerpc/cpu/mpc83xx/initreg/Kconfig.spcr
+++ b/arch/powerpc/cpu/mpc83xx/initreg/Kconfig.spcr
@@ -38,50 +38,6 @@ endchoice
 
 endif
 
-if ARCH_MPC8349
-
-choice
-	prompt "TSEC1 emergency priority"
-
-config SPCR_TSEC1EP_UNSET
-	bool "Don't set value"
-
-config SPCR_TSEC1EP_0
-	bool "Level 0 (lowest priority)"
-
-config SPCR_TSEC1EP_1
-	bool "Level 1"
-
-config SPCR_TSEC1EP_2
-	bool "Level 2"
-
-config SPCR_TSEC1EP_3
-	bool "Level 3 (highest priority)"
-
-endchoice
-
-choice
-	prompt "TSEC2 emergency priority"
-
-config SPCR_TSEC2EP_UNSET
-	bool "Don't set value"
-
-config SPCR_TSEC2EP_0
-	bool "Level 0 (lowest priority)"
-
-config SPCR_TSEC2EP_1
-	bool "Level 1"
-
-config SPCR_TSEC2EP_2
-	bool "Level 2"
-
-config SPCR_TSEC2EP_3
-	bool "Level 3 (highest priority)"
-
-endchoice
-
-endif
-
 config SPCR_OPT
 	hex
 	default 0x0 if SPCR_OPT_UNSET