Skip to contentSkip to conversation

pci: Remove non-DM board_pci_fixup_dev() declaration

PATCH In review Tom Rini 11 participants 71 messages May 15, 2021 – Jul 19, 2021 Page 1 of 2

Subsystems (11)
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/27 pci: Remove non-DM board_pci_fixup_dev() declaration

With the ventana boards migrated to DM_PCI and DM_ETH, we can remove this prototype.

Cc Stefano Babic <[email protected]>

---
This requires "imx: ventana: enable dm support for PCI and FEC ethernet" to be applied first and can go in whenever that patch is applied.

---
 include/pci.h | 6 ------
 1 file changed, 6 deletions(-)
include/pci.h +0 -6
index 2353cebb2a3e..8e62235bf40a 100644
@@ -828,12 +828,6 @@ int pci_find_next_ext_capability(struct pci_controller *hose,
 int pci_hose_find_ext_capability(struct pci_controller *hose,
 				 pci_dev_t dev, int cap);
 
-#ifdef CONFIG_PCI_FIXUP_DEV
-extern void board_pci_fixup_dev(struct pci_controller *hose, pci_dev_t dev,
-				unsigned short vendor,
-				unsigned short device,
-				unsigned short class);
-#endif
 #endif /* !defined(CONFIG_DM_PCI) || defined(CONFIG_DM_PCI_COMPAT) */
 
 const char * pci_class_str(u8 class);
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/27 ppc: Drop MPC837XERDB_SLAVE for now

Drop the MPC837XERDB_SLAVE configuration.

---
 configs/MPC837XERDB_SLAVE_defconfig | 140 ----------------------------
 1 file changed, 140 deletions(-)
 delete mode 100644 configs/MPC837XERDB_SLAVE_defconfig
configs/MPC837XERDB_SLAVE_defconfig deleted +0 -140
deleted file mode 100644
index fa27cd07bb56..000000000000
@@ -1,140 +0,0 @@
-CONFIG_PPC=y
-CONFIG_SYS_TEXT_BASE=0xFE000000
-CONFIG_ENV_SIZE=0x4000
-CONFIG_ENV_SECT_SIZE=0x10000
-CONFIG_SYS_CLK_FREQ=66666667
-CONFIG_MPC83xx=y
-CONFIG_TARGET_MPC837XERDB=y
-CONFIG_DDR_MC_CLOCK_MODE_1_1=y
-CONFIG_SYSTEM_PLL_FACTOR_5_1=y
-CONFIG_CORE_PLL_RATIO_2_1=y
-CONFIG_BOOT_ROM_INTERFACE_GPCM_16BIT=y
-CONFIG_TSEC1_MODE_RGMII=y
-CONFIG_TSEC2_MODE_RGMII=y
-CONFIG_LDP_PIN_MUX_STATE_0=y
-CONFIG_BAT0=y
-CONFIG_BAT0_NAME="SDRAM_LOWER"
-CONFIG_BAT0_BASE=0x00000000
-CONFIG_BAT0_LENGTH_256_MBYTES=y
-CONFIG_BAT0_ACCESS_RW=y
-CONFIG_BAT0_ICACHE_MEMORYCOHERENCE=y
-CONFIG_BAT0_DCACHE_MEMORYCOHERENCE=y
-CONFIG_BAT0_USER_MODE_VALID=y
-CONFIG_BAT0_SUPERVISOR_MODE_VALID=y
-CONFIG_BAT1=y
-CONFIG_BAT1_NAME="SDRAM_UPPER"
-CONFIG_BAT1_BASE=0x10000000
-CONFIG_BAT1_LENGTH_256_MBYTES=y
-CONFIG_BAT1_ACCESS_RW=y
-CONFIG_BAT1_ICACHE_MEMORYCOHERENCE=y
-CONFIG_BAT1_DCACHE_MEMORYCOHERENCE=y
-CONFIG_BAT1_USER_MODE_VALID=y
-CONFIG_BAT1_SUPERVISOR_MODE_VALID=y
-CONFIG_BAT2=y
-CONFIG_BAT2_NAME="IMMR"
-CONFIG_BAT2_BASE=0xE0000000
-CONFIG_BAT2_LENGTH_8_MBYTES=y
-CONFIG_BAT2_ACCESS_RW=y
-CONFIG_BAT2_ICACHE_INHIBITED=y
-CONFIG_BAT2_ICACHE_GUARDED=y
-CONFIG_BAT2_DCACHE_INHIBITED=y
-CONFIG_BAT2_DCACHE_GUARDED=y
-CONFIG_BAT2_USER_MODE_VALID=y
-CONFIG_BAT2_SUPERVISOR_MODE_VALID=y
-CONFIG_BAT3=y
-CONFIG_BAT3_NAME="L2_SWITCH"
-CONFIG_BAT3_BASE=0xF0000000
-CONFIG_BAT3_ACCESS_RW=y
-CONFIG_BAT3_ICACHE_INHIBITED=y
-CONFIG_BAT3_ICACHE_GUARDED=y
-CONFIG_BAT3_DCACHE_INHIBITED=y
-CONFIG_BAT3_DCACHE_GUARDED=y
-CONFIG_BAT3_USER_MODE_VALID=y
-CONFIG_BAT3_SUPERVISOR_MODE_VALID=y
-CONFIG_LBLAW0=y
-CONFIG_LBLAW0_BASE=0xFE000000
-CONFIG_LBLAW0_NAME="FLASH"
-CONFIG_LBLAW0_LENGTH_8_MBYTES=y
-CONFIG_LBLAW1=y
-CONFIG_LBLAW1_BASE=0xE0600000
-CONFIG_LBLAW1_NAME="NAND"
-CONFIG_LBLAW1_LENGTH_32_KBYTES=y
-CONFIG_LBLAW2=y
-CONFIG_LBLAW2_BASE=0xF0000000
-CONFIG_LBLAW2_NAME="VSC7385"
-CONFIG_LBLAW2_LENGTH_128_KBYTES=y
-CONFIG_ELBC_BR0_OR0=y
-CONFIG_BR0_OR0_NAME="FLASH"
-CONFIG_BR0_OR0_BASE=0xFE000000
-CONFIG_BR0_PORTSIZE_16BIT=y
-CONFIG_OR0_AM_8_MBYTES=y
-CONFIG_OR0_SCY_9=y
-CONFIG_OR0_XACS_EXTENDED=y
-CONFIG_OR0_EHTR_1_CYCLE=y
-CONFIG_OR0_EAD_EXTRA=y
-CONFIG_ELBC_BR1_OR1=y
-CONFIG_BR1_OR1_NAME="NAND"
-CONFIG_BR1_OR1_BASE=0xE0600000
-CONFIG_BR1_ERRORCHECKING_BOTH=y
-CONFIG_BR1_MACHINE_FCM=y
-CONFIG_OR1_SCY_1=y
-CONFIG_OR1_CSCT_8_CYCLE=y
-CONFIG_OR1_CST_ONE_CLOCK=y
-CONFIG_OR1_CHT_TWO_CLOCK=y
-CONFIG_OR1_TRLX_RELAXED=y
-CONFIG_OR1_EHTR_8_CYCLE=y
-CONFIG_ELBC_BR2_OR2=y
-CONFIG_BR2_OR2_NAME="VSC7385"
-CONFIG_BR2_OR2_BASE=0xF0000000
-CONFIG_OR2_AM_128_KBYTES=y
-CONFIG_OR2_SCY_15=y
-CONFIG_OR2_CSNT_EARLIER=y
-CONFIG_OR2_XACS_EXTENDED=y
-CONFIG_OR2_SETA_EXTERNAL=y
-CONFIG_OR2_TRLX_RELAXED=y
-CONFIG_OR2_EHTR_8_CYCLE=y
-CONFIG_OR2_EAD_EXTRA=y
-CONFIG_HID0_FINAL_EMCP=y
-CONFIG_HID0_FINAL_ICE=y
-CONFIG_HID2_HBE=y
-CONFIG_ACR_PIPE_DEP_4=y
-CONFIG_ACR_RPTCNT_4=y
-CONFIG_SPCR_TSECEP_3=y
-CONFIG_LCRR_DBYP_PLL_BYPASSED=y
-CONFIG_LCRR_CLKDIV_8=y
-CONFIG_OF_BOARD_SETUP=y
-CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SYS_EXTRA_OPTIONS="PCISLAVE,PCIE"
-CONFIG_BOOTDELAY=6
-CONFIG_HUSH_PARSER=y
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_PCI=y
-CONFIG_CMD_USB=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_DATE=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_FAT=y
-CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_ADDR=0xFE080000
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_PHY_ATHEROS=y
-CONFIG_PHY_BROADCOM=y
-CONFIG_PHY_DAVICOM=y
-CONFIG_PHY_LXT=y
-CONFIG_PHY_NATSEMI=y
-CONFIG_PHY_REALTEK=y
-CONFIG_PHY_SMSC=y
-CONFIG_PHY_VITESSE=y
-CONFIG_TSEC_ENET=y
-CONFIG_SYS_NS16550=y
-CONFIG_USB=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
Signature · 1 line
2.17.1
#2 lore raw

PATCH 2/27 ppc: Drop MPC837XERDB_SLAVE for now

? Hi Tom

Quoted 4 lines · Tom Rini

Drop the MPC837XERDB_SLAVE configuration.

?? Acked-by: Sinan Akman <[email protected]>

?? Thanks
?? -- sinan

Quoted 151 lines
---
  configs/MPC837XERDB_SLAVE_defconfig | 140 ----------------------------
  1 file changed, 140 deletions(-)

delete mode 100644 configs/MPC837XERDB_SLAVE_defconfig

configs/MPC837XERDB_SLAVE_defconfig deleted +0 -140
deleted file mode 100644
index fa27cd07bb56..000000000000
@@ -1,140 +0,0 @@
-CONFIG_PPC=y
-CONFIG_SYS_TEXT_BASE=0xFE000000
-CONFIG_ENV_SIZE=0x4000
-CONFIG_ENV_SECT_SIZE=0x10000
-CONFIG_SYS_CLK_FREQ=66666667
-CONFIG_MPC83xx=y
-CONFIG_TARGET_MPC837XERDB=y
-CONFIG_DDR_MC_CLOCK_MODE_1_1=y
-CONFIG_SYSTEM_PLL_FACTOR_5_1=y
-CONFIG_CORE_PLL_RATIO_2_1=y
-CONFIG_BOOT_ROM_INTERFACE_GPCM_16BIT=y
-CONFIG_TSEC1_MODE_RGMII=y
-CONFIG_TSEC2_MODE_RGMII=y
-CONFIG_LDP_PIN_MUX_STATE_0=y
-CONFIG_BAT0=y
-CONFIG_BAT0_NAME="SDRAM_LOWER"
-CONFIG_BAT0_BASE=0x00000000
-CONFIG_BAT0_LENGTH_256_MBYTES=y
-CONFIG_BAT0_ACCESS_RW=y
-CONFIG_BAT0_ICACHE_MEMORYCOHERENCE=y
-CONFIG_BAT0_DCACHE_MEMORYCOHERENCE=y
-CONFIG_BAT0_USER_MODE_VALID=y
-CONFIG_BAT0_SUPERVISOR_MODE_VALID=y
-CONFIG_BAT1=y
-CONFIG_BAT1_NAME="SDRAM_UPPER"
-CONFIG_BAT1_BASE=0x10000000
-CONFIG_BAT1_LENGTH_256_MBYTES=y
-CONFIG_BAT1_ACCESS_RW=y
-CONFIG_BAT1_ICACHE_MEMORYCOHERENCE=y
-CONFIG_BAT1_DCACHE_MEMORYCOHERENCE=y
-CONFIG_BAT1_USER_MODE_VALID=y
-CONFIG_BAT1_SUPERVISOR_MODE_VALID=y
-CONFIG_BAT2=y
-CONFIG_BAT2_NAME="IMMR"
-CONFIG_BAT2_BASE=0xE0000000
-CONFIG_BAT2_LENGTH_8_MBYTES=y
-CONFIG_BAT2_ACCESS_RW=y
-CONFIG_BAT2_ICACHE_INHIBITED=y
-CONFIG_BAT2_ICACHE_GUARDED=y
-CONFIG_BAT2_DCACHE_INHIBITED=y
-CONFIG_BAT2_DCACHE_GUARDED=y
-CONFIG_BAT2_USER_MODE_VALID=y
-CONFIG_BAT2_SUPERVISOR_MODE_VALID=y
-CONFIG_BAT3=y
-CONFIG_BAT3_NAME="L2_SWITCH"
-CONFIG_BAT3_BASE=0xF0000000
-CONFIG_BAT3_ACCESS_RW=y
-CONFIG_BAT3_ICACHE_INHIBITED=y
-CONFIG_BAT3_ICACHE_GUARDED=y
-CONFIG_BAT3_DCACHE_INHIBITED=y
-CONFIG_BAT3_DCACHE_GUARDED=y
-CONFIG_BAT3_USER_MODE_VALID=y
-CONFIG_BAT3_SUPERVISOR_MODE_VALID=y
-CONFIG_LBLAW0=y
-CONFIG_LBLAW0_BASE=0xFE000000
-CONFIG_LBLAW0_NAME="FLASH"
-CONFIG_LBLAW0_LENGTH_8_MBYTES=y
-CONFIG_LBLAW1=y
-CONFIG_LBLAW1_BASE=0xE0600000
-CONFIG_LBLAW1_NAME="NAND"
-CONFIG_LBLAW1_LENGTH_32_KBYTES=y
-CONFIG_LBLAW2=y
-CONFIG_LBLAW2_BASE=0xF0000000
-CONFIG_LBLAW2_NAME="VSC7385"
-CONFIG_LBLAW2_LENGTH_128_KBYTES=y
-CONFIG_ELBC_BR0_OR0=y
-CONFIG_BR0_OR0_NAME="FLASH"
-CONFIG_BR0_OR0_BASE=0xFE000000
-CONFIG_BR0_PORTSIZE_16BIT=y
-CONFIG_OR0_AM_8_MBYTES=y
-CONFIG_OR0_SCY_9=y
-CONFIG_OR0_XACS_EXTENDED=y
-CONFIG_OR0_EHTR_1_CYCLE=y
-CONFIG_OR0_EAD_EXTRA=y
-CONFIG_ELBC_BR1_OR1=y
-CONFIG_BR1_OR1_NAME="NAND"
-CONFIG_BR1_OR1_BASE=0xE0600000
-CONFIG_BR1_ERRORCHECKING_BOTH=y
-CONFIG_BR1_MACHINE_FCM=y
-CONFIG_OR1_SCY_1=y
-CONFIG_OR1_CSCT_8_CYCLE=y
-CONFIG_OR1_CST_ONE_CLOCK=y
-CONFIG_OR1_CHT_TWO_CLOCK=y
-CONFIG_OR1_TRLX_RELAXED=y
-CONFIG_OR1_EHTR_8_CYCLE=y
-CONFIG_ELBC_BR2_OR2=y
-CONFIG_BR2_OR2_NAME="VSC7385"
-CONFIG_BR2_OR2_BASE=0xF0000000
-CONFIG_OR2_AM_128_KBYTES=y
-CONFIG_OR2_SCY_15=y
-CONFIG_OR2_CSNT_EARLIER=y
-CONFIG_OR2_XACS_EXTENDED=y
-CONFIG_OR2_SETA_EXTERNAL=y
-CONFIG_OR2_TRLX_RELAXED=y
-CONFIG_OR2_EHTR_8_CYCLE=y
-CONFIG_OR2_EAD_EXTRA=y
-CONFIG_HID0_FINAL_EMCP=y
-CONFIG_HID0_FINAL_ICE=y
-CONFIG_HID2_HBE=y
-CONFIG_ACR_PIPE_DEP_4=y
-CONFIG_ACR_RPTCNT_4=y
-CONFIG_SPCR_TSECEP_3=y
-CONFIG_LCRR_DBYP_PLL_BYPASSED=y
-CONFIG_LCRR_CLKDIV_8=y
-CONFIG_OF_BOARD_SETUP=y
-CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SYS_EXTRA_OPTIONS="PCISLAVE,PCIE"
-CONFIG_BOOTDELAY=6
-CONFIG_HUSH_PARSER=y
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_PCI=y
-CONFIG_CMD_USB=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_DATE=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_FAT=y
-CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_ADDR=0xFE080000
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_PHY_ATHEROS=y
-CONFIG_PHY_BROADCOM=y
-CONFIG_PHY_DAVICOM=y
-CONFIG_PHY_LXT=y
-CONFIG_PHY_NATSEMI=y
-CONFIG_PHY_REALTEK=y
-CONFIG_PHY_SMSC=y
-CONFIG_PHY_VITESSE=y
-CONFIG_TSEC_ENET=y
-CONFIG_SYS_NS16550=y
-CONFIG_USB=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
author
#4 lore raw

PATCH 3/27 arm: Remove integratorap* boards

In reply to Tom Rini

These boards have not been converted to CONFIG_DM_PCI by the deadline. Remove them.

Cc Linus Walleij <[email protected]>

---
I haven't fully streamlined things for integatorcp-only, in case you wish to do the DM_PCI migration instead. Thanks!

---
 arch/arm/mach-integrator/Kconfig        |   4 -
 board/armltd/integrator/MAINTAINERS     |   5 -
 board/armltd/integrator/Makefile        |   1 -
 board/armltd/integrator/integrator.c    |   1 -
 board/armltd/integrator/pci.c           | 462 ------------------------
 board/armltd/integrator/pci_v3.h        | 187 ----------
 configs/integratorap_cm720t_defconfig   |  31 --
 configs/integratorap_cm920t_defconfig   |  31 --
 configs/integratorap_cm926ejs_defconfig |  31 --
 configs/integratorap_cm946es_defconfig  |  31 --
 include/configs/integratorap.h          |  48 ---
 11 files changed, 832 deletions(-)
 delete mode 100644 board/armltd/integrator/pci.c
 delete mode 100644 board/armltd/integrator/pci_v3.h
 delete mode 100644 configs/integratorap_cm720t_defconfig
 delete mode 100644 configs/integratorap_cm920t_defconfig
 delete mode 100644 configs/integratorap_cm926ejs_defconfig
 delete mode 100644 configs/integratorap_cm946es_defconfig
 delete mode 100644 include/configs/integratorap.h
arch/arm/mach-integrator/Kconfig +0 -4
index d506ee5b39cd..c1d41e182156 100644
@@ -5,9 +5,6 @@ choice
 	prompt "Integrator platform select"
 	optional
 
-config ARCH_INTEGRATOR_AP
-	bool "Support Integrator/AP platform"
-
 config ARCH_INTEGRATOR_CP
 	bool "Support Integrator/CP platform"
 	select ARCH_CINTEGRATOR
@@ -50,7 +47,6 @@ config SYS_VENDOR
 	default "armltd"
 
 config SYS_CONFIG_NAME
-	default "integratorap" if ARCH_INTEGRATOR_AP
 	default "integratorcp" if ARCH_INTEGRATOR_CP
 
 config SYS_MALLOC_F_LEN
board/armltd/integrator/MAINTAINERS +0 -5
index 8af765eaebc8..577fce08a731 100644
@@ -4,11 +4,6 @@ S:	Maintained
 F:	board/armltd/integrator/
 F:	include/configs/integratorcp.h
 F:	configs/integratorcp_cm1136_defconfig
-F:	include/configs/integratorap.h
-F:	configs/integratorap_cm720t_defconfig
-F:	configs/integratorap_cm920t_defconfig
 F:	configs/integratorcp_cm920t_defconfig
-F:	configs/integratorap_cm926ejs_defconfig
 F:	configs/integratorcp_cm926ejs_defconfig
-F:	configs/integratorap_cm946es_defconfig
 F:	configs/integratorcp_cm946es_defconfig
board/armltd/integrator/Makefile +0 -1
index 8c906e3f072b..107e59bf0fa2 100644
@@ -10,5 +10,4 @@
 obj-y	:= lowlevel_init.o
 
 obj-y	+= integrator.o
-obj-$(CONFIG_PCI) += pci.o
 obj-y += timer.o
board/armltd/integrator/integrator.c +0 -1
index 3e864e8e7a5c..388795809dfd 100644
@@ -181,7 +181,6 @@ int board_eth_init(struct bd_info *bis)
 #ifdef CONFIG_SMC91111
 	rc = smc91111_initialize(0, CONFIG_SMC91111_BASE);
 #endif
-	rc += pci_eth_init(bis);
 	return rc;
 }
 #endif
board/armltd/integrator/pci.c deleted +0 -462

462 lines not on this page · raw message

board/armltd/integrator/pci_v3.h deleted +0 -187

187 lines not on this page · raw message

configs/integratorap_cm720t_defconfig deleted +0 -31
deleted file mode 100644
index 5d28135a8220..000000000000
@@ -1,31 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_INTEGRATOR=y
-CONFIG_SYS_TEXT_BASE=0x01000000
-CONFIG_ARCH_INTEGRATOR_AP=y
-CONFIG_CM720T=y
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_ENV_SIZE=0x8000
-CONFIG_USE_BOOTARGS=y
-CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAM0 console=tty"
-# CONFIG_DISPLAY_CPUINFO is not set
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_MISC_INIT_R=y
-CONFIG_HUSH_PARSER=y
-# CONFIG_CMDLINE_EDITING is not set
-# CONFIG_AUTO_COMPLETE is not set
-CONFIG_SYS_PROMPT="Integrator-AP # "
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_ARMFLASH=y
-CONFIG_CMD_PCI=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_MMC is not set
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_PROTECTION=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_EEPRO100=y
-CONFIG_TULIP=y
-CONFIG_PCI=y
-CONFIG_BAUDRATE=38400
-CONFIG_OF_LIBFDT=y
configs/integratorap_cm920t_defconfig deleted +0 -31
deleted file mode 100644
index 0e914e91ebed..000000000000
@@ -1,31 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_INTEGRATOR=y
-CONFIG_SYS_TEXT_BASE=0x01000000
-CONFIG_ARCH_INTEGRATOR_AP=y
-CONFIG_CM920T=y
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_ENV_SIZE=0x8000
-CONFIG_USE_BOOTARGS=y
-CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAM0 console=tty"
-# CONFIG_DISPLAY_CPUINFO is not set
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_MISC_INIT_R=y
-CONFIG_HUSH_PARSER=y
-# CONFIG_CMDLINE_EDITING is not set
-# CONFIG_AUTO_COMPLETE is not set
-CONFIG_SYS_PROMPT="Integrator-AP # "
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_ARMFLASH=y
-CONFIG_CMD_PCI=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_MMC is not set
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_PROTECTION=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_EEPRO100=y
-CONFIG_TULIP=y
-CONFIG_PCI=y
-CONFIG_BAUDRATE=38400
-CONFIG_OF_LIBFDT=y
configs/integratorap_cm926ejs_defconfig deleted +0 -31
deleted file mode 100644
index d28bc0f976cf..000000000000
@@ -1,31 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_INTEGRATOR=y
-CONFIG_SYS_TEXT_BASE=0x01000000
-CONFIG_ARCH_INTEGRATOR_AP=y
-CONFIG_CM926EJ_S=y
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_ENV_SIZE=0x8000
-CONFIG_USE_BOOTARGS=y
-CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAM0 console=tty"
-# CONFIG_DISPLAY_CPUINFO is not set
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_MISC_INIT_R=y
-CONFIG_HUSH_PARSER=y
-# CONFIG_CMDLINE_EDITING is not set
-# CONFIG_AUTO_COMPLETE is not set
-CONFIG_SYS_PROMPT="Integrator-AP # "
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_ARMFLASH=y
-CONFIG_CMD_PCI=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_MMC is not set
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_PROTECTION=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_EEPRO100=y
-CONFIG_TULIP=y
-CONFIG_PCI=y
-CONFIG_BAUDRATE=38400
-CONFIG_OF_LIBFDT=y
configs/integratorap_cm946es_defconfig deleted +0 -31
deleted file mode 100644
index ae44f01ff50d..000000000000
@@ -1,31 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_INTEGRATOR=y
-CONFIG_SYS_TEXT_BASE=0x01000000
-CONFIG_ARCH_INTEGRATOR_AP=y
-CONFIG_CM946ES=y
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_ENV_SIZE=0x8000
-CONFIG_USE_BOOTARGS=y
-CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAM0 console=tty"
-# CONFIG_DISPLAY_CPUINFO is not set
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_MISC_INIT_R=y
-CONFIG_HUSH_PARSER=y
-# CONFIG_CMDLINE_EDITING is not set
-# CONFIG_AUTO_COMPLETE is not set
-CONFIG_SYS_PROMPT="Integrator-AP # "
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_ARMFLASH=y
-CONFIG_CMD_PCI=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_MMC is not set
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_PROTECTION=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_EEPRO100=y
-CONFIG_TULIP=y
-CONFIG_PCI=y
-CONFIG_BAUDRATE=38400
-CONFIG_OF_LIBFDT=y
include/configs/integratorap.h deleted +0 -48

48 lines not on this page · raw message

Signature · 1 line
2.17.1
#5 lore raw

PATCH 3/27 arm: Remove integratorap* boards

Quoted 8 lines · Tom Rini

These boards have not been converted to CONFIG_DM_PCI by the deadline. Remove them.

Cc Linus Walleij <[email protected]>

---
I haven't fully streamlined things for integatorcp-only, in case you wish to do the DM_PCI migration instead. Thanks!

Sorry for missing this!

We never used PCI to boot (weird but true, we boot from serial).

I will send a patch to remove PCI support instead.

Yours,
Linus Walleij

author
#6 lore raw

PATCH 4/27 m68k: Remove M5485 boards

In reply to Tom Rini

These board has not been converted to CONFIG_DM_PCI by the deadline. Remove them. As this is all of the CONFIG_M548x platforms as well, remove that code.

Cc TsiChung Liew <[email protected]>
---
 arch/m68k/Kconfig                        |   9 -
 arch/m68k/dts/M5485AFE.dts               |  25 ---
 arch/m68k/dts/M5485BFE.dts               |  25 ---
 arch/m68k/dts/M5485CFE.dts               |  25 ---
 arch/m68k/dts/M5485DFE.dts               |  25 ---
 arch/m68k/dts/M5485EFE.dts               |  25 ---
 arch/m68k/dts/M5485FFE.dts               |  25 ---
 arch/m68k/dts/M5485GFE.dts               |  25 ---
 arch/m68k/dts/M5485HFE.dts               |  25 ---
 arch/m68k/dts/Makefile                   |   8 -
 arch/m68k/include/asm/coldfire/intctrl.h |   2 +-
 arch/m68k/include/asm/immap.h            |  47 -----
 board/freescale/m548xevb/Kconfig         |  15 --
 board/freescale/m548xevb/MAINTAINERS     |  13 --
 board/freescale/m548xevb/Makefile        |   6 -
 board/freescale/m548xevb/m548xevb.c      | 108 -----------
 configs/M5485AFE_defconfig               |  32 ----
 configs/M5485BFE_defconfig               |  32 ----
 configs/M5485CFE_defconfig               |  32 ----
 configs/M5485DFE_defconfig               |  32 ----
 configs/M5485EFE_defconfig               |  32 ----
 configs/M5485FFE_defconfig               |  32 ----
 configs/M5485GFE_defconfig               |  32 ----
 configs/M5485HFE_defconfig               |  32 ----
 include/configs/M5485EVB.h               | 228 -----------------------
 25 files changed, 1 insertion(+), 891 deletions(-)
 delete mode 100644 arch/m68k/dts/M5485AFE.dts
 delete mode 100644 arch/m68k/dts/M5485BFE.dts
 delete mode 100644 arch/m68k/dts/M5485CFE.dts
 delete mode 100644 arch/m68k/dts/M5485DFE.dts
 delete mode 100644 arch/m68k/dts/M5485EFE.dts
 delete mode 100644 arch/m68k/dts/M5485FFE.dts
 delete mode 100644 arch/m68k/dts/M5485GFE.dts
 delete mode 100644 arch/m68k/dts/M5485HFE.dts
 delete mode 100644 board/freescale/m548xevb/Kconfig
 delete mode 100644 board/freescale/m548xevb/MAINTAINERS
 delete mode 100644 board/freescale/m548xevb/Makefile
 delete mode 100644 board/freescale/m548xevb/m548xevb.c
 delete mode 100644 configs/M5485AFE_defconfig
 delete mode 100644 configs/M5485BFE_defconfig
 delete mode 100644 configs/M5485CFE_defconfig
 delete mode 100644 configs/M5485DFE_defconfig
 delete mode 100644 configs/M5485EFE_defconfig
 delete mode 100644 configs/M5485FFE_defconfig
 delete mode 100644 configs/M5485GFE_defconfig
 delete mode 100644 configs/M5485HFE_defconfig
 delete mode 100644 include/configs/M5485EVB.h
arch/m68k/Kconfig +0 -9
index fef108105b50..f7f6d08be3f5 100644
@@ -141,10 +141,6 @@ config M547x
 	bool
 	select MCF547x_8x
 
-config M548x
-	bool
-	select MCF547x_8x
-
 choice
 	prompt "Target select"
 	optional
@@ -221,10 +217,6 @@ config TARGET_M5475EVB
 	bool "Support M5475EVB"
 	select M547x
 
-config TARGET_M5485EVB
-	bool "Support M5485EVB"
-	select M548x
-
 config TARGET_AMCORE
 	bool "Support AMCORE"
 	select M5307
@@ -253,7 +245,6 @@ source "board/freescale/m54418twr/Kconfig"
 source "board/freescale/m54451evb/Kconfig"
 source "board/freescale/m54455evb/Kconfig"
 source "board/freescale/m547xevb/Kconfig"
-source "board/freescale/m548xevb/Kconfig"
 source "board/sysam/amcore/Kconfig"
 source "board/sysam/stmark2/Kconfig"
 
arch/m68k/dts/M5485AFE.dts deleted +0 -25
deleted file mode 100644
index b1f5bf0f561d..000000000000
@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Angelo Dureghello <[email protected]>
- */
-
-/dts-v1/;
-/include/ "mcf54xx.dtsi"
-
-/ {
-	model = "Freescale M5485AFE";
-	compatible = "fsl,M5485AFE";
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-};
-
-&fec0 {
-	status = "okay";
-};
-
-&fec1 {
-	status = "okay";
-	mii-base = <0>;
-};
arch/m68k/dts/M5485BFE.dts deleted +0 -25
deleted file mode 100644
index 10b8f5b20157..000000000000
@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Angelo Dureghello <[email protected]>
- */
-
-/dts-v1/;
-/include/ "mcf54xx.dtsi"
-
-/ {
-	model = "Freescale M5485BFE";
-	compatible = "fsl,M5485BFE";
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-};
-
-&fec0 {
-	status = "okay";
-};
-
-&fec1 {
-	status = "okay";
-	mii-base = <0>;
-};
arch/m68k/dts/M5485CFE.dts deleted +0 -25
deleted file mode 100644
index a1ae64f65ca0..000000000000
@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Angelo Dureghello <[email protected]>
- */
-
-/dts-v1/;
-/include/ "mcf54xx.dtsi"
-
-/ {
-	model = "Freescale M5485CFE";
-	compatible = "fsl,M5485CFE";
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-};
-
-&fec0 {
-	status = "okay";
-};
-
-&fec1 {
-	status = "okay";
-	mii-base = <0>;
-};
arch/m68k/dts/M5485DFE.dts deleted +0 -25
deleted file mode 100644
index 9b38d451fc0e..000000000000
@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Angelo Dureghello <[email protected]>
- */
-
-/dts-v1/;
-/include/ "mcf54xx.dtsi"
-
-/ {
-	model = "Freescale M5485DFE";
-	compatible = "fsl,M5485DFE";
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-};
-
-&fec0 {
-	status = "okay";
-};
-
-&fec1 {
-	status = "okay";
-	mii-base = <0>;
-};
arch/m68k/dts/M5485EFE.dts deleted +0 -25
deleted file mode 100644
index a1ac3f5a489f..000000000000
@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Angelo Dureghello <[email protected]>
- */
-
-/dts-v1/;
-/include/ "mcf54xx.dtsi"
-
-/ {
-	model = "Freescale M5485EFE";
-	compatible = "fsl,M5485EFE";
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-};
-
-&fec0 {
-	status = "okay";
-};
-
-&fec1 {
-	status = "okay";
-	mii-base = <0>;
-};
arch/m68k/dts/M5485FFE.dts deleted +0 -25
deleted file mode 100644
index 7f22de49f48a..000000000000
@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Angelo Dureghello <[email protected]>
- */
-
-/dts-v1/;
-/include/ "mcf54xx.dtsi"
-
-/ {
-	model = "Freescale M5485FFE";
-	compatible = "fsl,M5485FFE";
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-};
-
-&fec0 {
-	status = "okay";
-};
-
-&fec1 {
-	status = "okay";
-	mii-base = <0>;
-};
arch/m68k/dts/M5485GFE.dts deleted +0 -25
deleted file mode 100644
index 3430aa72795c..000000000000
@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Angelo Dureghello <[email protected]>
- */
-
-/dts-v1/;
-/include/ "mcf54xx.dtsi"
-
-/ {
-	model = "Freescale M5485GFE";
-	compatible = "fsl,M5485GFE";
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-};
-
-&fec0 {
-	status = "okay";
-};
-
-&fec1 {
-	status = "okay";
-	mii-base = <0>;
-};
arch/m68k/dts/M5485HFE.dts deleted +0 -25
deleted file mode 100644
index 57c98f1ef79e..000000000000
@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Angelo Dureghello <[email protected]>
- */
-
-/dts-v1/;
-/include/ "mcf54xx.dtsi"
-
-/ {
-	model = "Freescale M5485HFE";
-	compatible = "fsl,M5485HFE";
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-};
-
-&fec0 {
-	status = "okay";
-};
-
-&fec1 {
-	status = "okay";
-	mii-base = <0>;
-};
arch/m68k/dts/Makefile +0 -8
index e059f23ccd3f..0a356b8e3728 100644
@@ -39,14 +39,6 @@ dtb-$(CONFIG_TARGET_M5475EVB) += M5475AFE.dtb \
 	M5475EFE.dtb \
 	M5475FFE.dtb \
 	M5475GFE.dtb
-dtb-$(CONFIG_TARGET_M5485EVB) += M5485AFE.dtb \
-	M5485BFE.dtb \
-	M5485CFE.dtb \
-	M5485DFE.dtb \
-	M5485EFE.dtb \
-	M5485FFE.dtb \
-	M5485GFE.dtb \
-	M5485HFE.dtb
 
 targets += $(dtb-y)
 
arch/m68k/include/asm/coldfire/intctrl.h +1 -1
index 7b42e65bc82f..f7f0f07d30f0 100644
@@ -11,7 +11,7 @@
 
 #if defined(CONFIG_M5235) || defined(CONFIG_M5271) || \
     defined(CONFIG_M5275) || defined(CONFIG_M5282) || \
-    defined(CONFIG_M547x) || defined(CONFIG_M548x)
+    defined(CONFIG_M547x)
 #	define	CONFIG_SYS_CF_INTC_REG1
 #endif
 
arch/m68k/include/asm/immap.h +0 -47

51 lines not on this page · raw message

board/freescale/m548xevb/Kconfig deleted +0 -15
deleted file mode 100644
index da924e3ce98f..000000000000
@@ -1,15 +0,0 @@
-if TARGET_M5485EVB
-
-config SYS_CPU
-	default "mcf547x_8x"
-
-config SYS_BOARD
-	default "m548xevb"
-
-config SYS_VENDOR
-	default "freescale"
-
-config SYS_CONFIG_NAME
-	default "M5485EVB"
-
-endif
board/freescale/m548xevb/MAINTAINERS deleted +0 -13
deleted file mode 100644
index 4e642e69d516..000000000000
@@ -1,13 +0,0 @@
-M548XEVB BOARD
-M:	TsiChung Liew <[email protected]>
-S:	Maintained
-F:	board/freescale/m548xevb/
-F:	include/configs/M5485EVB.h
-F:	configs/M5485AFE_defconfig
-F:	configs/M5485BFE_defconfig
-F:	configs/M5485CFE_defconfig
-F:	configs/M5485DFE_defconfig
-F:	configs/M5485EFE_defconfig
-F:	configs/M5485FFE_defconfig
-F:	configs/M5485GFE_defconfig
-F:	configs/M5485HFE_defconfig
board/freescale/m548xevb/Makefile deleted +0 -6
deleted file mode 100644
index 05bfaa337113..000000000000
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000-2003
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-
-obj-y	= m548xevb.o
board/freescale/m548xevb/m548xevb.c deleted +0 -108

108 lines not on this page · raw message

configs/M5485AFE_defconfig deleted +0 -32
deleted file mode 100644
index 548deaf90279..000000000000
@@ -1,32 +0,0 @@
-CONFIG_M68K=y
-CONFIG_SYS_TEXT_BASE=0xFF800000
-CONFIG_ENV_SIZE=0x10000
-CONFIG_ENV_SECT_SIZE=0x10000
-CONFIG_TARGET_M5485EVB=y
-CONFIG_DEFAULT_DEVICE_TREE="M5485AFE"
-CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64"
-CONFIG_BOOTDELAY=1
-# CONFIG_CMDLINE_EDITING is not set
-# CONFIG_AUTO_COMPLETE is not set
-CONFIG_SYS_PROMPT="-> "
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_PCI=y
-CONFIG_CMD_USB=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_CACHE=y
-CONFIG_ENV_ADDR=0xFF840000
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
-CONFIG_SYS_FLASH_PROTECTION=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_DM_ETH=y
-CONFIG_FSLDMAFEC=y
-CONFIG_MII=y
-CONFIG_PCI=y
-CONFIG_PHY=y
-CONFIG_USB=y
-CONFIG_USB_STORAGE=y
configs/M5485BFE_defconfig deleted +0 -32
deleted file mode 100644
index 0d72da3b364e..000000000000
@@ -1,32 +0,0 @@
-CONFIG_M68K=y
-CONFIG_SYS_TEXT_BASE=0xFF800000
-CONFIG_ENV_SIZE=0x10000
-CONFIG_ENV_SECT_SIZE=0x10000
-CONFIG_TARGET_M5485EVB=y
-CONFIG_DEFAULT_DEVICE_TREE="M5485BFE"
-CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16"
-CONFIG_BOOTDELAY=1
-# CONFIG_CMDLINE_EDITING is not set
-# CONFIG_AUTO_COMPLETE is not set
-CONFIG_SYS_PROMPT="-> "
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_PCI=y
-CONFIG_CMD_USB=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_CACHE=y
-CONFIG_ENV_ADDR=0xFF840000
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
-CONFIG_SYS_FLASH_PROTECTION=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_DM_ETH=y
-CONFIG_FSLDMAFEC=y
-CONFIG_MII=y
-CONFIG_PCI=y
-CONFIG_PHY=y
-CONFIG_USB=y
-CONFIG_USB_STORAGE=y
configs/M5485CFE_defconfig deleted +0 -32
deleted file mode 100644
index 68908e2f431d..000000000000
@@ -1,32 +0,0 @@
-CONFIG_M68K=y
-CONFIG_SYS_TEXT_BASE=0xFF800000
-CONFIG_ENV_SIZE=0x10000
-CONFIG_ENV_SECT_SIZE=0x10000
-CONFIG_TARGET_M5485EVB=y
-CONFIG_DEFAULT_DEVICE_TREE="M5485CFE"
-CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO,SYS_USBCTRL"
-CONFIG_BOOTDELAY=1
-# CONFIG_CMDLINE_EDITING is not set
-# CONFIG_AUTO_COMPLETE is not set
-CONFIG_SYS_PROMPT="-> "
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_PCI=y
-CONFIG_CMD_USB=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_CACHE=y
-CONFIG_ENV_ADDR=0xFF840000
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
-CONFIG_SYS_FLASH_PROTECTION=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_DM_ETH=y
-CONFIG_FSLDMAFEC=y
-CONFIG_MII=y
-CONFIG_PCI=y
-CONFIG_PHY=y
-CONFIG_USB=y
-CONFIG_USB_STORAGE=y
configs/M5485DFE_defconfig deleted +0 -32
deleted file mode 100644
index 25872009536c..000000000000
@@ -1,32 +0,0 @@
-CONFIG_M68K=y
-CONFIG_SYS_TEXT_BASE=0xFF800000
-CONFIG_ENV_SIZE=0x10000
-CONFIG_ENV_SECT_SIZE=0x10000
-CONFIG_TARGET_M5485EVB=y
-CONFIG_DEFAULT_DEVICE_TREE="M5485DFE"
-CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_USBCTRL"
-CONFIG_BOOTDELAY=1
-# CONFIG_CMDLINE_EDITING is not set
-# CONFIG_AUTO_COMPLETE is not set
-CONFIG_SYS_PROMPT="-> "
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_PCI=y
-CONFIG_CMD_USB=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_CACHE=y
-CONFIG_ENV_ADDR=0xFF840000
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
-CONFIG_SYS_FLASH_PROTECTION=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_DM_ETH=y
-CONFIG_FSLDMAFEC=y
-CONFIG_MII=y
-CONFIG_PCI=y
-CONFIG_PHY=y
-CONFIG_USB=y
-CONFIG_USB_STORAGE=y
configs/M5485EFE_defconfig deleted +0 -32
deleted file mode 100644
index a43b40223805..000000000000
@@ -1,32 +0,0 @@
-CONFIG_M68K=y
-CONFIG_SYS_TEXT_BASE=0xFF800000
-CONFIG_ENV_SIZE=0x10000
-CONFIG_ENV_SECT_SIZE=0x10000
-CONFIG_TARGET_M5485EVB=y
-CONFIG_DEFAULT_DEVICE_TREE="M5485EFE"
-CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_VIDEO,SYS_USBCTRL"
-CONFIG_BOOTDELAY=1
-# CONFIG_CMDLINE_EDITING is not set
-# CONFIG_AUTO_COMPLETE is not set
-CONFIG_SYS_PROMPT="-> "
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_PCI=y
-CONFIG_CMD_USB=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_CACHE=y
-CONFIG_ENV_ADDR=0xFF840000
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
-CONFIG_SYS_FLASH_PROTECTION=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_DM_ETH=y
-CONFIG_FSLDMAFEC=y
-CONFIG_MII=y
-CONFIG_PCI=y
-CONFIG_PHY=y
-CONFIG_USB=y
-CONFIG_USB_STORAGE=y
configs/M5485FFE_defconfig deleted +0 -32
deleted file mode 100644
index 335ad0e1e730..000000000000
@@ -1,32 +0,0 @@
-CONFIG_M68K=y
-CONFIG_SYS_TEXT_BASE=0xFF800000
-CONFIG_ENV_SIZE=0x10000
-CONFIG_ENV_SECT_SIZE=0x10000
-CONFIG_TARGET_M5485EVB=y
-CONFIG_DEFAULT_DEVICE_TREE="M5485FFE"
-CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=32,SYS_VIDEO,SYS_USBCTRL,SYS_DRAMSZ1=64"
-CONFIG_BOOTDELAY=1
-# CONFIG_CMDLINE_EDITING is not set
-# CONFIG_AUTO_COMPLETE is not set
-CONFIG_SYS_PROMPT="-> "
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_PCI=y
-CONFIG_CMD_USB=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_CACHE=y
-CONFIG_ENV_ADDR=0xFF840000
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
-CONFIG_SYS_FLASH_PROTECTION=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_DM_ETH=y
-CONFIG_FSLDMAFEC=y
-CONFIG_MII=y
-CONFIG_PCI=y
-CONFIG_PHY=y
-CONFIG_USB=y
-CONFIG_USB_STORAGE=y
configs/M5485GFE_defconfig deleted +0 -32
deleted file mode 100644
index 2665be9fb56a..000000000000
@@ -1,32 +0,0 @@
-CONFIG_M68K=y
-CONFIG_SYS_TEXT_BASE=0xFF800000
-CONFIG_ENV_SIZE=0x10000
-CONFIG_ENV_SECT_SIZE=0x10000
-CONFIG_TARGET_M5485EVB=y
-CONFIG_DEFAULT_DEVICE_TREE="M5485GFE"
-CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=4,SYS_DRAMSZ=64"
-CONFIG_BOOTDELAY=1
-# CONFIG_CMDLINE_EDITING is not set
-# CONFIG_AUTO_COMPLETE is not set
-CONFIG_SYS_PROMPT="-> "
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_PCI=y
-CONFIG_CMD_USB=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_CACHE=y
-CONFIG_ENV_ADDR=0xFF840000
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
-CONFIG_SYS_FLASH_PROTECTION=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_DM_ETH=y
-CONFIG_FSLDMAFEC=y
-CONFIG_MII=y
-CONFIG_PCI=y
-CONFIG_PHY=y
-CONFIG_USB=y
-CONFIG_USB_STORAGE=y
configs/M5485HFE_defconfig deleted +0 -32
deleted file mode 100644
index a0536bfae110..000000000000
@@ -1,32 +0,0 @@
-CONFIG_M68K=y
-CONFIG_SYS_TEXT_BASE=0xFF800000
-CONFIG_ENV_SIZE=0x10000
-CONFIG_ENV_SECT_SIZE=0x10000
-CONFIG_TARGET_M5485EVB=y
-CONFIG_DEFAULT_DEVICE_TREE="M5485HFE"
-CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO"
-CONFIG_BOOTDELAY=1
-# CONFIG_CMDLINE_EDITING is not set
-# CONFIG_AUTO_COMPLETE is not set
-CONFIG_SYS_PROMPT="-> "
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_PCI=y
-CONFIG_CMD_USB=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_CACHE=y
-CONFIG_ENV_ADDR=0xFF840000
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
-CONFIG_SYS_FLASH_PROTECTION=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_DM_ETH=y
-CONFIG_FSLDMAFEC=y
-CONFIG_MII=y
-CONFIG_PCI=y
-CONFIG_PHY=y
-CONFIG_USB=y
-CONFIG_USB_STORAGE=y
include/configs/M5485EVB.h deleted +0 -228

228 lines not on this page · raw message

Signature · 1 line
2.17.1
author
#7 lore raw

Re: [PATCH 04/27] m68k: Remove M5485 boards

Quoted 6 lines · Tom Rini

These board has not been converted to CONFIG_DM_PCI by the deadline. Remove them. As this is all of the CONFIG_M548x platforms as well, remove that code.

Cc TsiChung Liew <[email protected]>

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
author
#8 lore raw

PATCH 5/27 m68k: Remove M5475x boards

In reply to Tom Rini

These board has not been converted to CONFIG_DM_PCI by the deadline. Remove them. As this is the last of the mcf547x_8x family of boards, remove that support as well.

Cc TsiChung Liew <[email protected]>
---
 arch/m68k/Kconfig                      |  15 -
 arch/m68k/Makefile                     |   2 -
 arch/m68k/cpu/mcf547x_8x/Makefile      |   9 -
 arch/m68k/cpu/mcf547x_8x/cpu.c         | 153 ---------
 arch/m68k/cpu/mcf547x_8x/cpu_init.c    | 150 ---------
 arch/m68k/cpu/mcf547x_8x/interrupts.c  |  35 ---
 arch/m68k/cpu/mcf547x_8x/pci.c         | 154 ---------
 arch/m68k/cpu/mcf547x_8x/slicetimer.c  |  95 ------
 arch/m68k/cpu/mcf547x_8x/speed.c       |  33 --
 arch/m68k/cpu/mcf547x_8x/start.S       | 264 ----------------
 arch/m68k/dts/M5475AFE.dts             |  21 --
 arch/m68k/dts/M5475BFE.dts             |  21 --
 arch/m68k/dts/M5475CFE.dts             |  21 --
 arch/m68k/dts/M5475DFE.dts             |  21 --
 arch/m68k/dts/M5475EFE.dts             |  21 --
 arch/m68k/dts/M5475FFE.dts             |  21 --
 arch/m68k/dts/M5475GFE.dts             |  21 --
 arch/m68k/dts/Makefile                 |   7 -
 arch/m68k/include/asm/cache.h          |   2 +-
 arch/m68k/include/asm/coldfire/dspi.h  |   6 -
 arch/m68k/include/asm/coldfire/eport.h |  13 -
 arch/m68k/include/asm/fec.h            |   5 -
 arch/m68k/include/asm/immap_547x_8x.h  | 258 ---------------
 arch/m68k/include/asm/m547x_8x.h       | 417 -------------------------
 arch/m68k/lib/cache.c                  |   2 +-
 board/freescale/m547xevb/Kconfig       |  15 -
 board/freescale/m547xevb/MAINTAINERS   |  12 -
 board/freescale/m547xevb/Makefile      |   6 -
 board/freescale/m547xevb/README        | 271 ----------------
 board/freescale/m547xevb/m547xevb.c    | 108 -------
 configs/M5475AFE_defconfig             |  32 --
 configs/M5475BFE_defconfig             |  32 --
 configs/M5475CFE_defconfig             |  32 --
 configs/M5475DFE_defconfig             |  32 --
 configs/M5475EFE_defconfig             |  32 --
 configs/M5475FFE_defconfig             |  32 --
 configs/M5475GFE_defconfig             |  32 --
 doc/arch/m68k.rst                      |   2 +-
 drivers/net/mcfmii.c                   |   4 -
 env/Kconfig                            |   2 +-
 include/configs/M5475EVB.h             | 241 --------------
 include/fsl_dspi.h                     |   6 -
 42 files changed, 4 insertions(+), 2654 deletions(-)
 delete mode 100644 arch/m68k/cpu/mcf547x_8x/Makefile
 delete mode 100644 arch/m68k/cpu/mcf547x_8x/cpu.c
 delete mode 100644 arch/m68k/cpu/mcf547x_8x/cpu_init.c
 delete mode 100644 arch/m68k/cpu/mcf547x_8x/interrupts.c
 delete mode 100644 arch/m68k/cpu/mcf547x_8x/pci.c
 delete mode 100644 arch/m68k/cpu/mcf547x_8x/slicetimer.c
 delete mode 100644 arch/m68k/cpu/mcf547x_8x/speed.c
 delete mode 100644 arch/m68k/cpu/mcf547x_8x/start.S
 delete mode 100644 arch/m68k/dts/M5475AFE.dts
 delete mode 100644 arch/m68k/dts/M5475BFE.dts
 delete mode 100644 arch/m68k/dts/M5475CFE.dts
 delete mode 100644 arch/m68k/dts/M5475DFE.dts
 delete mode 100644 arch/m68k/dts/M5475EFE.dts
 delete mode 100644 arch/m68k/dts/M5475FFE.dts
 delete mode 100644 arch/m68k/dts/M5475GFE.dts
 delete mode 100644 arch/m68k/include/asm/immap_547x_8x.h
 delete mode 100644 arch/m68k/include/asm/m547x_8x.h
 delete mode 100644 board/freescale/m547xevb/Kconfig
 delete mode 100644 board/freescale/m547xevb/MAINTAINERS
 delete mode 100644 board/freescale/m547xevb/Makefile
 delete mode 100644 board/freescale/m547xevb/README
 delete mode 100644 board/freescale/m547xevb/m547xevb.c
 delete mode 100644 configs/M5475AFE_defconfig
 delete mode 100644 configs/M5475BFE_defconfig
 delete mode 100644 configs/M5475CFE_defconfig
 delete mode 100644 configs/M5475DFE_defconfig
 delete mode 100644 configs/M5475EFE_defconfig
 delete mode 100644 configs/M5475FFE_defconfig
 delete mode 100644 configs/M5475GFE_defconfig
 delete mode 100644 include/configs/M5475EVB.h
arch/m68k/Kconfig +0 -15
index f7f6d08be3f5..cf45d789d63d 100644
@@ -65,12 +65,6 @@ config MCF5227x
         select DM_SERIAL
 	bool
 
-config MCF547x_8x
-	select OF_CONTROL
-        select DM
-        select DM_SERIAL
-	bool
-
 # processor type
 config M5208
 	bool
@@ -137,10 +131,6 @@ config M52277
 	bool
 	select MCF5227x
 
-config M547x
-	bool
-	select MCF547x_8x
-
 choice
 	prompt "Target select"
 	optional
@@ -213,10 +203,6 @@ config TARGET_M54455EVB
 	bool "Support M54455EVB"
 	select M54455
 
-config TARGET_M5475EVB
-	bool "Support M5475EVB"
-	select M547x
-
 config TARGET_AMCORE
 	bool "Support AMCORE"
 	select M5307
@@ -244,7 +230,6 @@ source "board/freescale/m5373evb/Kconfig"
 source "board/freescale/m54418twr/Kconfig"
 source "board/freescale/m54451evb/Kconfig"
 source "board/freescale/m54455evb/Kconfig"
-source "board/freescale/m547xevb/Kconfig"
 source "board/sysam/amcore/Kconfig"
 source "board/sysam/stmark2/Kconfig"
 
arch/m68k/Makefile +0 -2
index 7f23ff45887a..86b36e1a40e7 100644
@@ -19,14 +19,12 @@ cpuflags-$(CONFIG_MCF5301x)	:= -mcpu=53015 -fPIC
 cpuflags-$(CONFIG_MCF532x)	:= -mcpu=5329 -fPIC
 cpuflags-$(CONFIG_MCF5441x)	:= -mcpu=54418 -fPIC
 cpuflags-$(CONFIG_MCF5445x)	:= -mcpu=54455 -fPIC
-cpuflags-$(CONFIG_MCF547x_8x)	:= -mcpu=5485 -fPIC
 
 PLATFORM_CPPFLAGS += $(cpuflags-y)
 
 
 ldflags-$(CONFIG_MCF5441x)	:= --got=single
 ldflags-$(CONFIG_MCF5445x)	:= --got=single
-ldflags-$(CONFIG_MCF547x_8x)	:= --got=single
 
 ifneq (,$(findstring -linux-,$(shell $(CC) --version)))
 ifneq (,$(findstring GOT,$(shell $(LD) --help)))
arch/m68k/cpu/mcf547x_8x/Makefile deleted +0 -9
deleted file mode 100644
index 0db3386aa850..000000000000
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000-2004
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-
-# ccflags-y += -DET_DEBUG
-
-extra-y = start.o
-obj-y	= cpu.o speed.o cpu_init.o pci.o interrupts.o slicetimer.o
arch/m68k/cpu/mcf547x_8x/cpu.c deleted +0 -153

153 lines not on this page · raw message

arch/m68k/cpu/mcf547x_8x/cpu_init.c deleted +0 -150

150 lines not on this page · raw message

arch/m68k/cpu/mcf547x_8x/interrupts.c deleted +0 -35
deleted file mode 100644
index 703090ddc258..000000000000
@@ -1,35 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- *
- * Copyright (C) 2004-2007, 2012 Freescale Semiconductor, Inc.
- * TsiChung Liew (Tsi-Chung.Liew at freescale.com)
- */
-
-/* CPU specific interrupt routine */
-#include <common.h>
-#include <irq_func.h>
-#include <asm/immap.h>
-#include <asm/io.h>
-
-int interrupt_init(void)
-{
-	int0_t *intp = (int0_t *) (CONFIG_SYS_INTR_BASE);
-
-	/* Make sure all interrupts are disabled */
-	setbits_be32(&intp->imrh0, 0xffffffff);
-	setbits_be32(&intp->imrl0, 0xffffffff);
-
-	enable_interrupts();
-
-	return 0;
-}
-
-#if defined(CONFIG_SLTTMR)
-void dtimer_intr_setup(void)
-{
-	int0_t *intp = (int0_t *) (CONFIG_SYS_INTR_BASE);
-
-	out_8(&intp->icr0[CONFIG_SYS_TMRINTR_NO], CONFIG_SYS_TMRINTR_PRI);
-	clrbits_be32(&intp->imrh0, CONFIG_SYS_TMRINTR_MASK);
-}
-#endif
arch/m68k/cpu/mcf547x_8x/pci.c deleted +0 -154

154 lines not on this page · raw message

arch/m68k/cpu/mcf547x_8x/slicetimer.c deleted +0 -95

95 lines not on this page · raw message

arch/m68k/cpu/mcf547x_8x/speed.c deleted +0 -33
deleted file mode 100644
index bbcf601f38fb..000000000000
@@ -1,33 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- *
- * (C) Copyright 2000-2003
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
- * TsiChung Liew (Tsi-Chung.Liew at freescale.com)
- */
-
-#include <common.h>
-#include <clock_legacy.h>
-#include <asm/global_data.h>
-#include <asm/processor.h>
-
-#include <asm/immap.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * get_clocks() fills in gd->cpu_clock and gd->bus_clk
- */
-int get_clocks(void)
-{
-	gd->bus_clk = CONFIG_SYS_CLK;
-	gd->cpu_clk = (gd->bus_clk * 2);
-
-#ifdef CONFIG_SYS_I2C_FSL
-	gd->arch.i2c1_clk = gd->bus_clk;
-#endif
-
-	return (0);
-}
arch/m68k/cpu/mcf547x_8x/start.S deleted +0 -264

264 lines not on this page · raw message

arch/m68k/dts/M5475AFE.dts deleted +0 -21
deleted file mode 100644
index 7895b520cf72..000000000000
@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Angelo Dureghello <[email protected]>
- */
-
-/dts-v1/;
-/include/ "mcf54xx.dtsi"
-
-/ {
-	model = "Freescale M5475AFE";
-	compatible = "fsl,M5475AFE";
-};
-
-&fec0 {
-	status = "okay";
-};
-
-&fec1 {
-	status = "okay";
-	mii-base = <0>;
-};
arch/m68k/dts/M5475BFE.dts deleted +0 -21
deleted file mode 100644
index ffbc2d6a063e..000000000000
@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Angelo Dureghello <[email protected]>
- */
-
-/dts-v1/;
-/include/ "mcf54xx.dtsi"
-
-/ {
-	model = "Freescale M5475BFE";
-	compatible = "fsl,M5475BFE";
-};
-
-&fec0 {
-	status = "okay";
-};
-
-&fec1 {
-	status = "okay";
-	mii-base = <0>;
-};
arch/m68k/dts/M5475CFE.dts deleted +0 -21
deleted file mode 100644
index f1033f7efbbf..000000000000
@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Angelo Dureghello <[email protected]>
- */
-
-/dts-v1/;
-/include/ "mcf54xx.dtsi"
-
-/ {
-	model = "Freescale M5475CFE";
-	compatible = "fsl,M5475CFE";
-};
-
-&fec0 {
-	status = "okay";
-};
-
-&fec1 {
-	status = "okay";
-	mii-base = <0>;
-};
arch/m68k/dts/M5475DFE.dts deleted +0 -21
deleted file mode 100644
index 69a8faba83ba..000000000000
@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Angelo Dureghello <[email protected]>
- */
-
-/dts-v1/;
-/include/ "mcf54xx.dtsi"
-
-/ {
-	model = "Freescale M5475DFE";
-	compatible = "fsl,M5475DFE";
-};
-
-&fec0 {
-	status = "okay";
-};
-
-&fec1 {
-	status = "okay";
-	mii-base = <0>;
-};
arch/m68k/dts/M5475EFE.dts deleted +0 -21
deleted file mode 100644
index 3c898958c8fa..000000000000
@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Angelo Dureghello <[email protected]>
- */
-
-/dts-v1/;
-/include/ "mcf54xx.dtsi"
-
-/ {
-	model = "Freescale M5475EFE";
-	compatible = "fsl,M5475EFE";
-};
-
-&fec0 {
-	status = "okay";
-};
-
-&fec1 {
-	status = "okay";
-	mii-base = <0>;
-};
arch/m68k/dts/M5475FFE.dts deleted +0 -21
deleted file mode 100644
index bb3c21588f54..000000000000
@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Angelo Dureghello <[email protected]>
- */
-
-/dts-v1/;
-/include/ "mcf54xx.dtsi"
-
-/ {
-	model = "Freescale M5475FFE";
-	compatible = "fsl,M5475FFE";
-};
-
-&fec0 {
-	status = "okay";
-};
-
-&fec1 {
-	status = "okay";
-	mii-base = <0>;
-};
arch/m68k/dts/M5475GFE.dts deleted +0 -21
deleted file mode 100644
index 75080fa7371e..000000000000
@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Angelo Dureghello <[email protected]>
- */
-
-/dts-v1/;
-/include/ "mcf54xx.dtsi"
-
-/ {
-	model = "Freescale M5475GFE";
-	compatible = "fsl,M5475GFE";
-};
-
-&fec0 {
-	status = "okay";
-};
-
-&fec1 {
-	status = "okay";
-	mii-base = <0>;
-};
arch/m68k/dts/Makefile +0 -7
index 0a356b8e3728..47260a101d8a 100644
@@ -32,13 +32,6 @@ dtb-$(CONFIG_TARGET_M54455EVB) += M54455EVB.dtb \
 	M54455EVB_i66.dtb
 dtb-$(CONFIG_TARGET_AMCORE) += amcore.dtb
 dtb-$(CONFIG_TARGET_STMARK2) += stmark2.dtb
-dtb-$(CONFIG_TARGET_M5475EVB) += M5475AFE.dtb \
-	M5475BFE.dtb \
-	M5475CFE.dtb \
-	M5475DFE.dtb \
-	M5475EFE.dtb \
-	M5475FFE.dtb \
-	M5475GFE.dtb
 
 targets += $(dtb-y)
 
arch/m68k/include/asm/cache.h +1 -1
index a1eeabc2af93..fabec0ae92e3 100644
@@ -19,7 +19,7 @@
 #define CONFIG_CF_V3
 #endif
 
-#if defined(CONFIG_MCF547x_8x) || defined(CONFIG_MCF5445x)
+#if defined(CONFIG_MCF5445x)
 #define CONFIG_CF_V4
 #elif defined(CONFIG_MCF5441x)
 #define CONFIG_CF_V4E		/* Four Extra ACRn */
arch/m68k/include/asm/coldfire/dspi.h +0 -6
index ddd8f3380542..7848dbdff490 100644
@@ -20,14 +20,8 @@ typedef struct dspi {
 	u32 tfr;	/* 0x34 - PUSHR */
 	u16 resv1;	/* 0x38 */
 	u16 rfr;	/* 0x3A - POPR */
-#ifdef CONFIG_MCF547x_8x
-	u32 tfdr[4];	/* 0x3C */
-	u8 resv2[0x30];	/* 0x40 */
-	u32 rfdr[4];	/* 0x7C */
-#else
 	u32 tfdr[16];	/* 0x3C */
 	u32 rfdr[16];	/* 0x7C */
-#endif
 } dspi_t;
 
 /* Module configuration */
arch/m68k/include/asm/coldfire/eport.h +0 -13
index 0e64bef5ed62..eb5c66636129 100644
@@ -11,18 +11,6 @@
 
 /* Edge Port Module (EPORT) */
 typedef struct eport {
-#ifdef CONFIG_MCF547x_8x
-	u16 par;	/* 0x00 */
-	u16 res0;	/* 0x02 */
-	u8 ddr;		/* 0x04 */
-	u8 ier;		/* 0x05 */
-	u16 res1;	/* 0x06 */
-	u8 dr;		/* 0x08 */
-	u8 pdr;		/* 0x09 */
-	u16 res2;	/* 0x0A */
-	u8 fr;		/* 0x0C */
-	u8 res3[3];	/* 0x0D */
-#else
 	u16 par;	/* 0x00 Pin Assignment */
 	u8 ddr;		/* 0x02 Data Direction */
 	u8 ier;		/* 0x03 Interrupt Enable */
@@ -30,7 +18,6 @@ typedef struct eport {
 	u8 pdr;		/* 0x05 Pin Data */
 	u8 fr;		/* 0x06 Flag */
 	u8 res0;
-#endif
 } eport_t;
 
 /* EPPAR */
arch/m68k/include/asm/fec.h +0 -5
index cdb8119d3ea9..759c8cfc43de 100644
@@ -337,13 +337,8 @@ typedef struct fec {
 #define	FEC_RESET_DELAY			100
 #define FEC_RX_TOUT			100
 
-#ifdef CONFIG_MCF547x_8x
-typedef struct fec_info_dma fec_info_t;
-#define FEC_T fecdma_t
-#else
 typedef struct fec_info_s fec_info_t;
 #define FEC_T fec_t
-#endif
 
 int fecpin_setclear(fec_info_t *info, int setclear);
 int mii_discover_phy(fec_info_t *info);
arch/m68k/include/asm/immap_547x_8x.h deleted +0 -258

258 lines not on this page · raw message

arch/m68k/include/asm/m547x_8x.h deleted +0 -417

417 lines not on this page · raw message

arch/m68k/lib/cache.c +1 -1
index 68f2eef584b7..aa2b93e0e0fb 100644
@@ -80,7 +80,7 @@ void icache_invalid(void)
 }
 
 /*
- * data cache only for ColdFire V4 such as MCF547x_8x, MCF5445x
+ * data cache only for ColdFire V4 such as MCF5445x
  * the dcache will be dummy in ColdFire V2 and V3
  */
 void dcache_enable(void)
board/freescale/m547xevb/Kconfig deleted +0 -15
deleted file mode 100644
index 8cfe20ab8dd4..000000000000
@@ -1,15 +0,0 @@
-if TARGET_M5475EVB
-
-config SYS_CPU
-	default "mcf547x_8x"
-
-config SYS_BOARD
-	default "m547xevb"
-
-config SYS_VENDOR
-	default "freescale"
-
-config SYS_CONFIG_NAME
-	default "M5475EVB"
-
-endif
board/freescale/m547xevb/MAINTAINERS deleted +0 -12
deleted file mode 100644
index 0d821eb011f1..000000000000
@@ -1,12 +0,0 @@
-M547XEVB BOARD
-M:	TsiChung Liew <[email protected]>
-S:	Maintained
-F:	board/freescale/m547xevb/
-F:	include/configs/M5475EVB.h
-F:	configs/M5475AFE_defconfig
-F:	configs/M5475BFE_defconfig
-F:	configs/M5475CFE_defconfig
-F:	configs/M5475DFE_defconfig
-F:	configs/M5475EFE_defconfig
-F:	configs/M5475FFE_defconfig
-F:	configs/M5475GFE_defconfig
board/freescale/m547xevb/Makefile deleted +0 -6
deleted file mode 100644
index 29fe9dad775f..000000000000
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000-2003
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-
-obj-y	= m547xevb.o
board/freescale/m547xevb/README deleted +0 -271

271 lines not on this page · raw message

board/freescale/m547xevb/m547xevb.c deleted +0 -108

108 lines not on this page · raw message

configs/M5475AFE_defconfig deleted +0 -32
deleted file mode 100644
index a919bf720bba..000000000000
@@ -1,32 +0,0 @@
-CONFIG_M68K=y
-CONFIG_SYS_TEXT_BASE=0xFF800000
-CONFIG_ENV_SIZE=0x10000
-CONFIG_ENV_SECT_SIZE=0x10000
-CONFIG_TARGET_M5475EVB=y
-CONFIG_DEFAULT_DEVICE_TREE="M5475AFE"
-CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64"
-CONFIG_BOOTDELAY=1
-# CONFIG_CMDLINE_EDITING is not set
-# CONFIG_AUTO_COMPLETE is not set
-CONFIG_SYS_PROMPT="-> "
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_PCI=y
-CONFIG_CMD_USB=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_CACHE=y
-CONFIG_ENV_ADDR=0xFF840000
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
-CONFIG_SYS_FLASH_PROTECTION=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_DM_ETH=y
-CONFIG_FSLDMAFEC=y
-CONFIG_MII=y
-CONFIG_PCI=y
-CONFIG_PHY=y
-CONFIG_USB=y
-CONFIG_USB_STORAGE=y
configs/M5475BFE_defconfig deleted +0 -32
deleted file mode 100644
index b9f4904134a4..000000000000
@@ -1,32 +0,0 @@
-CONFIG_M68K=y
-CONFIG_SYS_TEXT_BASE=0xFF800000
-CONFIG_ENV_SIZE=0x10000
-CONFIG_ENV_SECT_SIZE=0x10000
-CONFIG_TARGET_M5475EVB=y
-CONFIG_DEFAULT_DEVICE_TREE="M5475BFE"
-CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16"
-CONFIG_BOOTDELAY=1
-# CONFIG_CMDLINE_EDITING is not set
-# CONFIG_AUTO_COMPLETE is not set
-CONFIG_SYS_PROMPT="-> "
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_PCI=y
-CONFIG_CMD_USB=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_CACHE=y
-CONFIG_ENV_ADDR=0xFF840000
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
-CONFIG_SYS_FLASH_PROTECTION=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_DM_ETH=y
-CONFIG_FSLDMAFEC=y
-CONFIG_MII=y
-CONFIG_PCI=y
-CONFIG_PHY=y
-CONFIG_USB=y
-CONFIG_USB_STORAGE=y
configs/M5475CFE_defconfig deleted +0 -32
deleted file mode 100644
index ae5853572633..000000000000
@@ -1,32 +0,0 @@
-CONFIG_M68K=y
-CONFIG_SYS_TEXT_BASE=0xFF800000
-CONFIG_ENV_SIZE=0x10000
-CONFIG_ENV_SECT_SIZE=0x10000
-CONFIG_TARGET_M5475EVB=y
-CONFIG_DEFAULT_DEVICE_TREE="M5475CFE"
-CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO,SYS_USBCTRL"
-CONFIG_BOOTDELAY=1
-# CONFIG_CMDLINE_EDITING is not set
-# CONFIG_AUTO_COMPLETE is not set
-CONFIG_SYS_PROMPT="-> "
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_PCI=y
-CONFIG_CMD_USB=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_CACHE=y
-CONFIG_ENV_ADDR=0xFF840000
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
-CONFIG_SYS_FLASH_PROTECTION=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_DM_ETH=y
-CONFIG_FSLDMAFEC=y
-CONFIG_MII=y
-CONFIG_PCI=y
-CONFIG_PHY=y
-CONFIG_USB=y
-CONFIG_USB_STORAGE=y
configs/M5475DFE_defconfig deleted +0 -32
deleted file mode 100644
index a9d085f3707a..000000000000
@@ -1,32 +0,0 @@
-CONFIG_M68K=y
-CONFIG_SYS_TEXT_BASE=0xFF800000
-CONFIG_ENV_SIZE=0x10000
-CONFIG_ENV_SECT_SIZE=0x10000
-CONFIG_TARGET_M5475EVB=y
-CONFIG_DEFAULT_DEVICE_TREE="M5475DFE"
-CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_USBCTRL"
-CONFIG_BOOTDELAY=1
-# CONFIG_CMDLINE_EDITING is not set
-# CONFIG_AUTO_COMPLETE is not set
-CONFIG_SYS_PROMPT="-> "
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_PCI=y
-CONFIG_CMD_USB=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_CACHE=y
-CONFIG_ENV_ADDR=0xFF840000
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
-CONFIG_SYS_FLASH_PROTECTION=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_DM_ETH=y
-CONFIG_FSLDMAFEC=y
-CONFIG_MII=y
-CONFIG_PCI=y
-CONFIG_PHY=y
-CONFIG_USB=y
-CONFIG_USB_STORAGE=y
configs/M5475EFE_defconfig deleted +0 -32
deleted file mode 100644
index 38d31ace0120..000000000000
@@ -1,32 +0,0 @@
-CONFIG_M68K=y
-CONFIG_SYS_TEXT_BASE=0xFF800000
-CONFIG_ENV_SIZE=0x10000
-CONFIG_ENV_SECT_SIZE=0x10000
-CONFIG_TARGET_M5475EVB=y
-CONFIG_DEFAULT_DEVICE_TREE="M5475EFE"
-CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_VIDEO,SYS_USBCTRL"
-CONFIG_BOOTDELAY=1
-# CONFIG_CMDLINE_EDITING is not set
-# CONFIG_AUTO_COMPLETE is not set
-CONFIG_SYS_PROMPT="-> "
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_PCI=y
-CONFIG_CMD_USB=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_CACHE=y
-CONFIG_ENV_ADDR=0xFF840000
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
-CONFIG_SYS_FLASH_PROTECTION=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_DM_ETH=y
-CONFIG_FSLDMAFEC=y
-CONFIG_MII=y
-CONFIG_PCI=y
-CONFIG_PHY=y
-CONFIG_USB=y
-CONFIG_USB_STORAGE=y
configs/M5475FFE_defconfig deleted +0 -32
deleted file mode 100644
index 0a620c39f1a1..000000000000
@@ -1,32 +0,0 @@
-CONFIG_M68K=y
-CONFIG_SYS_TEXT_BASE=0xFF800000
-CONFIG_ENV_SIZE=0x10000
-CONFIG_ENV_SECT_SIZE=0x10000
-CONFIG_TARGET_M5475EVB=y
-CONFIG_DEFAULT_DEVICE_TREE="M5475FFE"
-CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=32,SYS_VIDEO,SYS_USBCTRL,SYS_DRAMSZ1=64"
-CONFIG_BOOTDELAY=1
-# CONFIG_CMDLINE_EDITING is not set
-# CONFIG_AUTO_COMPLETE is not set
-CONFIG_SYS_PROMPT="-> "
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_PCI=y
-CONFIG_CMD_USB=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_CACHE=y
-CONFIG_ENV_ADDR=0xFF840000
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
-CONFIG_SYS_FLASH_PROTECTION=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_DM_ETH=y
-CONFIG_FSLDMAFEC=y
-CONFIG_MII=y
-CONFIG_PCI=y
-CONFIG_PHY=y
-CONFIG_USB=y
-CONFIG_USB_STORAGE=y
configs/M5475GFE_defconfig deleted +0 -32
deleted file mode 100644
index 05b0ba7af8cd..000000000000
@@ -1,32 +0,0 @@
-CONFIG_M68K=y
-CONFIG_SYS_TEXT_BASE=0xFF800000
-CONFIG_ENV_SIZE=0x10000
-CONFIG_ENV_SECT_SIZE=0x10000
-CONFIG_TARGET_M5475EVB=y
-CONFIG_DEFAULT_DEVICE_TREE="M5475GFE"
-CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=4,SYS_DRAMSZ=64"
-CONFIG_BOOTDELAY=1
-# CONFIG_CMDLINE_EDITING is not set
-# CONFIG_AUTO_COMPLETE is not set
-CONFIG_SYS_PROMPT="-> "
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_PCI=y
-CONFIG_CMD_USB=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_CACHE=y
-CONFIG_ENV_ADDR=0xFF840000
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
-CONFIG_SYS_FLASH_PROTECTION=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_DM_ETH=y
-CONFIG_FSLDMAFEC=y
-CONFIG_MII=y
-CONFIG_PCI=y
-CONFIG_PHY=y
-CONFIG_USB=y
-CONFIG_USB_STORAGE=y
doc/arch/m68k.rst +1 -1
index 44e1a5dfa384..698e288c4487 100644
@@ -72,7 +72,7 @@ A bash script similar to the one below may be used:
 
    export CROSS_COMPILE=/opt/toolchains/m68k/gcc-4.9.0-nolibc/bin/m68k-linux-
 
-   board=M5475DFE
+   board=M5249EVB
 
    make distclean
    make ${board}_defconfig
drivers/net/mcfmii.c +0 -4
index 0987266c96ef..ca06b35316d3 100644
@@ -11,11 +11,7 @@
 #include <asm/global_data.h>
 #include <linux/delay.h>
 
-#ifdef CONFIG_MCF547x_8x
-#include <asm/fsl_mcdmafec.h>
-#else
 #include <asm/fec.h>
-#endif
 #include <asm/immap.h>
 #include <linux/mii.h>
 
env/Kconfig +1 -1
index 1411f9e815ec..ea0ee1e8bafa 100644
@@ -82,7 +82,7 @@ config ENV_IS_IN_FLASH
 	depends on !CHAIN_OF_TRUST
 	default y if ARCH_CINTEGRATOR
 	default y if ARCH_INTEGRATOR_CP
-	default y if M548x || M547x || M5282 || MCF547x_8x
+	default y if M548x || M547x || M5282
 	default y if MCF532x || MCF52x2
 	default y if MPC86xx || MPC83xx
 	default y if ARCH_MPC8572 || ARCH_MPC8548 || ARCH_MPC8641
include/configs/M5475EVB.h deleted +0 -241

241 lines not on this page · raw message

include/fsl_dspi.h +0 -6
index 4fec83549e1f..ebe1803e4665 100644
@@ -21,14 +21,8 @@ struct dspi {
 	u32 irsr;	/* 0x30 */
 	u32 tfr;	/* 0x34 - PUSHR */
 	u32 rfr;	/* 0x38 - POPR */
-#ifdef CONFIG_MCF547x_8x
-	u32 tfdr[4];	/* 0x3C */
-	u8 resv2[0x30];	/* 0x40 */
-	u32 rfdr[4];	/* 0x7C */
-#else
 	u32 tfdr[16];	/* 0x3C */
 	u32 rfdr[16];	/* 0x7C */
-#endif
 };
 
 /* Module configuration */
Signature · 1 line
2.17.1
author
#9 lore raw

Re: [PATCH 05/27] m68k: Remove M5475x boards

Quoted 6 lines · Tom Rini

These board has not been converted to CONFIG_DM_PCI by the deadline. Remove them. As this is the last of the mcf547x_8x family of boards, remove that support as well.

Cc TsiChung Liew <[email protected]>

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
author
#10 lore raw

PATCH 6/27 mips: Remove malta boards

In reply to Tom Rini

These boards have not been converted to CONFIG_DM_PCI by the deadline. Remove them.

Cc Paul Burton <[email protected]>
Cc Daniel Schwierzeck <[email protected]>

---
As I hope these boards will get converted quickly I've not removed all of the other references to Malta and the associated PCI host controller drivers.

---
 arch/mips/Kconfig                       |   1 -
 board/imgtec/malta/Kconfig              |  16 --
 board/imgtec/malta/MAINTAINERS          |   9 -
 board/imgtec/malta/Makefile             |   8 -
 board/imgtec/malta/flash-malta-boot.tcl |  38 ----
 board/imgtec/malta/lowlevel_init.S      | 231 -----------------------
 board/imgtec/malta/malta.c              | 233 ------------------------
 board/imgtec/malta/superio.c            |  62 -------
 board/imgtec/malta/superio.h            |  14 --
 configs/malta64_defconfig               |  33 ----
 configs/malta64el_defconfig             |  35 ----
 configs/malta_defconfig                 |  32 ----
 configs/maltael_defconfig               |  34 ----
 include/configs/malta.h                 |  81 --------
 14 files changed, 827 deletions(-)
 delete mode 100644 board/imgtec/malta/Kconfig
 delete mode 100644 board/imgtec/malta/MAINTAINERS
 delete mode 100644 board/imgtec/malta/Makefile
 delete mode 100644 board/imgtec/malta/flash-malta-boot.tcl
 delete mode 100644 board/imgtec/malta/lowlevel_init.S
 delete mode 100644 board/imgtec/malta/malta.c
 delete mode 100644 board/imgtec/malta/superio.c
 delete mode 100644 board/imgtec/malta/superio.h
 delete mode 100644 configs/malta64_defconfig
 delete mode 100644 configs/malta64el_defconfig
 delete mode 100644 configs/malta_defconfig
 delete mode 100644 configs/maltael_defconfig
 delete mode 100644 include/configs/malta.h
arch/mips/Kconfig +0 -1
index 77f563e98ed2..dc13c8c6ce6a 100644
@@ -172,7 +172,6 @@ config TARGET_XILFPGA
 endchoice
 
 source "board/imgtec/boston/Kconfig"
-source "board/imgtec/malta/Kconfig"
 source "board/imgtec/xilfpga/Kconfig"
 source "board/qemu-mips/Kconfig"
 source "arch/mips/mach-ath79/Kconfig"
board/imgtec/malta/Kconfig deleted +0 -16
deleted file mode 100644
index 98eb4d16c717..000000000000
@@ -1,16 +0,0 @@
-if TARGET_MALTA
-
-config SYS_BOARD
-	default "malta"
-
-config SYS_VENDOR
-	default "imgtec"
-
-config SYS_CONFIG_NAME
-	default "malta"
-
-config SYS_TEXT_BASE
-	default 0xbe000000 if 32BIT
-	default 0xffffffffbe000000 if 64BIT
-
-endif
board/imgtec/malta/MAINTAINERS deleted +0 -9
deleted file mode 100644
index b1cf297f4fac..000000000000
@@ -1,9 +0,0 @@
-MALTA BOARD
-M:	Paul Burton <[email protected]>
-S:	Maintained
-F:	board/imgtec/malta/
-F:	include/configs/malta.h
-F:	configs/malta64_defconfig
-F:	configs/malta64el_defconfig
-F:	configs/malta_defconfig
-F:	configs/maltael_defconfig
board/imgtec/malta/Makefile deleted +0 -8
deleted file mode 100644
index d0d84010fc76..000000000000
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2003-2006
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-
-obj-y	= malta.o
-obj-y	+= lowlevel_init.o
-obj-y	+= superio.o
board/imgtec/malta/flash-malta-boot.tcl deleted +0 -38
deleted file mode 100644
index 972002a8e911..000000000000
@@ -1,38 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright (C) 2013 Imagination Technologies
-#
-# Programs a MIPS Malta boot flash with a flat binary image.
-
-proc flash-boot { binfile } {
-  puts "flash monitor binary $binfile"
-  config Coherent on
-  config CoherencyDuringLoad on
-
-  if {[endian]=="big"} {
-    puts "CPU in BE mode"
-    flash device sharp_16x32_be;
-  } else {
-    puts "CPU in LE mode"
-    flash device sharp_16x32;
-  }
-
-  flash clear all;
-  flash set 0xBE000000..0xBE0FFFFF
-  flash erase sector 0xbe000000;
-  flash erase sector 0xbe020000;
-  flash erase sector 0xbe040000;
-  flash erase sector 0xbe060000;
-  flash erase sector 0xbe080000;
-  flash erase sector 0xbe0a0000;
-  flash erase sector 0xbe0c0000;
-  flash erase sector 0xbe0e0000;
-  puts "finished erasing boot flash";
-
-  puts "programming flash, please be patient"
-  load bin 0xbe000000 $binfile size4
-
-  flash clear all
-  config CoherencyDuringLoad off
-  puts "finished programming boot flash";
-}
board/imgtec/malta/lowlevel_init.S deleted +0 -231

231 lines not on this page · raw message

board/imgtec/malta/malta.c deleted +0 -233

233 lines not on this page · raw message

board/imgtec/malta/superio.c deleted +0 -62

62 lines not on this page · raw message

board/imgtec/malta/superio.h deleted +0 -14
deleted file mode 100644
index 11e9cef978e8..000000000000
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2013 Imagination Technologies
- * Author: Paul Burton <[email protected]>
- *
- * Setup code for the FDC37M817 super I/O controller
- */
-
-#ifndef __BOARD_MALTA_SUPERIO_H__
-#define __BOARD_MALTA_SUPERIO_H__
-
-void malta_superio_init(void);
-
-#endif /* __BOARD_MALTA_SUPERIO_H__ */
configs/malta64_defconfig deleted +0 -33
deleted file mode 100644
index 878dc6ee05bc..000000000000
@@ -1,33 +0,0 @@
-CONFIG_MIPS=y
-CONFIG_SYS_TEXT_BASE=0xFFFFFFFFBE000000
-CONFIG_ENV_SIZE=0x20000
-CONFIG_ENV_SECT_SIZE=0x20000
-CONFIG_TARGET_MALTA=y
-CONFIG_DEFAULT_DEVICE_TREE="mti,malta"
-CONFIG_CPU_MIPS64_R2=y
-# CONFIG_AUTOBOOT is not set
-CONFIG_BOARD_EARLY_INIT_F=y
-CONFIG_MISC_INIT_R=y
-CONFIG_HUSH_PARSER=y
-CONFIG_SYS_PROMPT="malta # "
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_IDE=y
-# CONFIG_CMD_LOADB is not set
-# CONFIG_CMD_LOADS is not set
-CONFIG_CMD_PCI=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_DHCP=y
-# CONFIG_CMD_NFS is not set
-CONFIG_CMD_PING=y
-CONFIG_CMD_DATE=y
-# CONFIG_ISO_PARTITION is not set
-CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xFFFFFFFFBE3E0000
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_PCNET=y
-CONFIG_PCI=y
-CONFIG_RTC_MC146818=y
-CONFIG_SYS_NS16550=y
configs/malta64el_defconfig deleted +0 -35
deleted file mode 100644
index 7dfe67355ff8..000000000000
@@ -1,35 +0,0 @@
-CONFIG_MIPS=y
-CONFIG_SYS_TEXT_BASE=0xFFFFFFFFBE000000
-CONFIG_ENV_SIZE=0x20000
-CONFIG_ENV_SECT_SIZE=0x20000
-CONFIG_TARGET_MALTA=y
-CONFIG_BUILD_TARGET="u-boot-swap.bin"
-CONFIG_DEFAULT_DEVICE_TREE="mti,malta"
-CONFIG_SYS_LITTLE_ENDIAN=y
-CONFIG_CPU_MIPS64_R2=y
-# CONFIG_AUTOBOOT is not set
-CONFIG_BOARD_EARLY_INIT_F=y
-CONFIG_MISC_INIT_R=y
-CONFIG_HUSH_PARSER=y
-CONFIG_SYS_PROMPT="maltael # "
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_IDE=y
-# CONFIG_CMD_LOADB is not set
-# CONFIG_CMD_LOADS is not set
-CONFIG_CMD_PCI=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_DHCP=y
-# CONFIG_CMD_NFS is not set
-CONFIG_CMD_PING=y
-CONFIG_CMD_DATE=y
-# CONFIG_ISO_PARTITION is not set
-CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xFFFFFFFFBE3E0000
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_PCNET=y
-CONFIG_PCI=y
-CONFIG_RTC_MC146818=y
-CONFIG_SYS_NS16550=y
configs/malta_defconfig deleted +0 -32
deleted file mode 100644
index 304f2198baaf..000000000000
@@ -1,32 +0,0 @@
-CONFIG_MIPS=y
-CONFIG_SYS_TEXT_BASE=0xBE000000
-CONFIG_ENV_SIZE=0x20000
-CONFIG_ENV_SECT_SIZE=0x20000
-CONFIG_TARGET_MALTA=y
-CONFIG_DEFAULT_DEVICE_TREE="mti,malta"
-# CONFIG_AUTOBOOT is not set
-CONFIG_BOARD_EARLY_INIT_F=y
-CONFIG_MISC_INIT_R=y
-CONFIG_HUSH_PARSER=y
-CONFIG_SYS_PROMPT="malta # "
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_IDE=y
-# CONFIG_CMD_LOADB is not set
-# CONFIG_CMD_LOADS is not set
-CONFIG_CMD_PCI=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_DHCP=y
-# CONFIG_CMD_NFS is not set
-CONFIG_CMD_PING=y
-CONFIG_CMD_DATE=y
-# CONFIG_ISO_PARTITION is not set
-CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xBE3E0000
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_PCNET=y
-CONFIG_PCI=y
-CONFIG_RTC_MC146818=y
-CONFIG_SYS_NS16550=y
configs/maltael_defconfig deleted +0 -34
deleted file mode 100644
index 7436e4e94390..000000000000
@@ -1,34 +0,0 @@
-CONFIG_MIPS=y
-CONFIG_SYS_TEXT_BASE=0xBE000000
-CONFIG_ENV_SIZE=0x20000
-CONFIG_ENV_SECT_SIZE=0x20000
-CONFIG_TARGET_MALTA=y
-CONFIG_BUILD_TARGET="u-boot-swap.bin"
-CONFIG_DEFAULT_DEVICE_TREE="mti,malta"
-CONFIG_SYS_LITTLE_ENDIAN=y
-# CONFIG_AUTOBOOT is not set
-CONFIG_BOARD_EARLY_INIT_F=y
-CONFIG_MISC_INIT_R=y
-CONFIG_HUSH_PARSER=y
-CONFIG_SYS_PROMPT="maltael # "
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_IDE=y
-# CONFIG_CMD_LOADB is not set
-# CONFIG_CMD_LOADS is not set
-CONFIG_CMD_PCI=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_DHCP=y
-# CONFIG_CMD_NFS is not set
-CONFIG_CMD_PING=y
-CONFIG_CMD_DATE=y
-# CONFIG_ISO_PARTITION is not set
-CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xBE3E0000
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_PCNET=y
-CONFIG_PCI=y
-CONFIG_RTC_MC146818=y
-CONFIG_SYS_NS16550=y
include/configs/malta.h deleted +0 -81

81 lines not on this page · raw message

Signature · 1 line
2.17.1
#11 lore raw

PATCH 6/27 mips: Remove malta boards

Hi Tom,

Am Freitag, den 14.05.2021, 21:34 -0400 schrieb Tom Rini:

Quoted 7 lines

These boards have not been converted to CONFIG_DM_PCI by the deadline.
Remove them.

Cc Paul Burton <[email protected]>
Cc Daniel Schwierzeck <[email protected]>
Quoted 6 lines

---
As I hope these boards will get converted quickly I've not removed all
of the other references to Malta and the associated PCI host controller
drivers.

it is not trivial to convert Malta and Paul is not involved with any MIPS anymore since 2019. I have this on my todo list for over one year but didn't find time ;)

But Malta is rather important because it is the reference board for MIPS Qemu. It's also important for U-Boot CI due to build coverage for LE/BE and 32/64 bit and Qemu tests. The qemu_mips board also used for CI is deprecated and I definitely won't convert that. In fact I already sent patches to remove it with this release.

Anyway I started to convert things and made good progress. But I need some more days to finish and test. When do you plan to apply the removal patch series?

Signature · 1 line
- Daniel
author
#12 lore raw

PATCH 6/27 mips: Remove malta boards

Quoted 17 lines · Daniel Schwierzeck

Hi Tom,

Am Freitag, den 14.05.2021, 21:34 -0400 schrieb Tom Rini:

Quoted 7 lines

These boards have not been converted to CONFIG_DM_PCI by the deadline.
Remove them.

Cc Paul Burton <[email protected]>
Cc Daniel Schwierzeck <[email protected]>
Quoted 6 lines

---
As I hope these boards will get converted quickly I've not removed all
of the other references to Malta and the associated PCI host controller
drivers.

Quoted 3 lines

it is not trivial to convert Malta and Paul is not involved with any MIPS anymore since 2019. I have this on my todo list for over one year but didn't find time ;)

Ah, ok.

Quoted 9 lines

But Malta is rather important because it is the reference board for MIPS Qemu. It's also important for U-Boot CI due to build coverage for LE/BE and 32/64 bit and Qemu tests. The qemu_mips board also used for CI is deprecated and I definitely won't convert that. In fact I already sent patches to remove it with this release.

Anyway I started to convert things and made good progress. But I need some more days to finish and test. When do you plan to apply the removal patch series?

The DM_PCI deadline was v2019.07, so after the v2021.07 release. Based on how DM_MMC went for this release, I expect it will be closer to v2021.10-rc2 timeframe before I do the final remove and enforce.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210517/e63760db/attachment.sig>
author
#13 lore raw

PATCH 7/27 ppc: Remove sbc8349 board

In reply to Tom Rini

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

Cc Paul Gortmaker <[email protected]>
---
 arch/powerpc/cpu/mpc83xx/Kconfig |   5 -
 board/sbc8349/Kconfig            |   9 -
 board/sbc8349/MAINTAINERS        |   8 -
 board/sbc8349/Makefile           |   6 -
 board/sbc8349/README             | 127 ------------
 board/sbc8349/pci.c              |  70 -------
 board/sbc8349/sbc8349.c          | 243 -----------------------
 configs/sbc8349_PCI_33_defconfig | 123 ------------
 configs/sbc8349_PCI_66_defconfig | 123 ------------
 configs/sbc8349_defconfig        | 101 ----------
 include/configs/sbc8349.h        | 322 -------------------------------
 11 files changed, 1137 deletions(-)
 delete mode 100644 board/sbc8349/Kconfig
 delete mode 100644 board/sbc8349/MAINTAINERS
 delete mode 100644 board/sbc8349/Makefile
 delete mode 100644 board/sbc8349/README
 delete mode 100644 board/sbc8349/pci.c
 delete mode 100644 board/sbc8349/sbc8349.c
 delete mode 100644 configs/sbc8349_PCI_33_defconfig
 delete mode 100644 configs/sbc8349_PCI_66_defconfig
 delete mode 100644 configs/sbc8349_defconfig
 delete mode 100644 include/configs/sbc8349.h
arch/powerpc/cpu/mpc83xx/Kconfig +0 -5
index ff85834c460c..e0bdfc4b9716 100644
@@ -12,10 +12,6 @@ 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
@@ -312,7 +308,6 @@ 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"
board/sbc8349/Kconfig deleted +0 -9
deleted file mode 100644
index 129d6b92ec57..000000000000
@@ -1,9 +0,0 @@
-if TARGET_SBC8349
-
-config SYS_BOARD
-	default "sbc8349"
-
-config SYS_CONFIG_NAME
-	default "sbc8349"
-
-endif
board/sbc8349/MAINTAINERS deleted +0 -8
deleted file mode 100644
index af95c1dd0d23..000000000000
@@ -1,8 +0,0 @@
-SBC8349 BOARD
-M:	Paul Gortmaker <[email protected]>
-S:	Maintained
-F:	board/sbc8349/
-F:	include/configs/sbc8349.h
-F:	configs/sbc8349_defconfig
-F:	configs/sbc8349_PCI_33_defconfig
-F:	configs/sbc8349_PCI_66_defconfig
board/sbc8349/Makefile deleted +0 -6
deleted file mode 100644
index c469174085d9..000000000000
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright (c) 2006 Wind River Systems, Inc.
-
-obj-y += sbc8349.o
-obj-$(CONFIG_PCI) += pci.o
board/sbc8349/README deleted +0 -127

127 lines not on this page · raw message

board/sbc8349/pci.c deleted +0 -70

70 lines not on this page · raw message

board/sbc8349/sbc8349.c deleted +0 -243

243 lines not on this page · raw message

configs/sbc8349_PCI_33_defconfig deleted +0 -123

123 lines not on this page · raw message

configs/sbc8349_PCI_66_defconfig deleted +0 -123

123 lines not on this page · raw message

configs/sbc8349_defconfig deleted +0 -101

101 lines not on this page · raw message

include/configs/sbc8349.h deleted +0 -322

322 lines not on this page · raw message

Signature · 1 line
2.17.1
#14 lore raw

PATCH 7/27 ppc: Remove sbc8349 board

Quoted 4 lines · [[PATCH 07/27] ppc: Remove sbc8349 board] On 14/05/2021 (Fri 21:34) Tom Rini…

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

Cc Paul Gortmaker <[email protected]>

Ack - this was removed in the linux-kernel already.

Thanks,
Paul.
--

Quoted 1,243 lines
---
 arch/powerpc/cpu/mpc83xx/Kconfig |   5 -
 board/sbc8349/Kconfig            |   9 -
 board/sbc8349/MAINTAINERS        |   8 -
 board/sbc8349/Makefile           |   6 -
 board/sbc8349/README             | 127 ------------
 board/sbc8349/pci.c              |  70 -------
 board/sbc8349/sbc8349.c          | 243 -----------------------
 configs/sbc8349_PCI_33_defconfig | 123 ------------
 configs/sbc8349_PCI_66_defconfig | 123 ------------
 configs/sbc8349_defconfig        | 101 ----------
 include/configs/sbc8349.h        | 322 -------------------------------
 11 files changed, 1137 deletions(-)
 delete mode 100644 board/sbc8349/Kconfig
 delete mode 100644 board/sbc8349/MAINTAINERS
 delete mode 100644 board/sbc8349/Makefile
 delete mode 100644 board/sbc8349/README
 delete mode 100644 board/sbc8349/pci.c
 delete mode 100644 board/sbc8349/sbc8349.c
 delete mode 100644 configs/sbc8349_PCI_33_defconfig
 delete mode 100644 configs/sbc8349_PCI_66_defconfig
 delete mode 100644 configs/sbc8349_defconfig
 delete mode 100644 include/configs/sbc8349.h
arch/powerpc/cpu/mpc83xx/Kconfig +0 -5
index ff85834c460c..e0bdfc4b9716 100644
@@ -12,10 +12,6 @@ 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
@@ -312,7 +308,6 @@ 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"
board/sbc8349/Kconfig deleted +0 -9
deleted file mode 100644
index 129d6b92ec57..000000000000
@@ -1,9 +0,0 @@
-if TARGET_SBC8349
-
-config SYS_BOARD
-	default "sbc8349"
-
-config SYS_CONFIG_NAME
-	default "sbc8349"
-
-endif
board/sbc8349/MAINTAINERS deleted +0 -8
deleted file mode 100644
index af95c1dd0d23..000000000000
@@ -1,8 +0,0 @@
-SBC8349 BOARD
-M:	Paul Gortmaker <[email protected]>
-S:	Maintained
-F:	board/sbc8349/
-F:	include/configs/sbc8349.h
-F:	configs/sbc8349_defconfig
-F:	configs/sbc8349_PCI_33_defconfig
-F:	configs/sbc8349_PCI_66_defconfig
board/sbc8349/Makefile deleted +0 -6
deleted file mode 100644
index c469174085d9..000000000000
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright (c) 2006 Wind River Systems, Inc.
-
-obj-y += sbc8349.o
-obj-$(CONFIG_PCI) += pci.o
board/sbc8349/README deleted +0 -127
deleted file mode 100644
index 3c142e040762..000000000000
@@ -1,127 +0,0 @@
-
-
-	U-Boot for Wind River SBC834x Boards
-	====================================
-
-
-The Wind River SBC834x board is a 6U form factor (not CPCI) reference
-design that uses the MPC8347E or MPC8349E processor.  U-Boot support
-for this board is heavily based on the existing U-Boot support for
-Freescale MPC8349 reference boards.
-
-Support has been primarily tested on the SBC8349 version of the board,
-although earlier versions were also tested on the SBC8347.  The primary
-difference in the two is the level of PCI functionality.
-
-	http://www.windriver.com/products/OCD/SBC8347E_49E/
-
-
-Flash Details:
-==============
-
-The flash type is intel 28F640Jx (4096x16) [one device].  Base address
-is 0xFF80_0000 which is also where the Hardware Reset Configuration
-Word (HRCW) is stored.  Caution should be used to not reset the
-board without having a valid HRCW in place (i.e. erased flash) as
-then a Wind River ICE will be required to restore the HRCW and flash
-image.
-
-
-Restoring a corrupted or missing flash image:
-=============================================
-
-Note that U-Boot versions up to and including 2009.06 had essentially
-two copies of U-Boot in flash; one at the very beginning, which set
-the HRCW, and one at the very end, which was the image that was run.
-As of this point in time, the two have been combined into just one
-at the beginning of flash, which provides both the HRCW, and the image
-that is executed.  This frees up the remainder of flash for other uses.
-Use of the U-Boot command "fli" will indicate what parts are in use.
-Details for storing U-Boot to flash using a Wind River ICE can be found
-on page 19 of the board manual (request ERG-00328-001).  The following
-is a summary of that information:
-
-  - Connect ICE and establish connection to it from WorkBench/OCD.
-  - Ensure you have background mode (BKM) in the OCD terminal window.
-  - Select the appropriate flash type (listed above)
-  - Prepare a U-Boot image by using the Wind River Convert utility;
-    by using "Convert and Add file" on the ELF file from your build.
-    Convert from FF80_0000 to FFFF_FFFF (or to FF83_FFFF if you are
-    trying to preserve your old environment settings and user flash).
-  - Set the start address of the erase/flash process to FF80_0000
-  - Set the target RAM required to 64kB.
-  - Select sectors for erasing (see note on environment below)
-  - Select Erase and Reprogram.
-
-Note that some versions of the register files used with Workbench
-would zero some TSEC registers, which inhibits ethernet operation
-by U-Boot when this register file is played to the target.  Using
-"INN" in the OCD terminal window instead of "IN" before the "GO"
-will not play the register file, and allow U-Boot to use the TSEC
-interface while executed from the ICE "GO" command.
-
-Alternatively, you can locate the register file which will be named
-WRS_SBC8349_PCT00328001.reg or similar) and "REM" out all the lines
-beginning with "SCGA TSEC1" and "SCGA TSEC2".  This allows you to
-use all the remaining register file content.
-
-If you wish to preserve your prior U-Boot environment settings,
-then convert (and erase to) 0xFF83FFFF instead of 0xFFFFFFFF.
-The size for converting (and erasing) must be at least as large
-as u-boot.bin.
-
-
-Updating U-Boot with U-Boot:
-============================
-
-This procedure is very similar to other boards that have U-Boot installed.
-Assuming that the network has been configured, and that the new u-boot.bin
-has been copied to the TFTP server, the commands are:
-
-	tftp 200000 u-boot.bin
-	protect off all
-	erase ff800000 ff83ffff
-	cp.b 200000 ff800000 40000
-	protect on all
-
-You may wish to do a "md ff800000 20" operation as a prefix and postfix
-to the above steps to inspect/compare the HRCW before/after as an extra
-safety check before resetting the board upon completion of the reflash.
-
-PCI:
-====
-
-There are three configuration choices:
-	sbc8349_config
-	sbc8349_PCI_33_config
-	sbc8349_PCI_66_config
-
-The 1st does not enable CONFIG_PCI, and assumes that the PCI slot
-will be left empty (M66EN high), and so the board will operate with
-a base clock of 66MHz.  Note that you need both PCI enabled in U-Boot
-and linux in order to have functional PCI under linux.  The only
-reason for choosing to not enable PCI would be if you had a very
-early (rev 1.0) CPU with possible PCI issues.
-
-The second enables PCI support and builds for a 33MHz clock rate.  Note
-that if a 33MHz 32bit card is inserted in the slot, then the whole board
-will clock down to a 33MHz base clock instead of the default 66MHz.  This
-will change the baud clocks and mess up your serial console output if you
-were previously running at 66MHz.  If you want to use a 33MHz PCI card,
-then you should build a U-Boot with sbc8349_PCI_33_config and store this
-to flash prior to powering down the board and inserting the 33MHz PCI
-card.
-
-The third option builds PCI support in, and leaves the clocking at the
-default 66MHz.  This has been tested with an intel PCI-X e1000 card.
-This is also the appropriate choice for people with a recent (non 1.0)
-CPU who currently have the PCI slot physically empty, but intend to
-possibly add a PCI-X card at a later date.
-
-   => pci
-   Scanning PCI devices on bus 0
-   BusDevFun  VendorId   DeviceId   Device Class       Sub-Class
-   _____________________________________________________________
-   00.00.00   0x1957     0x0080     Processor               0x20
-   00.11.00   0x8086     0x1026     Network controller      0x00
-   =>
board/sbc8349/pci.c deleted +0 -70
deleted file mode 100644
index 26c4f24e4f8b..000000000000
@@ -1,70 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * pci.c -- WindRiver SBC8349 PCI board support.
- * Copyright (c) 2006 Wind River Systems, Inc.
- * Copyright (C) 2006-2009 Freescale Semiconductor, Inc.
- *
- * Based on MPC8349 PCI support but w/o PIB related code.
- */
-
-#include <init.h>
-#include <asm/mmu.h>
-#include <asm/io.h>
-#include <common.h>
-#include <mpc83xx.h>
-#include <pci.h>
-#include <i2c.h>
-#include <asm/fsl_i2c.h>
-#include <linux/delay.h>
-
-static struct pci_region pci1_regions[] = {
-	{
-		bus_start: CONFIG_SYS_PCI1_MEM_BASE,
-		phys_start: CONFIG_SYS_PCI1_MEM_PHYS,
-		size: CONFIG_SYS_PCI1_MEM_SIZE,
-		flags: PCI_REGION_MEM | PCI_REGION_PREFETCH
-	},
-	{
-		bus_start: CONFIG_SYS_PCI1_IO_BASE,
-		phys_start: CONFIG_SYS_PCI1_IO_PHYS,
-		size: CONFIG_SYS_PCI1_IO_SIZE,
-		flags: PCI_REGION_IO
-	},
-	{
-		bus_start: CONFIG_SYS_PCI1_MMIO_BASE,
-		phys_start: CONFIG_SYS_PCI1_MMIO_PHYS,
-		size: CONFIG_SYS_PCI1_MMIO_SIZE,
-		flags: PCI_REGION_MEM
-	},
-};
-
-/*
- * pci_init_board()
- *
- * NOTICE: PCI2 is not supported. There is only one
- * physical PCI slot on the board.
- *
- */
-void
-pci_init_board(void)
-{
-	volatile immap_t *immr = (volatile immap_t *)CONFIG_SYS_IMMR;
-	volatile clk83xx_t *clk = (volatile clk83xx_t *)&immr->clk;
-	volatile law83xx_t *pci_law = immr->sysconf.pcilaw;
-	struct pci_region *reg[] = { pci1_regions };
-
-	/* Enable all 8 PCI_CLK_OUTPUTS */
-	clk->occr = 0xff000000;
-	udelay(2000);
-
-	/* Configure PCI Local Access Windows */
-	pci_law[0].bar = CONFIG_SYS_PCI1_MEM_PHYS & LAWBAR_BAR;
-	pci_law[0].ar = LAWAR_EN | LAWAR_SIZE_1G;
-
-	pci_law[1].bar = CONFIG_SYS_PCI1_IO_PHYS & LAWBAR_BAR;
-	pci_law[1].ar = LAWAR_EN | LAWAR_SIZE_4M;
-
-	udelay(2000);
-
-	mpc83xx_pci_init(1, reg);
-}
board/sbc8349/sbc8349.c deleted +0 -243
deleted file mode 100644
index b440a0b17e97..000000000000
@@ -1,243 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * sbc8349.c -- WindRiver SBC8349 board support.
- * Copyright (c) 2006-2007 Wind River Systems, Inc.
- *
- * Paul Gortmaker <[email protected]>
- * Based on board/mpc8349emds/mpc8349emds.c (and previous 834x releases.)
- */
-
-#include <common.h>
-#include <fdt_support.h>
-#include <init.h>
-#include <ioports.h>
-#include <mpc83xx.h>
-#include <asm/bitops.h>
-#include <asm/global_data.h>
-#include <asm/mpc8349_pci.h>
-#include <i2c.h>
-#include <spd_sdram.h>
-#include <miiphy.h>
-#if defined(CONFIG_OF_LIBFDT)
-#include <linux/libfdt.h>
-#endif
-#include <linux/delay.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-int fixed_sdram(void);
-void sdram_init(void);
-
-#if defined(CONFIG_DDR_ECC) && defined(CONFIG_MPC83xx)
-void ddr_enable_ecc(unsigned int dram_size);
-#endif
-
-#ifdef CONFIG_BOARD_EARLY_INIT_F
-int board_early_init_f (void)
-{
-	return 0;
-}
-#endif
-
-#define ns2clk(ns) (ns / (1000000000 / CONFIG_8349_CLKIN) + 1)
-
-int dram_init(void)
-{
-	volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
-	u32 msize = 0;
-
-	if ((im->sysconf.immrbar & IMMRBAR_BASE_ADDR) != (u32)im)
-		return -1;
-
-	/* DDR SDRAM - Main SODIMM */
-	im->sysconf.ddrlaw[0].bar = CONFIG_SYS_SDRAM_BASE & LAWBAR_BAR;
-#if defined(CONFIG_SPD_EEPROM)
-	msize = spd_sdram();
-#else
-	msize = fixed_sdram();
-#endif
-	/*
-	 * Initialize SDRAM if it is on local bus.
-	 */
-	sdram_init();
-
-#if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER)
-	/*
-	 * Initialize and enable DDR ECC.
-	 */
-	ddr_enable_ecc(msize * 1024 * 1024);
-#endif
-	/* set total bus SDRAM size(bytes)  -- DDR */
-	gd->ram_size = msize * 1024 * 1024;
-
-	return 0;
-}
-
-#if !defined(CONFIG_SPD_EEPROM)
-/*************************************************************************
- *  fixed sdram init -- doesn't use serial presence detect.
- ************************************************************************/
-int fixed_sdram(void)
-{
-	volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
-	u32 msize = CONFIG_SYS_DDR_SIZE;
-	u32 ddr_size = msize << 20;	/* DDR size in bytes */
-	u32 ddr_size_log2 = __ilog2(msize);
-
-	im->sysconf.ddrlaw[0].bar = CONFIG_SYS_SDRAM_BASE & 0xfffff000;
-	im->sysconf.ddrlaw[0].ar = LAWAR_EN | ((ddr_size_log2 - 1) & LAWAR_SIZE);
-
-#if (CONFIG_SYS_DDR_SIZE != 256)
-#warning Currently any ddr size other than 256 is not supported
-#endif
-
-#if ((CONFIG_SYS_SDRAM_BASE & 0x00FFFFFF) != 0)
-#warning Chip select bounds is only configurable in 16MB increments
-#endif
-	im->ddr.csbnds[2].csbnds =
-		((CONFIG_SYS_SDRAM_BASE >> CSBNDS_SA_SHIFT) & CSBNDS_SA) |
-		(((CONFIG_SYS_SDRAM_BASE + ddr_size - 1) >>
-				CSBNDS_EA_SHIFT) & CSBNDS_EA);
-	im->ddr.cs_config[2] = CONFIG_SYS_DDR_CS2_CONFIG;
-
-	/* currently we use only one CS, so disable the other banks */
-	im->ddr.cs_config[0] = 0;
-	im->ddr.cs_config[1] = 0;
-	im->ddr.cs_config[3] = 0;
-
-	im->ddr.timing_cfg_1 = CONFIG_SYS_DDR_TIMING_1;
-	im->ddr.timing_cfg_2 = CONFIG_SYS_DDR_TIMING_2;
-
-	im->ddr.sdram_cfg =
-		SDRAM_CFG_SREN
-#if defined(CONFIG_DDR_2T_TIMING)
-		| SDRAM_CFG_2T_EN
-#endif
-		| SDRAM_CFG_SDRAM_TYPE_DDR1;
-#if defined (CONFIG_DDR_32BIT)
-	/* for 32-bit mode burst length is 8 */
-	im->ddr.sdram_cfg |= (SDRAM_CFG_32_BE | SDRAM_CFG_8_BE);
-#endif
-	im->ddr.sdram_mode = CONFIG_SYS_DDR_MODE;
-
-	im->ddr.sdram_interval = CONFIG_SYS_DDR_INTERVAL;
-	udelay(200);
-
-	/* enable DDR controller */
-	im->ddr.sdram_cfg |= SDRAM_CFG_MEM_EN;
-	return msize;
-}
-#endif/*!CONFIG_SYS_SPD_EEPROM*/
-
-
-int checkboard (void)
-{
-	puts("Board: Wind River SBC834x\n");
-	return 0;
-}
-
-/*
- * if board is fitted with SDRAM
- */
-#if defined(CONFIG_SYS_BR2_PRELIM)  \
-	&& defined(CONFIG_SYS_OR2_PRELIM) \
-	&& defined(CONFIG_SYS_LBLAWBAR2_PRELIM) \
-	&& defined(CONFIG_SYS_LBLAWAR2_PRELIM)
-/*
- * Initialize SDRAM memory on the Local Bus.
- */
-
-void sdram_init(void)
-{
-	volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
-	volatile fsl_lbc_t *lbc = &immap->im_lbc;
-	uint *sdram_addr = (uint *)CONFIG_SYS_LBC_SDRAM_BASE;
-	const u32 lsdmr_common = LSDMR_RFEN | LSDMR_BSMA1516 | LSDMR_RFCR8 |
-				 LSDMR_PRETOACT6 | LSDMR_ACTTORW3 | LSDMR_BL8 |
-				 LSDMR_WRC3 | LSDMR_CL3;
-
-	puts("\n   SDRAM on Local Bus: ");
-	print_size (CONFIG_SYS_LBC_SDRAM_SIZE * 1024 * 1024, "\n");
-
-	/*
-	 * Setup SDRAM Base and Option Registers, already done in cpu_init.c
-	 */
-
-	/* setup mtrpt, lsrt and lbcr for LB bus */
-	lbc->lbcr = 0x00000000;
-	/* LB refresh timer prescal, 266MHz/32 */
-	lbc->mrtpr = 0x20000000;
-	/* LB sdram refresh timer, about 6us */
-	lbc->lsrt = 0x32000000;
-	asm("sync");
-
-	/*
-	 * Configure the SDRAM controller Machine Mode Register.
-	 */
-	/* 0x40636733; normal operation */
-	lbc->lsdmr = lsdmr_common | LSDMR_OP_NORMAL;
-
-	/* 0x68636733; precharge all the banks */
-	lbc->lsdmr = lsdmr_common | LSDMR_OP_PCHALL;
-	asm("sync");
-	*sdram_addr = 0xff;
-	udelay(100);
-
-	/* 0x48636733; auto refresh */
-	lbc->lsdmr = lsdmr_common | LSDMR_OP_ARFRSH;
-	asm("sync");
-	/*1 times*/
-	*sdram_addr = 0xff;
-	udelay(100);
-	/*2 times*/
-	*sdram_addr = 0xff;
-	udelay(100);
-	/*3 times*/
-	*sdram_addr = 0xff;
-	udelay(100);
-	/*4 times*/
-	*sdram_addr = 0xff;
-	udelay(100);
-	/*5 times*/
-	*sdram_addr = 0xff;
-	udelay(100);
-	/*6 times*/
-	*sdram_addr = 0xff;
-	udelay(100);
-	/*7 times*/
-	*sdram_addr = 0xff;
-	udelay(100);
-	/*8 times*/
-	*sdram_addr = 0xff;
-	udelay(100);
-
-	/* 0x58636733; mode register write operation */
-	lbc->lsdmr = lsdmr_common | LSDMR_OP_MRW;
-	asm("sync");
-	*sdram_addr = 0xff;
-	udelay(100);
-
-	/* 0x40636733; normal operation */
-	lbc->lsdmr = lsdmr_common | LSDMR_OP_NORMAL;
-	asm("sync");
-	*sdram_addr = 0xff;
-	udelay(100);
-}
-#else
-void sdram_init(void)
-{
-	puts("   SDRAM on Local Bus: Disabled in config\n");
-}
-#endif
-
-#if defined(CONFIG_OF_BOARD_SETUP)
-int ft_board_setup(void *blob, struct bd_info *bd)
-{
-	ft_cpu_setup(blob, bd);
-#ifdef CONFIG_PCI
-	ft_pci_setup(blob, bd);
-#endif
-
-	return 0;
-}
-#endif
configs/sbc8349_PCI_33_defconfig deleted +0 -123
deleted file mode 100644
index e428933b41e5..000000000000
@@ -1,123 +0,0 @@
-CONFIG_PPC=y
-CONFIG_SYS_TEXT_BASE=0xFF800000
-CONFIG_ENV_SIZE=0x2000
-CONFIG_ENV_SECT_SIZE=0x20000
-CONFIG_SYS_CLK_FREQ=33000000
-CONFIG_MPC83xx=y
-CONFIG_HIGH_BATS=y
-CONFIG_TARGET_SBC8349=y
-CONFIG_DDR_MC_CLOCK_MODE_1_1=y
-CONFIG_SYSTEM_PLL_FACTOR_8_1=y
-CONFIG_CORE_PLL_RATIO_2_1=y
-CONFIG_PCI_HOST_MODE_ENABLE=y
-CONFIG_PCI_64BIT_MODE_ENABLE=y
-CONFIG_PCI_INT_ARBITER1_ENABLE=y
-CONFIG_BOOT_MEMORY_SPACE_LOW=y
-CONFIG_BOOT_ROM_INTERFACE_GPCM_16BIT=y
-CONFIG_TSEC1_MODE_GMII=y
-CONFIG_TSEC2_MODE_GMII=y
-CONFIG_BAT0=y
-CONFIG_BAT0_NAME="SDRAM"
-CONFIG_BAT0_BASE=0x00000000
-CONFIG_BAT0_LENGTH_256_MBYTES=y
-CONFIG_BAT0_ACCESS_RW=y
-CONFIG_BAT0_ICACHE_MEMORYCOHERENCE=y
-CONFIG_BAT0_DCACHE_MEMORYCOHERENCE=y
-CONFIG_BAT0_USER_MODE_VALID=y
-CONFIG_BAT0_SUPERVISOR_MODE_VALID=y
-CONFIG_BAT1=y
-CONFIG_BAT1_NAME="PCI1_MEM"
-CONFIG_BAT1_BASE=0x80000000
-CONFIG_BAT1_LENGTH_256_MBYTES=y
-CONFIG_BAT1_ACCESS_RW=y
-CONFIG_BAT1_ICACHE_MEMORYCOHERENCE=y
-CONFIG_BAT1_DCACHE_MEMORYCOHERENCE=y
-CONFIG_BAT1_USER_MODE_VALID=y
-CONFIG_BAT1_SUPERVISOR_MODE_VALID=y
-CONFIG_BAT2=y
-CONFIG_BAT2_NAME="PCI1_MMIO"
-CONFIG_BAT2_BASE=0x90000000
-CONFIG_BAT2_LENGTH_256_MBYTES=y
-CONFIG_BAT2_ACCESS_RW=y
-CONFIG_BAT2_ICACHE_INHIBITED=y
-CONFIG_BAT2_ICACHE_GUARDED=y
-CONFIG_BAT2_DCACHE_INHIBITED=y
-CONFIG_BAT2_DCACHE_GUARDED=y
-CONFIG_BAT2_USER_MODE_VALID=y
-CONFIG_BAT2_SUPERVISOR_MODE_VALID=y
-CONFIG_BAT5=y
-CONFIG_BAT5_NAME="IMMR_PCIIO"
-CONFIG_BAT5_BASE=0xE0000000
-CONFIG_BAT5_LENGTH_256_MBYTES=y
-CONFIG_BAT5_ACCESS_RW=y
-CONFIG_BAT5_ICACHE_INHIBITED=y
-CONFIG_BAT5_ICACHE_GUARDED=y
-CONFIG_BAT5_DCACHE_INHIBITED=y
-CONFIG_BAT5_DCACHE_GUARDED=y
-CONFIG_BAT5_USER_MODE_VALID=y
-CONFIG_BAT5_SUPERVISOR_MODE_VALID=y
-CONFIG_BAT6=y
-CONFIG_BAT6_NAME="LBC_INITRAM_FLASH"
-CONFIG_BAT6_BASE=0xF0000000
-CONFIG_BAT6_LENGTH_256_MBYTES=y
-CONFIG_BAT6_ACCESS_RW=y
-CONFIG_BAT6_ICACHE_MEMORYCOHERENCE=y
-CONFIG_BAT6_ICACHE_GUARDED=y
-CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y
-CONFIG_BAT6_DCACHE_GUARDED=y
-CONFIG_BAT6_USER_MODE_VALID=y
-CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
-CONFIG_LBLAW0=y
-CONFIG_LBLAW0_BASE=0xFF800000
-CONFIG_LBLAW0_NAME="FLASH"
-CONFIG_LBLAW0_LENGTH_8_MBYTES=y
-CONFIG_ELBC_BR0_OR0=y
-CONFIG_BR0_OR0_NAME="FLASH"
-CONFIG_BR0_OR0_BASE=0xFF800000
-CONFIG_BR0_PORTSIZE_16BIT=y
-CONFIG_OR0_AM_8_MBYTES=y
-CONFIG_OR0_XAM_SET=y
-CONFIG_OR0_SCY_15=y
-CONFIG_OR0_CSNT_EARLIER=y
-CONFIG_OR0_ACS_HALF_CYCLE_EARLIER=y
-CONFIG_OR0_XACS_EXTENDED=y
-CONFIG_OR0_TRLX_RELAXED=y
-CONFIG_OR0_EHTR_8_CYCLE=y
-CONFIG_OR0_EAD_EXTRA=y
-CONFIG_HID0_FINAL_EMCP=y
-CONFIG_HID0_FINAL_ICE=y
-CONFIG_HID2_HBE=y
-CONFIG_LCRR_DBYP_PLL_BYPASSED=y
-CONFIG_LCRR_CLKDIV_4=y
-CONFIG_PCI_64BIT=y
-CONFIG_OF_BOARD_SETUP=y
-CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SYS_EXTRA_OPTIONS="PCI_33M"
-CONFIG_BOOTDELAY=6
-CONFIG_HUSH_PARSER=y
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_PCI=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_ENV_OVERWRITE=y
-CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_ADDR=0xFF840000
-CONFIG_ENV_ADDR_REDUND=0xFF860000
-# CONFIG_MMC is not set
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_PHY_ATHEROS=y
-CONFIG_PHY_BROADCOM=y
-CONFIG_PHY_DAVICOM=y
-CONFIG_PHY_LXT=y
-CONFIG_PHY_MARVELL=y
-CONFIG_PHY_NATSEMI=y
-CONFIG_PHY_REALTEK=y
-CONFIG_PHY_SMSC=y
-CONFIG_PHY_VITESSE=y
-CONFIG_TSEC_ENET=y
-CONFIG_SYS_NS16550=y
-CONFIG_OF_LIBFDT=y
configs/sbc8349_PCI_66_defconfig deleted +0 -123
deleted file mode 100644
index 4774cd9836fe..000000000000
@@ -1,123 +0,0 @@
-CONFIG_PPC=y
-CONFIG_SYS_TEXT_BASE=0xFF800000
-CONFIG_ENV_SIZE=0x2000
-CONFIG_ENV_SECT_SIZE=0x20000
-CONFIG_SYS_CLK_FREQ=66000000
-CONFIG_MPC83xx=y
-CONFIG_HIGH_BATS=y
-CONFIG_TARGET_SBC8349=y
-CONFIG_DDR_MC_CLOCK_MODE_1_1=y
-CONFIG_SYSTEM_PLL_FACTOR_4_1=y
-CONFIG_CORE_PLL_RATIO_2_1=y
-CONFIG_PCI_HOST_MODE_ENABLE=y
-CONFIG_PCI_64BIT_MODE_ENABLE=y
-CONFIG_PCI_INT_ARBITER1_ENABLE=y
-CONFIG_BOOT_MEMORY_SPACE_LOW=y
-CONFIG_BOOT_ROM_INTERFACE_GPCM_16BIT=y
-CONFIG_TSEC1_MODE_GMII=y
-CONFIG_TSEC2_MODE_GMII=y
-CONFIG_BAT0=y
-CONFIG_BAT0_NAME="SDRAM"
-CONFIG_BAT0_BASE=0x00000000
-CONFIG_BAT0_LENGTH_256_MBYTES=y
-CONFIG_BAT0_ACCESS_RW=y
-CONFIG_BAT0_ICACHE_MEMORYCOHERENCE=y
-CONFIG_BAT0_DCACHE_MEMORYCOHERENCE=y
-CONFIG_BAT0_USER_MODE_VALID=y
-CONFIG_BAT0_SUPERVISOR_MODE_VALID=y
-CONFIG_BAT1=y
-CONFIG_BAT1_NAME="PCI1_MEM"
-CONFIG_BAT1_BASE=0x80000000
-CONFIG_BAT1_LENGTH_256_MBYTES=y
-CONFIG_BAT1_ACCESS_RW=y
-CONFIG_BAT1_ICACHE_MEMORYCOHERENCE=y
-CONFIG_BAT1_DCACHE_MEMORYCOHERENCE=y
-CONFIG_BAT1_USER_MODE_VALID=y
-CONFIG_BAT1_SUPERVISOR_MODE_VALID=y
-CONFIG_BAT2=y
-CONFIG_BAT2_NAME="PCI1_MMIO"
-CONFIG_BAT2_BASE=0x90000000
-CONFIG_BAT2_LENGTH_256_MBYTES=y
-CONFIG_BAT2_ACCESS_RW=y
-CONFIG_BAT2_ICACHE_INHIBITED=y
-CONFIG_BAT2_ICACHE_GUARDED=y
-CONFIG_BAT2_DCACHE_INHIBITED=y
-CONFIG_BAT2_DCACHE_GUARDED=y
-CONFIG_BAT2_USER_MODE_VALID=y
-CONFIG_BAT2_SUPERVISOR_MODE_VALID=y
-CONFIG_BAT5=y
-CONFIG_BAT5_NAME="IMMR_PCIIO"
-CONFIG_BAT5_BASE=0xE0000000
-CONFIG_BAT5_LENGTH_256_MBYTES=y
-CONFIG_BAT5_ACCESS_RW=y
-CONFIG_BAT5_ICACHE_INHIBITED=y
-CONFIG_BAT5_ICACHE_GUARDED=y
-CONFIG_BAT5_DCACHE_INHIBITED=y
-CONFIG_BAT5_DCACHE_GUARDED=y
-CONFIG_BAT5_USER_MODE_VALID=y
-CONFIG_BAT5_SUPERVISOR_MODE_VALID=y
-CONFIG_BAT6=y
-CONFIG_BAT6_NAME="LBC_INITRAM_FLASH"
-CONFIG_BAT6_BASE=0xF0000000
-CONFIG_BAT6_LENGTH_256_MBYTES=y
-CONFIG_BAT6_ACCESS_RW=y
-CONFIG_BAT6_ICACHE_MEMORYCOHERENCE=y
-CONFIG_BAT6_ICACHE_GUARDED=y
-CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y
-CONFIG_BAT6_DCACHE_GUARDED=y
-CONFIG_BAT6_USER_MODE_VALID=y
-CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
-CONFIG_LBLAW0=y
-CONFIG_LBLAW0_BASE=0xFF800000
-CONFIG_LBLAW0_NAME="FLASH"
-CONFIG_LBLAW0_LENGTH_8_MBYTES=y
-CONFIG_ELBC_BR0_OR0=y
-CONFIG_BR0_OR0_NAME="FLASH"
-CONFIG_BR0_OR0_BASE=0xFF800000
-CONFIG_BR0_PORTSIZE_16BIT=y
-CONFIG_OR0_AM_8_MBYTES=y
-CONFIG_OR0_XAM_SET=y
-CONFIG_OR0_SCY_15=y
-CONFIG_OR0_CSNT_EARLIER=y
-CONFIG_OR0_ACS_HALF_CYCLE_EARLIER=y
-CONFIG_OR0_XACS_EXTENDED=y
-CONFIG_OR0_TRLX_RELAXED=y
-CONFIG_OR0_EHTR_8_CYCLE=y
-CONFIG_OR0_EAD_EXTRA=y
-CONFIG_HID0_FINAL_EMCP=y
-CONFIG_HID0_FINAL_ICE=y
-CONFIG_HID2_HBE=y
-CONFIG_LCRR_DBYP_PLL_BYPASSED=y
-CONFIG_LCRR_CLKDIV_4=y
-CONFIG_PCI_64BIT=y
-CONFIG_OF_BOARD_SETUP=y
-CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SYS_EXTRA_OPTIONS="PCI_66M"
-CONFIG_BOOTDELAY=6
-CONFIG_HUSH_PARSER=y
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_PCI=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_ENV_OVERWRITE=y
-CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_ADDR=0xFF840000
-CONFIG_ENV_ADDR_REDUND=0xFF860000
-# CONFIG_MMC is not set
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_PHY_ATHEROS=y
-CONFIG_PHY_BROADCOM=y
-CONFIG_PHY_DAVICOM=y
-CONFIG_PHY_LXT=y
-CONFIG_PHY_MARVELL=y
-CONFIG_PHY_NATSEMI=y
-CONFIG_PHY_REALTEK=y
-CONFIG_PHY_SMSC=y
-CONFIG_PHY_VITESSE=y
-CONFIG_TSEC_ENET=y
-CONFIG_SYS_NS16550=y
-CONFIG_OF_LIBFDT=y
configs/sbc8349_defconfig deleted +0 -101
deleted file mode 100644
index b69e66b61e1b..000000000000
@@ -1,101 +0,0 @@
-CONFIG_PPC=y
-CONFIG_SYS_TEXT_BASE=0xFF800000
-CONFIG_ENV_SIZE=0x2000
-CONFIG_ENV_SECT_SIZE=0x20000
-CONFIG_SYS_CLK_FREQ=66000000
-CONFIG_MPC83xx=y
-CONFIG_HIGH_BATS=y
-CONFIG_TARGET_SBC8349=y
-CONFIG_DDR_MC_CLOCK_MODE_1_1=y
-CONFIG_SYSTEM_PLL_FACTOR_4_1=y
-CONFIG_CORE_PLL_RATIO_2_1=y
-CONFIG_PCI_HOST_MODE_ENABLE=y
-CONFIG_PCI_INT_ARBITER1_ENABLE=y
-CONFIG_PCI_INT_ARBITER2_ENABLE=y
-CONFIG_BOOT_MEMORY_SPACE_LOW=y
-CONFIG_BOOT_ROM_INTERFACE_GPCM_16BIT=y
-CONFIG_TSEC1_MODE_GMII=y
-CONFIG_TSEC2_MODE_GMII=y
-CONFIG_BAT0=y
-CONFIG_BAT0_NAME="SDRAM"
-CONFIG_BAT0_BASE=0x00000000
-CONFIG_BAT0_LENGTH_256_MBYTES=y
-CONFIG_BAT0_ACCESS_RW=y
-CONFIG_BAT0_ICACHE_MEMORYCOHERENCE=y
-CONFIG_BAT0_DCACHE_MEMORYCOHERENCE=y
-CONFIG_BAT0_USER_MODE_VALID=y
-CONFIG_BAT0_SUPERVISOR_MODE_VALID=y
-CONFIG_BAT5=y
-CONFIG_BAT5_NAME="IMMR_PCIIO"
-CONFIG_BAT5_BASE=0xE0000000
-CONFIG_BAT5_LENGTH_256_MBYTES=y
-CONFIG_BAT5_ACCESS_RW=y
-CONFIG_BAT5_ICACHE_INHIBITED=y
-CONFIG_BAT5_ICACHE_GUARDED=y
-CONFIG_BAT5_DCACHE_INHIBITED=y
-CONFIG_BAT5_DCACHE_GUARDED=y
-CONFIG_BAT5_USER_MODE_VALID=y
-CONFIG_BAT5_SUPERVISOR_MODE_VALID=y
-CONFIG_BAT6=y
-CONFIG_BAT6_NAME="LBC_INITRAM_FLASH"
-CONFIG_BAT6_BASE=0xF0000000
-CONFIG_BAT6_LENGTH_256_MBYTES=y
-CONFIG_BAT6_ACCESS_RW=y
-CONFIG_BAT6_ICACHE_MEMORYCOHERENCE=y
-CONFIG_BAT6_ICACHE_GUARDED=y
-CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y
-CONFIG_BAT6_DCACHE_GUARDED=y
-CONFIG_BAT6_USER_MODE_VALID=y
-CONFIG_BAT6_SUPERVISOR_MODE_VALID=y
-CONFIG_LBLAW0=y
-CONFIG_LBLAW0_BASE=0xFF800000
-CONFIG_LBLAW0_NAME="FLASH"
-CONFIG_LBLAW0_LENGTH_8_MBYTES=y
-CONFIG_ELBC_BR0_OR0=y
-CONFIG_BR0_OR0_NAME="FLASH"
-CONFIG_BR0_OR0_BASE=0xFF800000
-CONFIG_BR0_PORTSIZE_16BIT=y
-CONFIG_OR0_AM_8_MBYTES=y
-CONFIG_OR0_XAM_SET=y
-CONFIG_OR0_SCY_15=y
-CONFIG_OR0_CSNT_EARLIER=y
-CONFIG_OR0_ACS_HALF_CYCLE_EARLIER=y
-CONFIG_OR0_XACS_EXTENDED=y
-CONFIG_OR0_TRLX_RELAXED=y
-CONFIG_OR0_EHTR_8_CYCLE=y
-CONFIG_OR0_EAD_EXTRA=y
-CONFIG_HID0_FINAL_EMCP=y
-CONFIG_HID0_FINAL_ICE=y
-CONFIG_HID2_HBE=y
-CONFIG_LCRR_DBYP_PLL_BYPASSED=y
-CONFIG_LCRR_CLKDIV_4=y
-CONFIG_OF_BOARD_SETUP=y
-CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_BOOTDELAY=6
-CONFIG_HUSH_PARSER=y
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_ENV_OVERWRITE=y
-CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_ADDR=0xFF840000
-CONFIG_ENV_ADDR_REDUND=0xFF860000
-# CONFIG_MMC is not set
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_PHY_ATHEROS=y
-CONFIG_PHY_BROADCOM=y
-CONFIG_PHY_DAVICOM=y
-CONFIG_PHY_LXT=y
-CONFIG_PHY_MARVELL=y
-CONFIG_PHY_NATSEMI=y
-CONFIG_PHY_REALTEK=y
-CONFIG_PHY_SMSC=y
-CONFIG_PHY_VITESSE=y
-CONFIG_TSEC_ENET=y
-# CONFIG_PCI is not set
-CONFIG_SYS_NS16550=y
-CONFIG_OF_LIBFDT=y
include/configs/sbc8349.h deleted +0 -322
deleted file mode 100644
index 929579efe133..000000000000
@@ -1,322 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * WindRiver SBC8349 U-Boot configuration file.
- * Copyright (c) 2006, 2007 Wind River Systems, Inc.
- *
- * Paul Gortmaker <[email protected]>
- * Based on the MPC8349EMDS config.
- */
-
-/*
- * sbc8349 board configuration file.
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-/*
- * High Level Configuration Options
- */
-#define CONFIG_E300		1	/* E300 Family */
-
-/* Don't enable PCI2 on sbc834x - it doesn't exist physically. */
-#undef CONFIG_MPC83XX_PCI2		/* support for 2nd PCI controller */
-
-#undef CONFIG_SYS_DRAM_TEST		/* memory test, takes time */
-
-/*
- * DDR Setup
- */
-#undef CONFIG_DDR_ECC			/* only for ECC DDR module */
-#undef CONFIG_DDR_ECC_CMD		/* use DDR ECC user commands */
-#define CONFIG_SPD_EEPROM		/* use SPD EEPROM for DDR setup*/
-#define CONFIG_SYS_83XX_DDR_USES_CS0	/* WRS; Fsl board uses CS2/CS3 */
-
-/*
- * 32-bit data path mode.
- *
- * Please note that using this mode for devices with the real density of 64-bit
- * effectively reduces the amount of available memory due to the effect of
- * wrapping around while translating address to row/columns, for example in the
- * 256MB module the upper 128MB get aliased with contents of the lower
- * 128MB); normally this define should be used for devices with real 32-bit
- * data path.
- */
-#undef CONFIG_DDR_32BIT
-
-#define CONFIG_SYS_SDRAM_BASE		0x00000000 /* DDR is system memory*/
-#define CONFIG_SYS_DDR_SDRAM_CLK_CNTL	(DDR_SDRAM_CLK_CNTL_SS_EN | \
-				DDR_SDRAM_CLK_CNTL_CLK_ADJUST_075)
-#define CONFIG_DDR_2T_TIMING
-
-#if defined(CONFIG_SPD_EEPROM)
-/*
- * Determine DDR configuration from I2C interface.
- */
-#define SPD_EEPROM_ADDRESS	0x52		/* DDR DIMM */
-
-#else
-/*
- * Manually set up DDR parameters
- * NB: manual DDR setup untested on sbc834x
- */
-#define CONFIG_SYS_DDR_SIZE		256		/* MB */
-#define CONFIG_SYS_DDR_CS2_CONFIG	(CSCONFIG_EN \
-					| CSCONFIG_ROW_BIT_13 \
-					| CSCONFIG_COL_BIT_10)
-#define CONFIG_SYS_DDR_TIMING_1	0x36332321
-#define CONFIG_SYS_DDR_TIMING_2	0x00000800	/* P9-45,may need tuning */
-#define CONFIG_SYS_DDR_CONTROL	0xc2000000	/* unbuffered,no DYN_PWR */
-#define CONFIG_SYS_DDR_INTERVAL	0x04060100	/* autocharge,no open page */
-
-#if defined(CONFIG_DDR_32BIT)
-/* set burst length to 8 for 32-bit data path */
-				/* DLL,normal,seq,4/2.5, 8 burst len */
-#define CONFIG_SYS_DDR_MODE	0x00000023
-#else
-/* the default burst length is 4 - for 64-bit data path */
-				/* DLL,normal,seq,4/2.5, 4 burst len */
-#define CONFIG_SYS_DDR_MODE	0x00000022
-#endif
-#endif
-
-/*
- * SDRAM on the Local Bus
- */
-#define CONFIG_SYS_LBC_SDRAM_BASE	0xF0000000	/* Localbus SDRAM */
-#define CONFIG_SYS_LBC_SDRAM_SIZE	64		/* LBC SDRAM is 64MB */
-
-/*
- * FLASH on the Local Bus
- */
-#define CONFIG_SYS_FLASH_BASE		0xFF800000	/* start of FLASH   */
-#define CONFIG_SYS_FLASH_SIZE		8		/* flash size in MB */
-
-
-#define CONFIG_SYS_MAX_FLASH_BANKS	1	/* number of banks */
-#define CONFIG_SYS_MAX_FLASH_SECT	64	/* sectors per device */
-
-#undef CONFIG_SYS_FLASH_CHECKSUM
-#define CONFIG_SYS_FLASH_ERASE_TOUT	60000	/* Flash Erase Timeout (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT	500	/* Flash Write Timeout (ms) */
-
-#define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_TEXT_BASE	/* start of monitor */
-
-#if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
-#define CONFIG_SYS_RAMBOOT
-#else
-#undef  CONFIG_SYS_RAMBOOT
-#endif
-
-#define CONFIG_SYS_INIT_RAM_LOCK	1
-					/* Initial RAM address */
-#define CONFIG_SYS_INIT_RAM_ADDR	0xFD000000
-					/* Size of used area in RAM*/
-#define CONFIG_SYS_INIT_RAM_SIZE	0x1000
-
-#define CONFIG_SYS_GBL_DATA_OFFSET	\
-			(CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_GBL_DATA_OFFSET
-
-#define CONFIG_SYS_MONITOR_LEN	(256 * 1024)	/* Reserve 256 kB for Mon */
-#define CONFIG_SYS_MALLOC_LEN	(256 * 1024)	/* Reserved for malloc */
-
-#undef CONFIG_SYS_LB_SDRAM	/* if board has SDRAM on local bus */
-
-/*
- * Serial Port
- */
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE    1
-#define CONFIG_SYS_NS16550_CLK		get_bus_freq(0)
-
-#define CONFIG_SYS_BAUDRATE_TABLE  \
-		{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200}
-
-#define CONFIG_SYS_NS16550_COM1        (CONFIG_SYS_IMMR+0x4500)
-#define CONFIG_SYS_NS16550_COM2        (CONFIG_SYS_IMMR+0x4600)
-
-/* I2C */
-#define CONFIG_SYS_I2C
-#define CONFIG_SYS_I2C_FSL
-#define CONFIG_SYS_FSL_I2C_SPEED	400000
-#define CONFIG_SYS_FSL_I2C_SLAVE	0x7F
-#define CONFIG_SYS_FSL_I2C_OFFSET	0x3000
-#define CONFIG_SYS_FSL_I2C2_SPEED	400000
-#define CONFIG_SYS_FSL_I2C2_SLAVE	0x7F
-#define CONFIG_SYS_FSL_I2C2_OFFSET	0x3100
-#define CONFIG_SYS_I2C_NOPROBES		{ {0, 0x69}, {1, 0x69} }
-/* could also use CONFIG_I2C_MULTI_BUS and CONFIG_SYS_SPD_BUS_NUM... */
-
-/* TSEC */
-#define CONFIG_SYS_TSEC1_OFFSET 0x24000
-#define CONFIG_SYS_TSEC1	(CONFIG_SYS_IMMR+CONFIG_SYS_TSEC1_OFFSET)
-#define CONFIG_SYS_TSEC2_OFFSET 0x25000
-#define CONFIG_SYS_TSEC2	(CONFIG_SYS_IMMR+CONFIG_SYS_TSEC2_OFFSET)
-
-/*
- * General PCI
- * Addresses are mapped 1-1.
- */
-#define CONFIG_SYS_PCI1_MEM_BASE	0x80000000
-#define CONFIG_SYS_PCI1_MEM_PHYS	CONFIG_SYS_PCI1_MEM_BASE
-#define CONFIG_SYS_PCI1_MEM_SIZE	0x10000000	/* 256M */
-#define CONFIG_SYS_PCI1_MMIO_BASE	0x90000000
-#define CONFIG_SYS_PCI1_MMIO_PHYS	CONFIG_SYS_PCI1_MMIO_BASE
-#define CONFIG_SYS_PCI1_MMIO_SIZE	0x10000000	/* 256M */
-#define CONFIG_SYS_PCI1_IO_BASE		0x00000000
-#define CONFIG_SYS_PCI1_IO_PHYS		0xE2000000
-#define CONFIG_SYS_PCI1_IO_SIZE		0x00100000	/* 1M */
-
-#define CONFIG_SYS_PCI2_MEM_BASE	0xA0000000
-#define CONFIG_SYS_PCI2_MEM_PHYS	CONFIG_SYS_PCI2_MEM_BASE
-#define CONFIG_SYS_PCI2_MEM_SIZE	0x10000000	/* 256M */
-#define CONFIG_SYS_PCI2_MMIO_BASE	0xB0000000
-#define CONFIG_SYS_PCI2_MMIO_PHYS	CONFIG_SYS_PCI2_MMIO_BASE
-#define CONFIG_SYS_PCI2_MMIO_SIZE	0x10000000	/* 256M */
-#define CONFIG_SYS_PCI2_IO_BASE		0x00000000
-#define CONFIG_SYS_PCI2_IO_PHYS		0xE2100000
-#define CONFIG_SYS_PCI2_IO_SIZE		0x00100000	/* 1M */
-
-#if defined(CONFIG_PCI)
-
-
-#if !defined(CONFIG_PCI_PNP)
-	#define PCI_ENET0_IOADDR	0xFIXME
-	#define PCI_ENET0_MEMADDR	0xFIXME
-	#define PCI_IDSEL_NUMBER	0xFIXME
-#endif
-
-#undef CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
-#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1057  /* Motorola */
-
-#endif	/* CONFIG_PCI */
-
-/*
- * TSEC configuration
- */
-
-#if defined(CONFIG_TSEC_ENET)
-
-#define CONFIG_TSEC1	1
-#define CONFIG_TSEC1_NAME	"TSEC0"
-#define CONFIG_TSEC2	1
-#define CONFIG_TSEC2_NAME	"TSEC1"
-#define CONFIG_PHY_BCM5421S	1
-#define TSEC1_PHY_ADDR		0x19
-#define TSEC2_PHY_ADDR		0x1a
-#define TSEC1_PHYIDX		0
-#define TSEC2_PHYIDX		0
-#define TSEC1_FLAGS		TSEC_GIGABIT
-#define TSEC2_FLAGS		TSEC_GIGABIT
-
-/* Options are: TSEC[0-1] */
-#define CONFIG_ETHPRIME		"TSEC0"
-
-#endif	/* CONFIG_TSEC_ENET */
-
-/*
- * Environment
- */
-#ifndef CONFIG_SYS_RAMBOOT
-/* Address and size of Redundant Environment Sector	*/
-#endif
-
-#define CONFIG_LOADS_ECHO	1	/* echo on for serial download */
-#define CONFIG_SYS_LOADS_BAUD_CHANGE	1	/* allow baudrate change */
-
-/*
- * BOOTP options
- */
-#define CONFIG_BOOTP_BOOTFILESIZE
-
-#undef CONFIG_WATCHDOG			/* watchdog disabled */
-
-/*
- * Miscellaneous configurable options
- */
-#define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-
-/*
- * For booting Linux, the board info and command line data
- * have to be in the first 256 MB of memory, since this is
- * the maximum mapped by the Linux kernel during initialization.
- */
-				/* Initial Memory map for Linux*/
-#define CONFIG_SYS_BOOTMAPSZ	(256 << 20)
-
-#define CONFIG_SYS_RCWH_PCIHOST 0x80000000 /* PCIHOST  */
-
-/* System IO Config */
-#define CONFIG_SYS_SICRH 0
-#define CONFIG_SYS_SICRL SICRL_LDP_A
-
-#ifdef CONFIG_PCI
-#define CONFIG_PCI_INDIRECT_BRIDGE
-#endif
-
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_KGDB_BAUDRATE	230400	/* speed of kgdb serial port */
-#endif
-
-/*
- * Environment Configuration
- */
-
-#if defined(CONFIG_TSEC_ENET)
-#define CONFIG_HAS_ETH0
-#define CONFIG_HAS_ETH1
-#endif
-
-#define CONFIG_HOSTNAME		"SBC8349"
-#define CONFIG_ROOTPATH		"/tftpboot/rootfs"
-#define CONFIG_BOOTFILE		"uImage"
-
-				/* default location for tftp and bootm */
-#define CONFIG_LOADADDR		800000
-
-#define	CONFIG_EXTRA_ENV_SETTINGS					\
-	"netdev=eth0\0"							\
-	"hostname=sbc8349\0"						\
-	"nfsargs=setenv bootargs root=/dev/nfs rw "			\
-		"nfsroot=${serverip}:${rootpath}\0"			\
-	"ramargs=setenv bootargs root=/dev/ram rw\0"			\
-	"addip=setenv bootargs ${bootargs} "				\
-		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"	\
-		":${hostname}:${netdev}:off panic=1\0"			\
-	"addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0"\
-	"flash_nfs=run nfsargs addip addtty;"				\
-		"bootm ${kernel_addr}\0"				\
-	"flash_self=run ramargs addip addtty;"				\
-		"bootm ${kernel_addr} ${ramdisk_addr}\0"		\
-	"net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;"	\
-		"bootm\0"						\
-	"load=tftp 100000 /tftpboot/sbc8349/u-boot.bin\0"		\
-	"update=protect off ff800000 ff83ffff; "			\
-		"era ff800000 ff83ffff; cp.b 100000 ff800000 ${filesize}\0" \
-	"upd=run load update\0"						\
-	"fdtaddr=780000\0"						\
-	"fdtfile=sbc8349.dtb\0"						\
-	""
-
-#define CONFIG_NFSBOOTCOMMAND						\
-	"setenv bootargs root=/dev/nfs rw "				\
-		"nfsroot=$serverip:$rootpath "				\
-		"ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:"	\
-							"$netdev:off "	\
-		"console=$consoledev,$baudrate $othbootargs;"		\
-	"tftp $loadaddr $bootfile;"					\
-	"tftp $fdtaddr $fdtfile;"					\
-	"bootm $loadaddr - $fdtaddr"
-
-#define CONFIG_RAMBOOTCOMMAND						\
-	"setenv bootargs root=/dev/ram rw "				\
-		"console=$consoledev,$baudrate $othbootargs;"		\
-	"tftp $ramdiskaddr $ramdiskfile;"				\
-	"tftp $loadaddr $bootfile;"					\
-	"tftp $fdtaddr $fdtfile;"					\
-	"bootm $loadaddr $ramdiskaddr $fdtaddr"
-
-#define CONFIG_BOOTCOMMAND	"run flash_self"
-
-#endif	/* __CONFIG_H */
Signature · 1 line
2.17.1
author
#16 lore raw

PATCH 8/27 ppc: Remove many T104x boards

In reply to Tom Rini

These boards have not been converted to CONFIG_DM_PCI, CONFIG_DM_USB or in some cases CONFIG_DM itself by the deadline. Remove them.

Cc Priyanka Jain <[email protected]>
Cc Ruchika Gupta <[email protected]>
---
 arch/powerpc/cpu/mpc85xx/Kconfig           | 16 -----
 arch/powerpc/include/asm/fsl_secure_boot.h |  2 -
 configs/T1040D4RDB_NAND_defconfig          | 78 ---------------------
 configs/T1040D4RDB_SDCARD_defconfig        | 75 --------------------
 configs/T1040D4RDB_SPIFLASH_defconfig      | 77 ---------------------
 configs/T1040D4RDB_defconfig               | 62 -----------------
 configs/T1040RDB_NAND_defconfig            | 79 ----------------------
 configs/T1040RDB_SDCARD_defconfig          | 76 ---------------------
 configs/T1040RDB_SPIFLASH_defconfig        | 78 ---------------------
 configs/T1040RDB_defconfig                 | 63 -----------------
 configs/T1042D4RDB_SECURE_BOOT_defconfig   | 66 ------------------
 configs/T1042RDB_PI_NAND_defconfig         | 79 ----------------------
 configs/T1042RDB_PI_SDCARD_defconfig       | 76 ---------------------
 configs/T1042RDB_PI_SPIFLASH_defconfig     | 78 ---------------------
 configs/T1042RDB_PI_defconfig              | 63 -----------------
 configs/T1042RDB_defconfig                 | 62 -----------------
 16 files changed, 1030 deletions(-)
 delete mode 100644 configs/T1040D4RDB_NAND_defconfig
 delete mode 100644 configs/T1040D4RDB_SDCARD_defconfig
 delete mode 100644 configs/T1040D4RDB_SPIFLASH_defconfig
 delete mode 100644 configs/T1040D4RDB_defconfig
 delete mode 100644 configs/T1040RDB_NAND_defconfig
 delete mode 100644 configs/T1040RDB_SDCARD_defconfig
 delete mode 100644 configs/T1040RDB_SPIFLASH_defconfig
 delete mode 100644 configs/T1040RDB_defconfig
 delete mode 100644 configs/T1042D4RDB_SECURE_BOOT_defconfig
 delete mode 100644 configs/T1042RDB_PI_NAND_defconfig
 delete mode 100644 configs/T1042RDB_PI_SDCARD_defconfig
 delete mode 100644 configs/T1042RDB_PI_SPIFLASH_defconfig
 delete mode 100644 configs/T1042RDB_PI_defconfig
 delete mode 100644 configs/T1042RDB_defconfig
arch/powerpc/cpu/mpc85xx/Kconfig +0 -16
index 206ee76a50b8..676aaf1d2ca6 100644
@@ -147,22 +147,6 @@ config TARGET_T1024RDB
 	imply CMD_EEPROM
 	imply PANIC_HANG
 
-config TARGET_T1040RDB
-	bool "Support T1040RDB"
-	select ARCH_T1040
-	select BOARD_LATE_INIT if CHAIN_OF_TRUST
-	select SUPPORT_SPL
-	select PHYS_64BIT
-	imply PANIC_HANG
-
-config TARGET_T1040D4RDB
-	bool "Support T1040D4RDB"
-	select ARCH_T1040
-	select BOARD_LATE_INIT if CHAIN_OF_TRUST
-	select SUPPORT_SPL
-	select PHYS_64BIT
-	imply PANIC_HANG
-
 config TARGET_T1042RDB
 	bool "Support T1042RDB"
 	select ARCH_T1042
arch/powerpc/include/asm/fsl_secure_boot.h +0 -2
index 6499e10ef4fb..53bfb8f64af7 100644
@@ -25,8 +25,6 @@
 	defined(CONFIG_TARGET_T4240QDS) || \
 	defined(CONFIG_TARGET_T2080QDS) || \
 	defined(CONFIG_TARGET_T2080RDB) || \
-	defined(CONFIG_TARGET_T1040RDB) || \
-	defined(CONFIG_TARGET_T1040D4RDB) || \
 	defined(CONFIG_TARGET_T1042RDB) || \
 	defined(CONFIG_TARGET_T1042D4RDB) || \
 	defined(CONFIG_TARGET_T1042RDB_PI) || \
configs/T1040D4RDB_NAND_defconfig deleted +0 -78

78 lines not on this page · raw message

configs/T1040D4RDB_SDCARD_defconfig deleted +0 -75

75 lines not on this page · raw message

configs/T1040D4RDB_SPIFLASH_defconfig deleted +0 -77

77 lines not on this page · raw message

configs/T1040D4RDB_defconfig deleted +0 -62

62 lines not on this page · raw message

configs/T1040RDB_NAND_defconfig deleted +0 -79

79 lines not on this page · raw message

configs/T1040RDB_SDCARD_defconfig deleted +0 -76

76 lines not on this page · raw message

configs/T1040RDB_SPIFLASH_defconfig deleted +0 -78

78 lines not on this page · raw message

configs/T1040RDB_defconfig deleted +0 -63

63 lines not on this page · raw message

configs/T1042D4RDB_SECURE_BOOT_defconfig deleted +0 -66

66 lines not on this page · raw message

configs/T1042RDB_PI_NAND_defconfig deleted +0 -79

79 lines not on this page · raw message

configs/T1042RDB_PI_SDCARD_defconfig deleted +0 -76

76 lines not on this page · raw message

configs/T1042RDB_PI_SPIFLASH_defconfig deleted +0 -78

78 lines not on this page · raw message

configs/T1042RDB_PI_defconfig deleted +0 -63

63 lines not on this page · raw message

configs/T1042RDB_defconfig deleted +0 -62

62 lines not on this page · raw message

Signature · 1 line
2.17.1
author
#17 lore raw

Re: [PATCH 08/27] ppc: Remove many T104x boards

Quoted 6 lines · Tom Rini

These boards have not been converted to CONFIG_DM_PCI, CONFIG_DM_USB or in some cases CONFIG_DM itself by the deadline. Remove them.

Cc Priyanka Jain <[email protected]>
Cc Ruchika Gupta <[email protected]>

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
author
#18 lore raw

PATCH 9/27 ppc: Remove mpc8308_p1m board

In reply to Tom Rini

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

---
 arch/powerpc/cpu/mpc83xx/Kconfig |   5 -
 board/mpc8308_p1m/Kconfig        |   9 -
 board/mpc8308_p1m/MAINTAINERS    |   6 -
 board/mpc8308_p1m/Makefile       |   8 -
 board/mpc8308_p1m/mpc8308_p1m.c  |  92 ---------
 board/mpc8308_p1m/sdram.c        |  80 --------
 configs/mpc8308_p1m_defconfig    | 133 -------------
 include/configs/mpc8308_p1m.h    | 307 -------------------------------
 8 files changed, 640 deletions(-)
 delete mode 100644 board/mpc8308_p1m/Kconfig
 delete mode 100644 board/mpc8308_p1m/MAINTAINERS
 delete mode 100644 board/mpc8308_p1m/Makefile
 delete mode 100644 board/mpc8308_p1m/mpc8308_p1m.c
 delete mode 100644 board/mpc8308_p1m/sdram.c
 delete mode 100644 configs/mpc8308_p1m_defconfig
 delete mode 100644 include/configs/mpc8308_p1m.h
arch/powerpc/cpu/mpc83xx/Kconfig +0 -5
index e0bdfc4b9716..23f7a60a44c0 100644
@@ -8,10 +8,6 @@ choice
 	prompt "Target select"
 	optional
 
-config TARGET_MPC8308_P1M
-	bool "Support mpc8308_p1m"
-	select ARCH_MPC8308
-
 config TARGET_VE8313
 	bool "Support ve8313"
 	select ARCH_MPC8313
@@ -307,7 +303,6 @@ 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/tqc/tqm834x/Kconfig"
 source "board/ve8313/Kconfig"
 source "board/gdsys/mpc8308/Kconfig"
board/mpc8308_p1m/Kconfig deleted +0 -9
deleted file mode 100644
index b7e39dafbc62..000000000000
@@ -1,9 +0,0 @@
-if TARGET_MPC8308_P1M
-
-config SYS_BOARD
-	default "mpc8308_p1m"
-
-config SYS_CONFIG_NAME
-	default "mpc8308_p1m"
-
-endif
board/mpc8308_p1m/MAINTAINERS deleted +0 -6
deleted file mode 100644
index 80d8de7711f2..000000000000
@@ -1,6 +0,0 @@
-MPC8308_P1M BOARD
-M:	Ilya Yanok <[email protected]>
-S:	Maintained
-F:	board/mpc8308_p1m/
-F:	include/configs/mpc8308_p1m.h
-F:	configs/mpc8308_p1m_defconfig
board/mpc8308_p1m/Makefile deleted +0 -8
deleted file mode 100644
index 4ec3b0cda92b..000000000000
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2006
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-# (C) Copyright 2010
-# Ilya Yanok, Emcraft Systems, yanok at emcraft.com
-
-obj-y	:= mpc8308_p1m.o sdram.o
board/mpc8308_p1m/mpc8308_p1m.c deleted +0 -92

92 lines not on this page · raw message

board/mpc8308_p1m/sdram.c deleted +0 -80

80 lines not on this page · raw message

configs/mpc8308_p1m_defconfig deleted +0 -133

133 lines not on this page · raw message

include/configs/mpc8308_p1m.h deleted +0 -307

307 lines not on this page · raw message

Signature · 1 line
2.17.1
author
#19 lore raw

Re: [PATCH 09/27] ppc: Remove mpc8308_p1m board

Quoted 5 lines · Tom Rini

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

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
author
#20 lore raw

PATCH 10/27 ppc: Remove ve8313 board

In reply to Tom Rini

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

Cc Heiko Schocher <[email protected]>
---
 arch/powerpc/cpu/mpc83xx/Kconfig |   5 -
 board/ve8313/Kconfig             |   9 --
 board/ve8313/MAINTAINERS         |   6 -
 board/ve8313/Makefile            |   6 -
 board/ve8313/ve8313.c            | 209 -------------------------
 configs/ve8313_defconfig         | 160 -------------------
 include/configs/ve8313.h         | 260 -------------------------------
 7 files changed, 655 deletions(-)
 delete mode 100644 board/ve8313/Kconfig
 delete mode 100644 board/ve8313/MAINTAINERS
 delete mode 100644 board/ve8313/Makefile
 delete mode 100644 board/ve8313/ve8313.c
 delete mode 100644 configs/ve8313_defconfig
 delete mode 100644 include/configs/ve8313.h
arch/powerpc/cpu/mpc83xx/Kconfig +0 -5
index 23f7a60a44c0..0d24574ecc4d 100644
@@ -8,10 +8,6 @@ choice
 	prompt "Target select"
 	optional
 
-config TARGET_VE8313
-	bool "Support ve8313"
-	select ARCH_MPC8313
-
 config TARGET_VME8349
 	bool "Support vme8349"
 	select ARCH_MPC8349
@@ -304,7 +300,6 @@ source "board/freescale/mpc837xerdb/Kconfig"
 source "board/ids/ids8313/Kconfig"
 source "board/keymile/Kconfig"
 source "board/tqc/tqm834x/Kconfig"
-source "board/ve8313/Kconfig"
 source "board/gdsys/mpc8308/Kconfig"
 
 endmenu
board/ve8313/Kconfig deleted +0 -9
deleted file mode 100644
index a63744b1546e..000000000000
@@ -1,9 +0,0 @@
-if TARGET_VE8313
-
-config SYS_BOARD
-	default "ve8313"
-
-config SYS_CONFIG_NAME
-	default "ve8313"
-
-endif
board/ve8313/MAINTAINERS deleted +0 -6
deleted file mode 100644
index e3ca3325fcea..000000000000
@@ -1,6 +0,0 @@
-VE8313 BOARD
-M:	Heiko Schocher <[email protected]>
-S:	Maintained
-F:	board/ve8313/
-F:	include/configs/ve8313.h
-F:	configs/ve8313_defconfig
board/ve8313/Makefile deleted +0 -6
deleted file mode 100644
index d656bd93ab1d..000000000000
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2006
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-
-obj-y	:= ve8313.o
board/ve8313/ve8313.c deleted +0 -209

209 lines not on this page · raw message

configs/ve8313_defconfig deleted +0 -160

160 lines not on this page · raw message

include/configs/ve8313.h deleted +0 -260

260 lines not on this page · raw message

Signature · 1 line
2.17.1
#21 lore raw

PATCH 10/27 ppc: Remove ve8313 board

Hello Tom,

Quoted 5 lines · Tom Rini

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

Cc Heiko Schocher <[email protected]>
Quoted 15 lines
---
 arch/powerpc/cpu/mpc83xx/Kconfig |   5 -
 board/ve8313/Kconfig             |   9 --
 board/ve8313/MAINTAINERS         |   6 -
 board/ve8313/Makefile            |   6 -
 board/ve8313/ve8313.c            | 209 -------------------------
 configs/ve8313_defconfig         | 160 -------------------
 include/configs/ve8313.h         | 260 -------------------------------
 7 files changed, 655 deletions(-)
 delete mode 100644 board/ve8313/Kconfig
 delete mode 100644 board/ve8313/MAINTAINERS
 delete mode 100644 board/ve8313/Makefile
 delete mode 100644 board/ve8313/ve8313.c
 delete mode 100644 configs/ve8313_defconfig
 delete mode 100644 include/configs/ve8313.h

Thanks!

bye,
Heiko

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: hs at denx.de
author
#23 lore raw

PATCH 11/27 ppc: Remove MPC8313ERDB boards

In reply to Tom Rini

These boards have not been converted to CONFIG_DM_PCI by the deadline. Remove them.

---
 arch/powerpc/cpu/mpc83xx/Kconfig          |  13 -
 board/freescale/mpc8313erdb/Kconfig       |  25 --
 board/freescale/mpc8313erdb/MAINTAINERS   |   9 -
 board/freescale/mpc8313erdb/Makefile      |   6 -
 board/freescale/mpc8313erdb/README        | 111 ------
 board/freescale/mpc8313erdb/mpc8313erdb.c | 160 ---------
 board/freescale/mpc8313erdb/sdram.c       | 129 -------
 configs/MPC8313ERDB_33_defconfig          | 169 ----------
 configs/MPC8313ERDB_66_defconfig          | 168 ----------
 configs/MPC8313ERDB_NAND_33_defconfig     | 178 ----------
 configs/MPC8313ERDB_NAND_66_defconfig     | 177 ----------
 include/configs/MPC8313ERDB_NAND.h        | 392 ----------------------
 include/configs/MPC8313ERDB_NOR.h         | 361 --------------------
 13 files changed, 1898 deletions(-)
 delete mode 100644 board/freescale/mpc8313erdb/Kconfig
 delete mode 100644 board/freescale/mpc8313erdb/MAINTAINERS
 delete mode 100644 board/freescale/mpc8313erdb/Makefile
 delete mode 100644 board/freescale/mpc8313erdb/README
 delete mode 100644 board/freescale/mpc8313erdb/mpc8313erdb.c
 delete mode 100644 board/freescale/mpc8313erdb/sdram.c
 delete mode 100644 configs/MPC8313ERDB_33_defconfig
 delete mode 100644 configs/MPC8313ERDB_66_defconfig
 delete mode 100644 configs/MPC8313ERDB_NAND_33_defconfig
 delete mode 100644 configs/MPC8313ERDB_NAND_66_defconfig
 delete mode 100644 include/configs/MPC8313ERDB_NAND.h
 delete mode 100644 include/configs/MPC8313ERDB_NOR.h
arch/powerpc/cpu/mpc83xx/Kconfig +0 -13
index 0d24574ecc4d..e4c6f5d40b26 100644
@@ -16,18 +16,6 @@ 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
@@ -291,7 +279,6 @@ 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"
board/freescale/mpc8313erdb/Kconfig deleted +0 -25
deleted file mode 100644
index b6332a1368bf..000000000000
@@ -1,25 +0,0 @@
-if TARGET_MPC8313ERDB_NOR
-
-config SYS_BOARD
-	default "mpc8313erdb"
-
-config SYS_VENDOR
-	default "freescale"
-
-config SYS_CONFIG_NAME
-	default "MPC8313ERDB_NOR"
-
-endif
-
-if TARGET_MPC8313ERDB_NAND
-
-config SYS_BOARD
-	default "mpc8313erdb"
-
-config SYS_VENDOR
-	default "freescale"
-
-config SYS_CONFIG_NAME
-	default "MPC8313ERDB_NAND"
-
-endif
board/freescale/mpc8313erdb/MAINTAINERS deleted +0 -9
deleted file mode 100644
index 807fb0b6e9eb..000000000000
@@ -1,9 +0,0 @@
-MPC8313ERDB BOARD
-#M:	-
-S:	Maintained
-F:	board/freescale/mpc8313erdb/
-F:	include/configs/MPC8313ERDB.h
-F:	configs/MPC8313ERDB_33_defconfig
-F:	configs/MPC8313ERDB_66_defconfig
-F:	configs/MPC8313ERDB_NAND_33_defconfig
-F:	configs/MPC8313ERDB_NAND_66_defconfig
board/freescale/mpc8313erdb/Makefile deleted +0 -6
deleted file mode 100644
index af600ccdbb5f..000000000000
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2006
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-
-obj-y	:= mpc8313erdb.o sdram.o
board/freescale/mpc8313erdb/README deleted +0 -111

111 lines not on this page · raw message

board/freescale/mpc8313erdb/mpc8313erdb.c deleted +0 -160

160 lines not on this page · raw message

board/freescale/mpc8313erdb/sdram.c deleted +0 -129

129 lines not on this page · raw message

configs/MPC8313ERDB_33_defconfig deleted +0 -169

169 lines not on this page · raw message

configs/MPC8313ERDB_66_defconfig deleted +0 -168

168 lines not on this page · raw message

configs/MPC8313ERDB_NAND_33_defconfig deleted +0 -178

178 lines not on this page · raw message

configs/MPC8313ERDB_NAND_66_defconfig deleted +0 -177

177 lines not on this page · raw message

include/configs/MPC8313ERDB_NAND.h deleted +0 -392

392 lines not on this page · raw message

include/configs/MPC8313ERDB_NOR.h deleted +0 -361

361 lines not on this page · raw message

Signature · 1 line
2.17.1
author
#24 lore raw

Re: [PATCH 11/27] ppc: Remove MPC8313ERDB boards

Quoted 4 lines · Tom Rini

These boards have not been converted to CONFIG_DM_PCI by the deadline. Remove them.

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
author
#25 lore raw

PATCH 12/27 ppc: Remove caddy2 / vme8349 boards

In reply to Tom Rini

These boards have not been converted to CONFIG_DM_PCI by the deadline and is also missing conversion to CONFIG_DM. Remove them.

Cc Reinhard Arlt <[email protected]>
---
 arch/powerpc/cpu/mpc83xx/Kconfig |   9 -
 board/esd/vme8349/Kconfig        |  25 ---
 board/esd/vme8349/MAINTAINERS    |   7 -
 board/esd/vme8349/Makefile       |   9 -
 board/esd/vme8349/caddy.c        | 178 -----------------
 board/esd/vme8349/caddy.h        |  59 ------
 board/esd/vme8349/pci.c          | 118 ------------
 board/esd/vme8349/vme8349.c      | 213 ---------------------
 board/esd/vme8349/vme8349pin.h   |  18 --
 configs/caddy2_defconfig         | 123 ------------
 configs/vme8349_defconfig        | 134 -------------
 drivers/pci/pci_auto.c           |   3 +-
 include/configs/caddy2.h         | 315 -------------------------------
 include/configs/vme8349.h        | 315 -------------------------------
 14 files changed, 1 insertion(+), 1525 deletions(-)
 delete mode 100644 board/esd/vme8349/Kconfig
 delete mode 100644 board/esd/vme8349/MAINTAINERS
 delete mode 100644 board/esd/vme8349/Makefile
 delete mode 100644 board/esd/vme8349/caddy.c
 delete mode 100644 board/esd/vme8349/caddy.h
 delete mode 100644 board/esd/vme8349/pci.c
 delete mode 100644 board/esd/vme8349/vme8349.c
 delete mode 100644 board/esd/vme8349/vme8349pin.h
 delete mode 100644 configs/caddy2_defconfig
 delete mode 100644 configs/vme8349_defconfig
 delete mode 100644 include/configs/caddy2.h
 delete mode 100644 include/configs/vme8349.h
arch/powerpc/cpu/mpc83xx/Kconfig +0 -9
index e4c6f5d40b26..e751daac6e2d 100644
@@ -8,14 +8,6 @@ choice
 	prompt "Target select"
 	optional
 
-config TARGET_VME8349
-	bool "Support vme8349"
-	select ARCH_MPC8349
-
-config TARGET_CADDY2
-	bool "Support caddy2"
-	select ARCH_MPC8349
-
 config TARGET_MPC8315ERDB
 	bool "Support MPC8315ERDB"
 	select ARCH_MPC8315
@@ -278,7 +270,6 @@ endmenu
 config FSL_ELBC
 	bool
 
-source "board/esd/vme8349/Kconfig"
 source "board/freescale/mpc8315erdb/Kconfig"
 source "board/freescale/mpc8323erdb/Kconfig"
 source "board/freescale/mpc832xemds/Kconfig"
board/esd/vme8349/Kconfig deleted +0 -25
deleted file mode 100644
index ef2af40f7e80..000000000000
@@ -1,25 +0,0 @@
-if TARGET_VME8349
-
-config SYS_BOARD
-	default "vme8349"
-
-config SYS_VENDOR
-	default "esd"
-
-config SYS_CONFIG_NAME
-	default "vme8349"
-
-endif
-
-if TARGET_CADDY2
-
-config SYS_BOARD
-	default "vme8349"
-
-config SYS_VENDOR
-	default "esd"
-
-config SYS_CONFIG_NAME
-	default "caddy2"
-
-endif
board/esd/vme8349/MAINTAINERS deleted +0 -7
deleted file mode 100644
index a88ba13c303d..000000000000
@@ -1,7 +0,0 @@
-VME8349 BOARD
-M:	Reinhard Arlt <[email protected]>
-S:	Maintained
-F:	board/esd/vme8349/
-F:	include/configs/vme8349.h
-F:	configs/caddy2_defconfig
-F:	configs/vme8349_defconfig
board/esd/vme8349/Makefile deleted +0 -9
deleted file mode 100644
index 850c16ba638c..000000000000
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2006
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
-# Copyright (c) 2009 esd gmbh hannover germany.
-
-obj-y += vme8349.o caddy.o
-obj-$(CONFIG_PCI) += pci.o
board/esd/vme8349/caddy.c deleted +0 -178

178 lines not on this page · raw message

board/esd/vme8349/caddy.h deleted +0 -59

59 lines not on this page · raw message

board/esd/vme8349/pci.c deleted +0 -118

118 lines not on this page · raw message

board/esd/vme8349/vme8349.c deleted +0 -213

213 lines not on this page · raw message

board/esd/vme8349/vme8349pin.h deleted +0 -18
deleted file mode 100644
index 9ae9c7becae7..000000000000
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * vme8349pin.h -- esd VME8349 MPC8349 I/O pin definition.
- * Copyright (c) 2009 esd gmbh.
- *
- * Reinhard Arlt <[email protected]>
- */
-
-#ifndef __VME8349PIN_H__
-#define __VME8349PIN_H__
-
-#define GPIO2_V_SCON		0x80000000 /* In:  from tsi148 1: is syscon */
-#define GPIO2_VME_RESET_N	0x20000000 /* Out: to tsi148                */
-#define GPIO2_TSI_PLL_RESET_N	0x08000000 /* Out: to tsi148                */
-#define GPIO2_TSI_POWERUP_RESET_N 0x00800000 /* Out: to tsi148              */
-#define GPIO2_L_RESET_EN_N	0x00100000 /* Out: 0:vme can assert cpu lrst*/
-
-#endif /* of ifndef __VME8349PIN_H__ */
configs/caddy2_defconfig deleted +0 -123

123 lines not on this page · raw message

configs/vme8349_defconfig deleted +0 -134

134 lines not on this page · raw message

drivers/pci/pci_auto.c +1 -2
index 05663c72b4b8..b128a05dd380 100644
@@ -348,8 +348,7 @@ int dm_pciauto_config_device(struct udevice *dev)
 		      PCI_DEV(dm_pci_get_bdf(dev)));
 		break;
 #endif
-#if defined(CONFIG_ARCH_MPC834X) && !defined(CONFIG_TARGET_VME8349) && \
-		!defined(CONFIG_TARGET_CADDY2)
+#if defined(CONFIG_ARCH_MPC834X)
 	case PCI_CLASS_BRIDGE_OTHER:
 		/*
 		 * The host/PCI bridge 1 seems broken in 8349 - it presents
include/configs/caddy2.h deleted +0 -315

315 lines not on this page · raw message

include/configs/vme8349.h deleted +0 -315

315 lines not on this page · raw message

Signature · 1 line
2.17.1
author
#26 lore raw

Re: [PATCH 12/27] ppc: Remove caddy2 / vme8349 boards

Quoted 5 lines · Tom Rini

These boards have not been converted to CONFIG_DM_PCI by the deadline and is also missing conversion to CONFIG_DM. Remove them.

Cc Reinhard Arlt <[email protected]>

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
author
#27 lore raw

PATCH 13/27 ppc: Remove sbc8548 boards

In reply to Tom Rini

These boards have not been converted to CONFIG_DM_PCI by the deadline and are also missing conversion to CONFIG_DM. Remove them.

Cc Paul Gortmaker <[email protected]>
---
 arch/powerpc/cpu/mpc85xx/Kconfig      |   5 -
 board/sbc8548/Kconfig                 |   9 -
 board/sbc8548/MAINTAINERS             |  10 -
 board/sbc8548/Makefile                |  12 -
 board/sbc8548/README                  | 269 -------------
 board/sbc8548/ddr.c                   | 132 -------
 board/sbc8548/law.c                   |  54 ---
 board/sbc8548/sbc8548.c               | 315 ---------------
 board/sbc8548/tlb.c                   | 121 ------
 configs/sbc8548_PCI_33_PCIE_defconfig |  42 --
 configs/sbc8548_PCI_33_defconfig      |  42 --
 configs/sbc8548_PCI_66_PCIE_defconfig |  42 --
 configs/sbc8548_PCI_66_defconfig      |  42 --
 configs/sbc8548_defconfig             |  41 --
 include/configs/sbc8548.h             | 540 --------------------------
 15 files changed, 1676 deletions(-)
 delete mode 100644 board/sbc8548/Kconfig
 delete mode 100644 board/sbc8548/MAINTAINERS
 delete mode 100644 board/sbc8548/Makefile
 delete mode 100644 board/sbc8548/README
 delete mode 100644 board/sbc8548/ddr.c
 delete mode 100644 board/sbc8548/law.c
 delete mode 100644 board/sbc8548/sbc8548.c
 delete mode 100644 board/sbc8548/tlb.c
 delete mode 100644 configs/sbc8548_PCI_33_PCIE_defconfig
 delete mode 100644 configs/sbc8548_PCI_33_defconfig
 delete mode 100644 configs/sbc8548_PCI_66_PCIE_defconfig
 delete mode 100644 configs/sbc8548_PCI_66_defconfig
 delete mode 100644 configs/sbc8548_defconfig
 delete mode 100644 include/configs/sbc8548.h
arch/powerpc/cpu/mpc85xx/Kconfig +0 -5
index 676aaf1d2ca6..22cfa4dc3499 100644
@@ -16,10 +16,6 @@ choice
 	prompt "Target select"
 	optional
 
-config TARGET_SBC8548
-	bool "Support sbc8548"
-	select ARCH_MPC8548
-
 config TARGET_SOCRATES
 	bool "Support socrates"
 	select ARCH_MPC8544
@@ -1303,7 +1299,6 @@ source "board/freescale/t208xqds/Kconfig"
 source "board/freescale/t208xrdb/Kconfig"
 source "board/freescale/t4rdb/Kconfig"
 source "board/keymile/Kconfig"
-source "board/sbc8548/Kconfig"
 source "board/socrates/Kconfig"
 source "board/xes/xpedite520x/Kconfig"
 source "board/xes/xpedite537x/Kconfig"
board/sbc8548/Kconfig deleted +0 -9
deleted file mode 100644
index 626cbdf2ab27..000000000000
@@ -1,9 +0,0 @@
-if TARGET_SBC8548
-
-config SYS_BOARD
-	default "sbc8548"
-
-config SYS_CONFIG_NAME
-	default "sbc8548"
-
-endif
board/sbc8548/MAINTAINERS deleted +0 -10
deleted file mode 100644
index ba1f2475eabf..000000000000
@@ -1,10 +0,0 @@
-SBC8548 BOARD
-M:	Paul Gortmaker <[email protected]>
-S:	Maintained
-F:	board/sbc8548/
-F:	include/configs/sbc8548.h
-F:	configs/sbc8548_defconfig
-F:	configs/sbc8548_PCI_33_defconfig
-F:	configs/sbc8548_PCI_33_PCIE_defconfig
-F:	configs/sbc8548_PCI_66_defconfig
-F:	configs/sbc8548_PCI_66_PCIE_defconfig
board/sbc8548/Makefile deleted +0 -12
deleted file mode 100644
index 83d208cf1fe9..000000000000
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2004-2006
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
-# (C) Copyright 2007 Wind River Systems Inc <www.windriver.com>.
-# Added support for Wind River SBC8548 board
-
-obj-y	+= sbc8548.o
-obj-y	+= law.o
-obj-y	+= tlb.o
-obj-$(CONFIG_SYS_FSL_DDR2) += ddr.o
board/sbc8548/README deleted +0 -269

269 lines not on this page · raw message

board/sbc8548/ddr.c deleted +0 -132

132 lines not on this page · raw message

board/sbc8548/law.c deleted +0 -54

54 lines not on this page · raw message

board/sbc8548/sbc8548.c deleted +0 -315

315 lines not on this page · raw message

board/sbc8548/tlb.c deleted +0 -121

121 lines not on this page · raw message

configs/sbc8548_PCI_33_PCIE_defconfig deleted +0 -42

42 lines not on this page · raw message

configs/sbc8548_PCI_33_defconfig deleted +0 -42

42 lines not on this page · raw message

configs/sbc8548_PCI_66_PCIE_defconfig deleted +0 -42

42 lines not on this page · raw message

configs/sbc8548_PCI_66_defconfig deleted +0 -42

42 lines not on this page · raw message

configs/sbc8548_defconfig deleted +0 -41

41 lines not on this page · raw message

include/configs/sbc8548.h deleted +0 -540

540 lines not on this page · raw message

Signature · 1 line
2.17.1
#28 lore raw

PATCH 13/27 ppc: Remove sbc8548 boards

Quoted 4 lines · [[PATCH 13/27] ppc: Remove sbc8548 boards] On 14/05/2021 (Fri 21:34) Tom Rini…

These boards have not been converted to CONFIG_DM_PCI by the deadline and are also missing conversion to CONFIG_DM. Remove them.

Cc Paul Gortmaker <[email protected]>

Ack - kernel removal was queued several months ago, but has yet to be merged to mainline or linux-next

https://patchwork.ozlabs.org/project/linuxppc-dev/patch/20210111082823.99562-2-paul.gortmaker at windriver.com/

Thanks,
Paul.
--

Quoted 1,814 lines
---
 arch/powerpc/cpu/mpc85xx/Kconfig      |   5 -
 board/sbc8548/Kconfig                 |   9 -
 board/sbc8548/MAINTAINERS             |  10 -
 board/sbc8548/Makefile                |  12 -
 board/sbc8548/README                  | 269 -------------
 board/sbc8548/ddr.c                   | 132 -------
 board/sbc8548/law.c                   |  54 ---
 board/sbc8548/sbc8548.c               | 315 ---------------
 board/sbc8548/tlb.c                   | 121 ------
 configs/sbc8548_PCI_33_PCIE_defconfig |  42 --
 configs/sbc8548_PCI_33_defconfig      |  42 --
 configs/sbc8548_PCI_66_PCIE_defconfig |  42 --
 configs/sbc8548_PCI_66_defconfig      |  42 --
 configs/sbc8548_defconfig             |  41 --
 include/configs/sbc8548.h             | 540 --------------------------
 15 files changed, 1676 deletions(-)
 delete mode 100644 board/sbc8548/Kconfig
 delete mode 100644 board/sbc8548/MAINTAINERS
 delete mode 100644 board/sbc8548/Makefile
 delete mode 100644 board/sbc8548/README
 delete mode 100644 board/sbc8548/ddr.c
 delete mode 100644 board/sbc8548/law.c
 delete mode 100644 board/sbc8548/sbc8548.c
 delete mode 100644 board/sbc8548/tlb.c
 delete mode 100644 configs/sbc8548_PCI_33_PCIE_defconfig
 delete mode 100644 configs/sbc8548_PCI_33_defconfig
 delete mode 100644 configs/sbc8548_PCI_66_PCIE_defconfig
 delete mode 100644 configs/sbc8548_PCI_66_defconfig
 delete mode 100644 configs/sbc8548_defconfig
 delete mode 100644 include/configs/sbc8548.h
arch/powerpc/cpu/mpc85xx/Kconfig +0 -5
index 676aaf1d2ca6..22cfa4dc3499 100644
@@ -16,10 +16,6 @@ choice
 	prompt "Target select"
 	optional
 
-config TARGET_SBC8548
-	bool "Support sbc8548"
-	select ARCH_MPC8548
-
 config TARGET_SOCRATES
 	bool "Support socrates"
 	select ARCH_MPC8544
@@ -1303,7 +1299,6 @@ source "board/freescale/t208xqds/Kconfig"
 source "board/freescale/t208xrdb/Kconfig"
 source "board/freescale/t4rdb/Kconfig"
 source "board/keymile/Kconfig"
-source "board/sbc8548/Kconfig"
 source "board/socrates/Kconfig"
 source "board/xes/xpedite520x/Kconfig"
 source "board/xes/xpedite537x/Kconfig"
board/sbc8548/Kconfig deleted +0 -9
deleted file mode 100644
index 626cbdf2ab27..000000000000
@@ -1,9 +0,0 @@
-if TARGET_SBC8548
-
-config SYS_BOARD
-	default "sbc8548"
-
-config SYS_CONFIG_NAME
-	default "sbc8548"
-
-endif
board/sbc8548/MAINTAINERS deleted +0 -10
deleted file mode 100644
index ba1f2475eabf..000000000000
@@ -1,10 +0,0 @@
-SBC8548 BOARD
-M:	Paul Gortmaker <[email protected]>
-S:	Maintained
-F:	board/sbc8548/
-F:	include/configs/sbc8548.h
-F:	configs/sbc8548_defconfig
-F:	configs/sbc8548_PCI_33_defconfig
-F:	configs/sbc8548_PCI_33_PCIE_defconfig
-F:	configs/sbc8548_PCI_66_defconfig
-F:	configs/sbc8548_PCI_66_PCIE_defconfig
board/sbc8548/Makefile deleted +0 -12
deleted file mode 100644
index 83d208cf1fe9..000000000000
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2004-2006
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
-# (C) Copyright 2007 Wind River Systems Inc <www.windriver.com>.
-# Added support for Wind River SBC8548 board
-
-obj-y	+= sbc8548.o
-obj-y	+= law.o
-obj-y	+= tlb.o
-obj-$(CONFIG_SYS_FSL_DDR2) += ddr.o
board/sbc8548/README deleted +0 -269
deleted file mode 100644
index 0def245bd9ce..000000000000
@@ -1,269 +0,0 @@
-Intro:
-======
-
-The SBC8548 is a stand alone single board computer with a 1GHz
-MPC8548 CPU, 8MB boot flash, 64MB user flash and, 256MB DDR2 400MHz
-memory. It also has 128MB SDRAM 100MHz LBC memory, with both a PCI-e,
-and a PCI-X slot, dual mini-DB9 for UART, and dual RJ-45 for eTSEC
-ethernet connections.
-
-U-Boot Configuration:
-=====================
-
-The following possible U-Boot configuration targets are available:
-
-	1) sbc8548_config
-	2) sbc8548_PCI_33_config
-	3) sbc8548_PCI_66_config
-	4) sbc8548_PCI_33_PCIE_config
-	5) sbc8548_PCI_66_PCIE_config
-
-Generally speaking, most people should choose to use #5.  Details
-of each choice are listed below.
-
-Choice #1 does not enable CONFIG_PCI, and assumes that the PCI slot
-will be left empty (M66EN high), and so the board will operate with
-a base clock of 66MHz.	Note that you need both PCI enabled in U-Boot
-and linux in order to have functional PCI under linux.
-
-The second enables PCI support and builds for a 33MHz clock rate.  Note
-that if a 33MHz 32bit card is inserted in the slot, then the whole board
-will clock down to a 33MHz base clock instead of the default 66MHz.  This
-will change the baud clocks and mess up your serial console output if you
-were previously running at 66MHz.  If you want to use a 33MHz PCI card,
-then you should build a U-Boot with a _PCI_33_ config and store this
-to flash prior to powering down the board and inserting the 33MHz PCI
-card. [The above discussion assumes that the SW2[1-4] has not been changed
-to reflect a different CCB:SYSCLK ratio]
-
-The third option builds PCI support in, and leaves the clocking at the
-default 66MHz.	Options four and five are just repeats of option two
-and three, but with PCI-e support enabled as well.
-
-PCI output listing with an intel e1000 PCI-x and a Syskonnect SK-9Exx
-is shown below for sbc8548_PCI_66_PCIE_config.	(Note that PCI-e with
-a 33MHz PCI configuration is currently untested.)
-
-    => pci 0
-    Scanning PCI devices on bus 0
-    BusDevFun  VendorId	  DeviceId   Device Class	Sub-Class
-    _____________________________________________________________
-    00.00.00   0x1057	  0x0012     Processor		     0x20
-    00.01.00   0x8086	  0x1026     Network controller	     0x00
-    => pci 1
-    Scanning PCI devices on bus 1
-    BusDevFun  VendorId	  DeviceId   Device Class	Sub-Class
-    _____________________________________________________________
-    01.00.00   0x1957	  0x0012     Processor		     0x20
-    => pci 2
-    Scanning PCI devices on bus 2
-    BusDevFun  VendorId	  DeviceId   Device Class	Sub-Class
-    _____________________________________________________________
-    02.00.00   0x1148	  0x9e00     Network controller	     0x00
-    =>
-
-Memory Size and using SPD:
-==========================
-
-The default configuration uses hard coded memory configuration settings
-for 256MB of DDR2 @400MHz.  It does not by default use the DDR2 SPD
-EEPROM data to read what memory is installed.
-
-There is a hardware errata, which causes the older local bus SDRAM
-SPD EEPROM to land at the same address as the DDR2 SPD EEPROM, so
-that the SPD data can not be read reliably.  You can test if your
-board has the errata fix by running "i2c probe".  If you see 0x53
-as a valid device, it has been fixed.  If you only see 0x50, 0x51
-then your board does not have the fix.
-
-You can also visually inspect the board to see if this hardware
-fix has been applied:
-
-      1) Remove R314 (RES-R0174-033, 1K, 0603). R314 is located on
-	 the back of the PCB behind the DDR SDRAM SODIMM connector.
-      2) Solder RES-R0174-033 (1K, 0603) resistor from R314 pin 2 pad
-	 to R313 pin 2.	 Pin 2 for each resistor is the end of the
-	 resistor closest to the CPU.
-
-Boards without the mod will have R314 and R313 in parallel, like "||".
-After the mod, they will be touching and form an "L" shape.
-
-If you want to upgrade to larger RAM size, you can simply enable
-	#define CONFIG_SPD_EEPROM
-	#define CONFIG_DDR_SPD
-in include/configs/sbc8548.h file.  (The lines are already there
-but listed as #undef).
-
-If you did the i2c test, and your board does not have the errata
-fix, then you will have to physically remove the LBC 128MB DIMM
-from the board's socket to resolve the above i2c address overlap
-issue and allow SPD autodetection of RAM to work.
-
-
-Updating U-Boot with U-Boot:
-============================
-
-Note that versions of U-Boot up to and including 2009.08 had U-Boot stored
-at 0xfff8_0000 -> 0xffff_ffff (512k).  Currently it is being stored from
-0xfffa_0000 -> 0xffff_ffff (384k).  If you use an old macro/script to
-update U-Boot with U-Boot and it uses the old address, you will render
-your board inoperable, and you will require JTAG recovery.
-
-The following steps list how to update with the current address:
-
-	tftp u-boot.bin
-	md 200000 10
-	protect off all
-	erase fffa0000 ffffffff
-	cp.b 200000 fffa0000 60000
-	md fffa0000 10
-	protect on all
-
-The "md" steps in the above are just a precautionary step that allow
-you to confirm the U-Boot version that was downloaded, and then confirm
-that it was copied to flash.
-
-The above assumes that you are using the default board settings which
-have U-Boot in the 8MB flash, tied to /CS0.
-
-If you are running the default 8MB /CS0 settings but want to store an
-image in the SODIMM that is built with CONFIG_SYS_ALT_BOOT enabled,
-(as a backup, etc) then the steps will become:
-
-	tftp u-boot.bin
-	md 200000 10
-	protect off all
-	era eff00000 efffffff
-	cp.b 200000 eff00000 100000
-	md eff00000 10
-	protect on all
-
-Finally, if you are running the alternate 64MB /CS0 settings and want
-to update the in-use U-Boot image, then (again with CONFIG_SYS_ALT_BOOT
-enabled) the steps will become:
-
-	tftp u-boot.bin
-	md 200000 10
-	protect off all
-	era fff00000 ffffffff
-	cp.b 200000 fff00000 100000
-	md fff00000 10
-	protect on all
-
-
-Hardware Reference:
-===================
-
-The following contains some summary information on hardware settings
-that are relevant to U-Boot, based on the board manual.	 For the
-most up to date and complete details of the board, please request the
-reference manual ERG-00327-001.pdf from www.windriver.com
-
-Boot flash:
-	intel V28F640Jx, 8192x8 (one device) at 0xff80_0000
-
-Sodimm flash:
-	intel V28F128Jx, 16384x8 (4 devices) at 0xfb80_0000
-	Note that this address reflects the default setting for
-	the JTAG debugging tools, but since the alignment is
-	rather inconvenient, U-Boot puts it at 0xec00_0000.
-
-
-	Jumpers:
-
-Jumper		Name		ON		OFF
-----------------------------------------------------------------
-JP12		CS0/CS6 swap	see note[*]	see note[*]
-
-JP13		SODIMM flash	write OK	writes disabled
-		write prot.
-
-JP14		HRESET/TRST	joined		isolated
-
-JP15		PWR ON		when AC pwr	use S1 for on/off
-
-JP16		Demo LEDs	lit		not lit
-
-JP19		PCI mode	PCI		PCI-X
-
-
-[*]JP12, when jumpered parallel to the SODIMM, puts the boot flash
-onto /CS0 and the SODIMM flash on /CS6 (default).  When JP12
-is jumpered parallel to the LBC-SDRAM, then /CS0 is for the
-SODIMM flash and /CS6 is for the boot flash.  Note that in this
-alternate setting, you also need to switch SW2.8 to ON.
-See the setting CONFIG_SYS_ALT_BOOT if you want to use this setting
-and boot U-Boot from the 64MB SODIMM
-
-
-	Switches:
-
-The defaults are marked with a *
-
-Name		Desc.			ON		OFF
-------------------------------------------------------------------
-S1		Pwr toggle		n/a		n/a
-
-SW2.1		CFG_SYS_PLL0		1		0*
-SW2.2		CFG_SYS_PLL1		1*		0
-SW2.3		CFG_SYS_PLL2		1*		0
-SW2.4		CFG_SYS_PLL3		1		0*
-SW2.5		CFG_CORE_PLL0		1*		0
-SW2.6		CFG_CORE_PLL1		1		0*
-SW2.7		CFG_CORE_PLL2		1*		0
-SW2.8		CFG_ROM_LOC1		1		0*
-
-SW3.1		CFG_HOST_AGT0		1*		0
-SW3.2		CFG_HOST_AGT1		1*		0
-SW3.3		CFG_HOST_AGT2		1*		0
-SW3.4		CFG_IO_PORTS0		1*		0
-SW3.5		CFG_IO_PORTS0		1		0*
-SW3.6		CFG_IO_PORTS0		1		0*
-
-SerDes CLK(MHz)		SW5.1		SW5.2
-----------------------------------------------
-25			0		0
-100*			1		0
-125			0		1
-200			1		1
-
-SerDes CLK spread	SW5.3		SW5.4
-----------------------------------------------
-+/- 0.25%		0		0
--0.50%			1		0
--0.75%			0		1
-No Spread*		1		1
-
-SW4 settings are readable from the EPLD and are currently not used for
-any hardware settings (i.e. user configuration switches).
-
-	LEDs:
-
-Name		Desc.			ON		OFF
-------------------------------------------------------------------
-D13		PCI/PCI-X		PCI-X		PCI
-D14		3.3V PWR		3.3V		no power
-D15		SYSCLK			66MHz		33MHz
-
-
-	Default Memory Map:
-
-start		end		CS<n>	width	Desc.
-----------------------------------------------------------------------
-0000_0000	0fff_ffff	MCS0,1	64	DDR2 (256MB)
-f000_0000	f7ff_ffff	CS3,4	32	LB SDRAM (128MB)
-f800_0000	f8b0_1fff	CS5	-	EPLD
-fb80_0000	ff7f_ffff	CS6	32	SODIMM flash (64MB) [*]
-ff80_0000	ffff_ffff	CS0	8	Boot flash (8MB)
-
-[*] fb80 represents the default programmed by WR JTAG register files,
-    but U-Boot places the flash at either ec00 or fc00 based on JP12.
-
-The EPLD on CS5 demuxes the following devices at the following offsets:
-
-offset		size	width	device
---------------------------------------------------------
-0		1fff	8	7 segment display LED
-10_0000		1fff	4	user switches
-30_0000		1fff	4	HW Rev. register
-b0_0000		1fff	8	8kB EEPROM
board/sbc8548/ddr.c deleted +0 -132
deleted file mode 100644
index 61bc77c418a9..000000000000
@@ -1,132 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright 2008 Freescale Semiconductor, Inc.
- */
-
-#include <common.h>
-#include <i2c.h>
-#include <linux/delay.h>
-
-#include <fsl_ddr_sdram.h>
-#include <fsl_ddr_dimm_params.h>
-
-void fsl_ddr_board_options(memctl_options_t *popts,
-				dimm_params_t *pdimm,
-				unsigned int ctrl_num)
-{
-	/*
-	 * Factors to consider for clock adjust:
-	 *	- number of chips on bus
-	 *	- position of slot
-	 *	- DDR1 vs. DDR2?
-	 *	- ???
-	 *
-	 * This needs to be determined on a board-by-board basis.
-	 *	0110	3/4 cycle late
-	 *	0111	7/8 cycle late
-	 */
-	popts->clk_adjust = 7;
-
-	/*
-	 * Factors to consider for CPO:
-	 *	- frequency
-	 *	- ddr1 vs. ddr2
-	 */
-	popts->cpo_override = 10;
-
-	/*
-	 * Factors to consider for write data delay:
-	 *	- number of DIMMs
-	 *
-	 * 1 = 1/4 clock delay
-	 * 2 = 1/2 clock delay
-	 * 3 = 3/4 clock delay
-	 * 4 = 1   clock delay
-	 * 5 = 5/4 clock delay
-	 * 6 = 3/2 clock delay
-	 */
-	popts->write_data_delay = 3;
-
-	/*
-	 * Factors to consider for half-strength driver enable:
-	 *	- number of DIMMs installed
-	 */
-	popts->half_strength_driver_enable = 0;
-}
-
-#ifdef CONFIG_SPD_EEPROM
-/*
- * Workaround for hardware errata.  An i2c address conflict
- * existed on earlier boards; the workaround moved the DDR
- * SPD from 0x51 to 0x53.  So we try and read 0x53 1st, and
- * if that fails, then fall back to reading at 0x51.
- */
-void get_spd(generic_spd_eeprom_t *spd, u8 i2c_address)
-{
-	int ret;
-
-#ifdef ALT_SPD_EEPROM_ADDRESS
-	if (i2c_address == SPD_EEPROM_ADDRESS) {
-		ret = i2c_read(ALT_SPD_EEPROM_ADDRESS, 0, 1, (uchar *)spd,
-				sizeof(generic_spd_eeprom_t));
-		if (ret == 0)
-			return;		/* Good data at 0x53 */
-		memset(spd, 0, sizeof(generic_spd_eeprom_t));
-	}
-#endif
-	ret = i2c_read(i2c_address, 0, 1, (uchar *)spd,
-				sizeof(generic_spd_eeprom_t));
-	if (ret) {
-		printf("DDR: failed to read SPD from addr %u\n", i2c_address);
-		memset(spd, 0, sizeof(generic_spd_eeprom_t));
-	}
-}
-
-#else
-/*
- *  fixed_sdram init -- doesn't use serial presence detect.
- *  Assumes 256MB DDR2 SDRAM SODIMM, without ECC, running at DDR400 speed.
- */
-phys_size_t fixed_sdram(void)
-{
-	struct ccsr_ddr __iomem *ddr =
-		(struct ccsr_ddr __iomem *)(CONFIG_SYS_FSL_DDR_ADDR);
-
-	out_be32(&ddr->cs0_bnds,	0x0000007f);
-	out_be32(&ddr->cs1_bnds,	0x008000ff);
-	out_be32(&ddr->cs2_bnds,	0x00000000);
-	out_be32(&ddr->cs3_bnds,	0x00000000);
-
-	out_be32(&ddr->cs0_config,	0x80010101);
-	out_be32(&ddr->cs1_config,	0x80010101);
-	out_be32(&ddr->cs2_config,	0x00000000);
-	out_be32(&ddr->cs3_config,	0x00000000);
-
-	out_be32(&ddr->timing_cfg_3,	0x00000000);
-	out_be32(&ddr->timing_cfg_0,	0x00220802);
-	out_be32(&ddr->timing_cfg_1,	0x38377322);
-	out_be32(&ddr->timing_cfg_2,	0x0fa044C7);
-
-	out_be32(&ddr->sdram_cfg,	0x4300C000);
-	out_be32(&ddr->sdram_cfg_2,	0x24401000);
-
-	out_be32(&ddr->sdram_mode,	0x23C00542);
-	out_be32(&ddr->sdram_mode_2,	0x00000000);
-
-	out_be32(&ddr->sdram_interval,	0x05080100);
-	out_be32(&ddr->sdram_md_cntl,	0x00000000);
-	out_be32(&ddr->sdram_data_init,	0x00000000);
-	out_be32(&ddr->sdram_clk_cntl,	0x03800000);
-	asm("sync;isync;msync");
-	udelay(500);
-
-	#ifdef CONFIG_DDR_ECC
-	  /* Enable ECC checking */
-	  out_be32(&ddr->sdram_cfg, CONFIG_SYS_DDR_CONTROL | 0x20000000);
-	#else
-	  out_be32(&ddr->sdram_cfg, CONFIG_SYS_DDR_CONTROL);
-	#endif
-
-	return CONFIG_SYS_SDRAM_SIZE * 1024 * 1024;
-}
-#endif
board/sbc8548/law.c deleted +0 -54
deleted file mode 100644
index 97271ea6f66b..000000000000
@@ -1,54 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2008 Freescale Semiconductor, Inc.
- *
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- */
-
-#include <common.h>
-#include <asm/fsl_law.h>
-#include <asm/mmu.h>
-
-/*
- * LAW(Local Access Window) configuration:
- *
- * 0x0000_0000	0x0fff_ffff	DDR			256M
- * 0x8000_0000	0x9fff_ffff	PCI1 MEM		512M
- * 0xa000_0000	0xbfff_ffff	PCIe MEM		512M
- * 0xe000_0000	0xe000_ffff	CCSR			1M
- * 0xe200_0000	0xe27f_ffff	PCI1 IO			8M
- * 0xe280_0000	0xe2ff_ffff	PCIe IO			8M
- * 0xec00_0000	0xefff_ffff	FLASH (2nd bank)	64M
- * 0xf000_0000	0xf7ff_ffff	SDRAM			128M
- * 0xf8b0_0000	0xf80f_ffff	EEPROM			1M
- * 0xff80_0000	0xffff_ffff	FLASH (boot bank)	8M
- *
- * If swapped CS0/CS6 via JP12+SW2.8:
- * 0xef80_0000	0xefff_ffff	FLASH (2nd bank)	8M
- * 0xfc00_0000	0xffff_ffff	FLASH (boot bank)	64M
- *
- * Notes:
- *	CCSRBAR and L2-as-SRAM don't need a configured Local Access Window.
- *	If flash is 8M at default position (last 8M), no LAW needed.
- */
-
-struct law_entry law_table[] = {
-#ifdef CONFIG_SYS_ALT_BOOT
-	SET_LAW(CONFIG_SYS_ALT_FLASH, LAW_SIZE_8M, LAW_TRGT_IF_LBC),
-#else
-	SET_LAW(CONFIG_SYS_ALT_FLASH, LAW_SIZE_64M, LAW_TRGT_IF_LBC),
-#endif
-#ifndef CONFIG_SPD_EEPROM
-	SET_LAW(CONFIG_SYS_DDR_SDRAM_BASE, LAW_SIZE_256M, LAW_TRGT_IF_DDR),
-#endif
-#ifdef CONFIG_SYS_LBC_SDRAM_BASE
-	/* LBC window - maps 256M 0xf0000000 -> 0xffffffff */
-	SET_LAW(CONFIG_SYS_LBC_SDRAM_BASE, LAW_SIZE_256M, LAW_TRGT_IF_LBC),
-#else
-	/* LBC window - maps 128M 0xf8000000 -> 0xffffffff */
-	SET_LAW(CONFIG_SYS_EPLD_BASE, LAW_SIZE_128M, LAW_TRGT_IF_LBC),
-#endif
-};
-
-int num_law_entries = ARRAY_SIZE(law_table);
board/sbc8548/sbc8548.c deleted +0 -315
deleted file mode 100644
index bd4b528d03f7..000000000000
@@ -1,315 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2007,2009 Wind River Systems, Inc. <www.windriver.com>
- *
- * Copyright 2007 Embedded Specialties, Inc.
- *
- * Copyright 2004, 2007 Freescale Semiconductor.
- *
- * (C) Copyright 2002 Scott McNutt <[email protected]>
- */
-
-#include <common.h>
-#include <init.h>
-#include <log.h>
-#include <net.h>
-#include <pci.h>
-#include <asm/processor.h>
-#include <asm/immap_85xx.h>
-#include <asm/fsl_pci.h>
-#include <fsl_ddr_sdram.h>
-#include <asm/fsl_serdes.h>
-#include <spd_sdram.h>
-#include <netdev.h>
-#include <tsec.h>
-#include <miiphy.h>
-#include <linux/delay.h>
-#include <linux/libfdt.h>
-#include <fdt_support.h>
-
-void local_bus_init(void);
-
-int board_early_init_f (void)
-{
-	return 0;
-}
-
-int checkboard (void)
-{
-	volatile ccsr_local_ecm_t *ecm = (void *)(CONFIG_SYS_MPC85xx_ECM_ADDR);
-	volatile u_char *rev= (void *)CONFIG_SYS_BD_REV;
-
-	printf ("Board: Wind River SBC8548 Rev. 0x%01x\n",
-			in_8(rev) >> 4);
-
-	/*
-	 * Initialize local bus.
-	 */
-	local_bus_init ();
-
-	out_be32(&ecm->eedr, 0xffffffff);	/* clear ecm errors */
-	out_be32(&ecm->eeer, 0xffffffff);	/* enable ecm errors */
-	return 0;
-}
-
-/*
- * Initialize Local Bus
- */
-void
-local_bus_init(void)
-{
-	volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
-	volatile fsl_lbc_t *lbc = LBC_BASE_ADDR;
-
-	uint clkdiv, lbc_mhz, lcrr = CONFIG_SYS_LBC_LCRR;
-	sys_info_t sysinfo;
-
-	get_sys_info(&sysinfo);
-
-	lbc_mhz = sysinfo.freq_localbus / 1000000;
-	clkdiv = sysinfo.freq_systembus / sysinfo.freq_localbus;
-
-	debug("LCRR=0x%x, CD=%d, MHz=%d\n", lcrr, clkdiv, lbc_mhz);
-
-	out_be32(&gur->lbiuiplldcr1, 0x00078080);
-	if (clkdiv == 16) {
-		out_be32(&gur->lbiuiplldcr0, 0x7c0f1bf0);
-	} else if (clkdiv == 8) {
-		out_be32(&gur->lbiuiplldcr0, 0x6c0f1bf0);
-	} else if (clkdiv == 4) {
-		out_be32(&gur->lbiuiplldcr0, 0x5c0f1bf0);
-	}
-
-	/*
-	 * Local Bus Clock > 83.3 MHz. According to timing
-	 * specifications set LCRR[EADC] to 2 delay cycles.
-	 */
-	if (lbc_mhz > 83) {
-		lcrr &= ~LCRR_EADC;
-		lcrr |= LCRR_EADC_2;
-	}
-
-	/*
-	 * According to MPC8548ERMAD Rev. 1.3, 13.3.1.16, 13-30
-	 * disable PLL bypass for Local Bus Clock > 83 MHz.
-	 */
-	if (lbc_mhz >= 66)
-		lcrr &= (~LCRR_DBYP);	/* DLL Enabled */
-
-	else
-		lcrr |= LCRR_DBYP;	/* DLL Bypass */
-
-	out_be32(&lbc->lcrr, lcrr);
-	asm("sync;isync;msync");
-
-	 /*
-	 * According to MPC8548ERMAD Rev.1.3 read back LCRR
-	 * and terminate with isync
-	 */
-	lcrr = in_be32(&lbc->lcrr);
-	asm ("isync;");
-
-	/* let DLL stabilize */
-	udelay(500);
-
-	out_be32(&lbc->ltesr, 0xffffffff);	/* Clear LBC error IRQs */
-	out_be32(&lbc->lteir, 0xffffffff);	/* Enable LBC error IRQs */
-}
-
-/*
- * Initialize SDRAM memory on the Local Bus.
- */
-void lbc_sdram_init(void)
-{
-#if defined(CONFIG_SYS_LBC_SDRAM_SIZE)
-
-	uint idx;
-	const unsigned long size = CONFIG_SYS_LBC_SDRAM_SIZE * 1024 * 1024;
-	volatile fsl_lbc_t *lbc = LBC_BASE_ADDR;
-	uint *sdram_addr = (uint *)CONFIG_SYS_LBC_SDRAM_BASE;
-	uint *sdram_addr2 = (uint *)(CONFIG_SYS_LBC_SDRAM_BASE + size/2);
-
-	puts("    SDRAM: ");
-
-	print_size(size, "\n");
-
-	/*
-	 * Setup SDRAM Base and Option Registers
-	 */
-	set_lbc_or(3, CONFIG_SYS_OR3_PRELIM);
-	set_lbc_br(3, CONFIG_SYS_BR3_PRELIM);
-	set_lbc_or(4, CONFIG_SYS_OR4_PRELIM);
-	set_lbc_br(4, CONFIG_SYS_BR4_PRELIM);
-
-	out_be32(&lbc->lbcr, CONFIG_SYS_LBC_LBCR);
-	asm("msync");
-
-	out_be32(&lbc->lsrt,  CONFIG_SYS_LBC_LSRT);
-	out_be32(&lbc->mrtpr, CONFIG_SYS_LBC_MRTPR);
-	asm("msync");
-
-	/*
-	 * Issue PRECHARGE ALL command.
-	 */
-	out_be32(&lbc->lsdmr, CONFIG_SYS_LBC_LSDMR_PCHALL);
-	asm("sync;msync");
-	*sdram_addr = 0xff;
-	ppcDcbf((unsigned long) sdram_addr);
-	*sdram_addr2 = 0xff;
-	ppcDcbf((unsigned long) sdram_addr2);
-	udelay(100);
-
-	/*
-	 * Issue 8 AUTO REFRESH commands.
-	 */
-	for (idx = 0; idx < 8; idx++) {
-		out_be32(&lbc->lsdmr, CONFIG_SYS_LBC_LSDMR_ARFRSH);
-		asm("sync;msync");
-		*sdram_addr = 0xff;
-		ppcDcbf((unsigned long) sdram_addr);
-		*sdram_addr2 = 0xff;
-		ppcDcbf((unsigned long) sdram_addr2);
-		udelay(100);
-	}
-
-	/*
-	 * Issue 8 MODE-set command.
-	 */
-	out_be32(&lbc->lsdmr, CONFIG_SYS_LBC_LSDMR_MRW);
-	asm("sync;msync");
-	*sdram_addr = 0xff;
-	ppcDcbf((unsigned long) sdram_addr);
-	*sdram_addr2 = 0xff;
-	ppcDcbf((unsigned long) sdram_addr2);
-	udelay(100);
-
-	/*
-	 * Issue RFEN command.
-	 */
-	out_be32(&lbc->lsdmr, CONFIG_SYS_LBC_LSDMR_RFEN);
-	asm("sync;msync");
-	*sdram_addr = 0xff;
-	ppcDcbf((unsigned long) sdram_addr);
-	*sdram_addr2 = 0xff;
-	ppcDcbf((unsigned long) sdram_addr2);
-	udelay(200);    /* Overkill. Must wait > 200 bus cycles */
-
-#endif	/* enable SDRAM init */
-}
-
-#if defined(CONFIG_SYS_DRAM_TEST)
-int
-testdram(void)
-{
-	uint *pstart = (uint *) CONFIG_SYS_MEMTEST_START;
-	uint *pend = (uint *) CONFIG_SYS_MEMTEST_END;
-	uint *p;
-
-	printf("Testing DRAM from 0x%08x to 0x%08x\n",
-	       CONFIG_SYS_MEMTEST_START,
-	       CONFIG_SYS_MEMTEST_END);
-
-	printf("DRAM test phase 1:\n");
-	for (p = pstart; p < pend; p++)
-		*p = 0xaaaaaaaa;
-
-	for (p = pstart; p < pend; p++) {
-		if (*p != 0xaaaaaaaa) {
-			printf ("DRAM test fails at: %08x\n", (uint) p);
-			return 1;
-		}
-	}
-
-	printf("DRAM test phase 2:\n");
-	for (p = pstart; p < pend; p++)
-		*p = 0x55555555;
-
-	for (p = pstart; p < pend; p++) {
-		if (*p != 0x55555555) {
-			printf ("DRAM test fails at: %08x\n", (uint) p);
-			return 1;
-		}
-	}
-
-	printf("DRAM test passed.\n");
-	return 0;
-}
-#endif
-
-#ifdef CONFIG_PCI1
-static struct pci_controller pci1_hose;
-#endif	/* CONFIG_PCI1 */
-
-#ifdef CONFIG_PCI
-void
-pci_init_board(void)
-{
-	volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
-	int first_free_busno = 0;
-
-#ifdef CONFIG_PCI1
-	struct fsl_pci_info pci_info;
-	u32 devdisr = in_be32(&gur->devdisr);
-	u32 pordevsr = in_be32(&gur->pordevsr);
-	u32 porpllsr = in_be32(&gur->porpllsr);
-
-	if (!(devdisr & MPC85xx_DEVDISR_PCI1)) {
-		uint pci_32 = pordevsr & MPC85xx_PORDEVSR_PCI1_PCI32;
-		uint pci_arb = pordevsr & MPC85xx_PORDEVSR_PCI1_ARB;
-		uint pci_clk_sel = porpllsr & MPC85xx_PORDEVSR_PCI1_SPD;
-		uint pci_speed = CONFIG_SYS_CLK_FREQ;	/* get_clock_freq() */
-
-		printf("PCI: Host, %d bit, %s MHz, %s, %s\n",
-			(pci_32) ? 32 : 64,
-			(pci_speed == 33000000) ? "33" :
-			(pci_speed == 66000000) ? "66" : "unknown",
-			pci_clk_sel ? "sync" : "async",
-			pci_arb ? "arbiter" : "external-arbiter");
-
-		SET_STD_PCI_INFO(pci_info, 1);
-		set_next_law(pci_info.mem_phys,
-			law_size_bits(pci_info.mem_size), pci_info.law);
-		set_next_law(pci_info.io_phys,
-			law_size_bits(pci_info.io_size), pci_info.law);
-
-		first_free_busno = fsl_pci_init_port(&pci_info,
-					&pci1_hose, first_free_busno);
-	} else {
-		printf("PCI: disabled\n");
-	}
-
-	puts("\n");
-#else
-	setbits_be32(&gur->devdisr, MPC85xx_DEVDISR_PCI1); /* disable */
-#endif
-
-	setbits_be32(&gur->devdisr, MPC85xx_DEVDISR_PCI2); /* disable PCI2 */
-
-	fsl_pcie_init_board(first_free_busno);
-}
-#endif
-
-int board_eth_init(struct bd_info *bis)
-{
-	tsec_standard_init(bis);
-	pci_eth_init(bis);
-	return 0;	/* otherwise cpu_eth_init gets run */
-}
-
-int last_stage_init(void)
-{
-	return 0;
-}
-
-#if defined(CONFIG_OF_BOARD_SETUP)
-int ft_board_setup(void *blob, struct bd_info *bd)
-{
-	ft_cpu_setup(blob, bd);
-
-#ifdef CONFIG_FSL_PCI_INIT
-	FT_FSL_PCI_SETUP;
-#endif
-
-	return 0;
-}
-#endif
board/sbc8548/tlb.c deleted +0 -121
deleted file mode 100644
index 8ad01d10e49b..000000000000
@@ -1,121 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2008 Freescale Semiconductor, Inc.
- *
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- */
-
-#include <common.h>
-#include <asm/mmu.h>
-
-struct fsl_e_tlb_entry tlb_table[] = {
-	/* TLB 0 - for temp stack in cache */
-	SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR, CONFIG_SYS_INIT_RAM_ADDR,
-		      MAS3_SX|MAS3_SW|MAS3_SR, 0,
-		      0, 0, BOOKE_PAGESZ_4K, 0),
-	SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024,
-		      CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024,
-		      MAS3_SX|MAS3_SW|MAS3_SR, 0,
-		      0, 0, BOOKE_PAGESZ_4K, 0),
-	SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 8 * 1024,
-		      CONFIG_SYS_INIT_RAM_ADDR + 8 * 1024,
-		      MAS3_SX|MAS3_SW|MAS3_SR, 0,
-		      0, 0, BOOKE_PAGESZ_4K, 0),
-	SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 12 * 1024,
-		      CONFIG_SYS_INIT_RAM_ADDR + 12 * 1024,
-		      MAS3_SX|MAS3_SW|MAS3_SR, 0,
-		      0, 0, BOOKE_PAGESZ_4K, 0),
-
-	/*
-	 * TLB 0:	64M	Non-cacheable, guarded
-	 * 0xfc000000	56M	unused
-	 * 0xff800000	8M	boot FLASH
-	 *	.... or ....
-	 * 0xfc000000	64M	user flash
-	 *
-	 * Out of reset this entry is only 4K.
-	 */
-	SET_TLB_ENTRY(1, 0xfc000000, 0xfc000000,
-		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
-		      0, 0, BOOKE_PAGESZ_64M, 1),
-
-	/*
-	 * TLB 1:	1G	Non-cacheable, guarded
-	 * 0x80000000	512M	PCI1 MEM
-	 * 0xa0000000	512M	PCIe MEM
-	 */
-	SET_TLB_ENTRY(1, CONFIG_SYS_PCI1_MEM_VIRT, CONFIG_SYS_PCI1_MEM_PHYS,
-		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
-		      0, 1, BOOKE_PAGESZ_1G, 1),
-
-	/*
-	 * TLB 2:	64M	Non-cacheable, guarded
-	 * 0xe0000000	1M	CCSRBAR
-	 * 0xe2000000	8M	PCI1 IO
-	 * 0xe2800000	8M	PCIe IO
-	 */
-	SET_TLB_ENTRY(1, CONFIG_SYS_CCSRBAR, CONFIG_SYS_CCSRBAR_PHYS,
-		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
-		      0, 2, BOOKE_PAGESZ_64M, 1),
-
-#ifdef CONFIG_SYS_LBC_SDRAM_BASE
-	/*
-	 * TLB 3:	64M	Cacheable, non-guarded
-	 * 0xf0000000	64M	LBC SDRAM First half
-	 */
-	SET_TLB_ENTRY(1, CONFIG_SYS_LBC_SDRAM_BASE, CONFIG_SYS_LBC_SDRAM_BASE,
-		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
-		      0, 3, BOOKE_PAGESZ_64M, 1),
-
-	/*
-	 * TLB 4:	64M	Cacheable, non-guarded
-	 * 0xf4000000	64M	LBC SDRAM Second half
-	 */
-	SET_TLB_ENTRY(1, CONFIG_SYS_LBC_SDRAM_BASE + 0x4000000,
-		      CONFIG_SYS_LBC_SDRAM_BASE + 0x4000000,
-		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
-		      0, 4, BOOKE_PAGESZ_64M, 1),
-#endif
-
-	/*
-	 * TLB 5:	16M	Cacheable, non-guarded
-	 * 0xf8000000	1M	7-segment LED display
-	 * 0xf8100000	1M	User switches
-	 * 0xf8300000	1M	Board revision
-	 * 0xf8b00000	1M	EEPROM
-	 */
-	SET_TLB_ENTRY(1, CONFIG_SYS_EPLD_BASE, CONFIG_SYS_EPLD_BASE,
-		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
-		      0, 5, BOOKE_PAGESZ_16M, 1),
-
-#ifndef CONFIG_SYS_ALT_BOOT
-	/*
-	 * TLB 6:	64M	Non-cacheable, guarded
-	 * 0xec000000	64M	64MB user FLASH
-	 */
-	SET_TLB_ENTRY(1, CONFIG_SYS_ALT_FLASH, CONFIG_SYS_ALT_FLASH,
-		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
-		      0, 6, BOOKE_PAGESZ_64M, 1),
-#else
-	/*
-	 * TLB 6:	4M	Non-cacheable, guarded
-	 * 0xef800000	4M	1st 1/2 8MB soldered FLASH
-	 */
-	SET_TLB_ENTRY(1, CONFIG_SYS_ALT_FLASH, CONFIG_SYS_ALT_FLASH,
-		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
-		      0, 6, BOOKE_PAGESZ_4M, 1),
-
-	/*
-	 * TLB 7:	4M	Non-cacheable, guarded
-	 * 0xefc00000	4M	2nd half 8MB soldered FLASH
-	 */
-	SET_TLB_ENTRY(1, CONFIG_SYS_ALT_FLASH + 0x400000,
-		      CONFIG_SYS_ALT_FLASH + 0x400000,
-		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
-		      0, 7, BOOKE_PAGESZ_4M, 1),
-#endif
-
-};
-
-int num_tlb_entries = ARRAY_SIZE(tlb_table);
configs/sbc8548_PCI_33_PCIE_defconfig deleted +0 -42
deleted file mode 100644
index 3157ed92f396..000000000000
@@ -1,42 +0,0 @@
-CONFIG_PPC=y
-CONFIG_SYS_TEXT_BASE=0xFFFA0000
-CONFIG_ENV_SIZE=0x2000
-CONFIG_ENV_SECT_SIZE=0x20000
-CONFIG_MPC85xx=y
-# CONFIG_CMD_ERRATA is not set
-CONFIG_TARGET_SBC8548=y
-CONFIG_OF_BOARD_SETUP=y
-CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SYS_EXTRA_OPTIONS="33,PCIE"
-CONFIG_BOOTDELAY=10
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_BOARD_EARLY_INIT_F=y
-# CONFIG_MISC_INIT_R is not set
-CONFIG_HUSH_PARSER=y
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_PCI=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-# CONFIG_CMD_HASH is not set
-# CONFIG_CMD_IRQ is not set
-CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_ADDR=0xFFFE0000
-# CONFIG_MMC is not set
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_PHY_ATHEROS=y
-CONFIG_PHY_BROADCOM=y
-CONFIG_PHY_DAVICOM=y
-CONFIG_PHY_LXT=y
-CONFIG_PHY_MARVELL=y
-CONFIG_PHY_NATSEMI=y
-CONFIG_PHY_REALTEK=y
-CONFIG_PHY_SMSC=y
-CONFIG_PHY_VITESSE=y
-CONFIG_MII=y
-CONFIG_TSEC_ENET=y
-CONFIG_SYS_NS16550=y
-CONFIG_OF_LIBFDT=y
configs/sbc8548_PCI_33_defconfig deleted +0 -42
deleted file mode 100644
index ac4dbd04215b..000000000000
@@ -1,42 +0,0 @@
-CONFIG_PPC=y
-CONFIG_SYS_TEXT_BASE=0xFFFA0000
-CONFIG_ENV_SIZE=0x2000
-CONFIG_ENV_SECT_SIZE=0x20000
-CONFIG_MPC85xx=y
-# CONFIG_CMD_ERRATA is not set
-CONFIG_TARGET_SBC8548=y
-CONFIG_OF_BOARD_SETUP=y
-CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SYS_EXTRA_OPTIONS="33"
-CONFIG_BOOTDELAY=10
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_BOARD_EARLY_INIT_F=y
-# CONFIG_MISC_INIT_R is not set
-CONFIG_HUSH_PARSER=y
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_PCI=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-# CONFIG_CMD_HASH is not set
-# CONFIG_CMD_IRQ is not set
-CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_ADDR=0xFFFE0000
-# CONFIG_MMC is not set
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_PHY_ATHEROS=y
-CONFIG_PHY_BROADCOM=y
-CONFIG_PHY_DAVICOM=y
-CONFIG_PHY_LXT=y
-CONFIG_PHY_MARVELL=y
-CONFIG_PHY_NATSEMI=y
-CONFIG_PHY_REALTEK=y
-CONFIG_PHY_SMSC=y
-CONFIG_PHY_VITESSE=y
-CONFIG_MII=y
-CONFIG_TSEC_ENET=y
-CONFIG_SYS_NS16550=y
-CONFIG_OF_LIBFDT=y
configs/sbc8548_PCI_66_PCIE_defconfig deleted +0 -42
deleted file mode 100644
index b7cd900e5d8e..000000000000
@@ -1,42 +0,0 @@
-CONFIG_PPC=y
-CONFIG_SYS_TEXT_BASE=0xFFFA0000
-CONFIG_ENV_SIZE=0x2000
-CONFIG_ENV_SECT_SIZE=0x20000
-CONFIG_MPC85xx=y
-# CONFIG_CMD_ERRATA is not set
-CONFIG_TARGET_SBC8548=y
-CONFIG_OF_BOARD_SETUP=y
-CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SYS_EXTRA_OPTIONS="66,PCIE"
-CONFIG_BOOTDELAY=10
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_BOARD_EARLY_INIT_F=y
-# CONFIG_MISC_INIT_R is not set
-CONFIG_HUSH_PARSER=y
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_PCI=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-# CONFIG_CMD_HASH is not set
-# CONFIG_CMD_IRQ is not set
-CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_ADDR=0xFFFE0000
-# CONFIG_MMC is not set
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_PHY_ATHEROS=y
-CONFIG_PHY_BROADCOM=y
-CONFIG_PHY_DAVICOM=y
-CONFIG_PHY_LXT=y
-CONFIG_PHY_MARVELL=y
-CONFIG_PHY_NATSEMI=y
-CONFIG_PHY_REALTEK=y
-CONFIG_PHY_SMSC=y
-CONFIG_PHY_VITESSE=y
-CONFIG_MII=y
-CONFIG_TSEC_ENET=y
-CONFIG_SYS_NS16550=y
-CONFIG_OF_LIBFDT=y
configs/sbc8548_PCI_66_defconfig deleted +0 -42
deleted file mode 100644
index eb3c56b47b07..000000000000
@@ -1,42 +0,0 @@
-CONFIG_PPC=y
-CONFIG_SYS_TEXT_BASE=0xFFFA0000
-CONFIG_ENV_SIZE=0x2000
-CONFIG_ENV_SECT_SIZE=0x20000
-CONFIG_MPC85xx=y
-# CONFIG_CMD_ERRATA is not set
-CONFIG_TARGET_SBC8548=y
-CONFIG_OF_BOARD_SETUP=y
-CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SYS_EXTRA_OPTIONS="66"
-CONFIG_BOOTDELAY=10
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_BOARD_EARLY_INIT_F=y
-# CONFIG_MISC_INIT_R is not set
-CONFIG_HUSH_PARSER=y
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_PCI=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-# CONFIG_CMD_HASH is not set
-# CONFIG_CMD_IRQ is not set
-CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_ADDR=0xFFFE0000
-# CONFIG_MMC is not set
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_PHY_ATHEROS=y
-CONFIG_PHY_BROADCOM=y
-CONFIG_PHY_DAVICOM=y
-CONFIG_PHY_LXT=y
-CONFIG_PHY_MARVELL=y
-CONFIG_PHY_NATSEMI=y
-CONFIG_PHY_REALTEK=y
-CONFIG_PHY_SMSC=y
-CONFIG_PHY_VITESSE=y
-CONFIG_MII=y
-CONFIG_TSEC_ENET=y
-CONFIG_SYS_NS16550=y
-CONFIG_OF_LIBFDT=y
configs/sbc8548_defconfig deleted +0 -41
deleted file mode 100644
index 6e38d9257969..000000000000
@@ -1,41 +0,0 @@
-CONFIG_PPC=y
-CONFIG_SYS_TEXT_BASE=0xFFFA0000
-CONFIG_ENV_SIZE=0x2000
-CONFIG_ENV_SECT_SIZE=0x20000
-CONFIG_MPC85xx=y
-# CONFIG_CMD_ERRATA is not set
-CONFIG_TARGET_SBC8548=y
-CONFIG_OF_BOARD_SETUP=y
-CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_BOOTDELAY=10
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_BOARD_EARLY_INIT_F=y
-# CONFIG_MISC_INIT_R is not set
-CONFIG_HUSH_PARSER=y
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-# CONFIG_CMD_HASH is not set
-# CONFIG_CMD_IRQ is not set
-CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_ADDR=0xFFFE0000
-# CONFIG_MMC is not set
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_PHY_ATHEROS=y
-CONFIG_PHY_BROADCOM=y
-CONFIG_PHY_DAVICOM=y
-CONFIG_PHY_LXT=y
-CONFIG_PHY_MARVELL=y
-CONFIG_PHY_NATSEMI=y
-CONFIG_PHY_REALTEK=y
-CONFIG_PHY_SMSC=y
-CONFIG_PHY_VITESSE=y
-CONFIG_MII=y
-CONFIG_TSEC_ENET=y
-# CONFIG_PCI is not set
-CONFIG_SYS_NS16550=y
-CONFIG_OF_LIBFDT=y
include/configs/sbc8548.h deleted +0 -540
deleted file mode 100644
index 6e26d456ab74..000000000000
@@ -1,540 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright 2007,2009 Wind River Systems <www.windriver.com>
- * Copyright 2007 Embedded Specialties, Inc.
- * Copyright 2004, 2007 Freescale Semiconductor.
- */
-
-/*
- * sbc8548 board configuration file
- * Please refer to board/sbc8548/README for more info.
- */
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <linux/stringify.h>
-
-/*
- * Top level Makefile configuration choices
- */
-#ifdef CONFIG_PCI
-#define CONFIG_PCI_INDIRECT_BRIDGE
-#define CONFIG_PCI1
-#endif
-
-#ifdef CONFIG_66
-#define CONFIG_SYS_CLK_DIV 1
-#endif
-
-#ifdef CONFIG_33
-#define CONFIG_SYS_CLK_DIV 2
-#endif
-
-#ifdef CONFIG_PCIE
-#define CONFIG_PCIE1
-#endif
-
-/*
- * High Level Configuration Options
- */
-
-/*
- * If you want to boot from the SODIMM flash, instead of the soldered
- * on flash, set this, and change JP12, SW2:8 accordingly.
- */
-#undef CONFIG_SYS_ALT_BOOT
-
-#undef CONFIG_RIO
-
-#ifdef CONFIG_PCI
-#define CONFIG_FSL_PCI_INIT		/* Use common FSL init code */
-#define CONFIG_SYS_PCI_64BIT    1	/* enable 64-bit PCI resources */
-#endif
-
-#define CONFIG_INTERRUPTS		/* enable pci, srio, ddr interrupts */
-
-/*
- * Below assumes that CCB:SYSCLK remains unchanged at 6:1 via SW2:[1-4]
- */
-#ifndef CONFIG_SYS_CLK_DIV
-#define CONFIG_SYS_CLK_DIV	1	/* 2, if 33MHz PCI card installed */
-#endif
-#define CONFIG_SYS_CLK_FREQ	(66000000 / CONFIG_SYS_CLK_DIV)
-
-/*
- * These can be toggled for performance analysis, otherwise use default.
- */
-#define CONFIG_L2_CACHE			/* toggle L2 cache */
-#define CONFIG_BTB			/* toggle branch predition */
-
-/*
- * Only possible on E500 Version 2 or newer cores.
- */
-#define CONFIG_ENABLE_36BIT_PHYS	1
-
-#undef	CONFIG_SYS_DRAM_TEST			/* memory test, takes time */
-
-#define CONFIG_SYS_CCSRBAR		0xe0000000
-#define CONFIG_SYS_CCSRBAR_PHYS_LOW	CONFIG_SYS_CCSRBAR
-
-/* DDR Setup */
-#undef CONFIG_DDR_ECC			/* only for ECC DDR module */
-/*
- * A hardware errata caused the LBC SDRAM SPD and the DDR2 SPD
- * to collide, meaning you couldn't reliably read either. So
- * physically remove the LBC PC100 SDRAM module from the board
- * before enabling the two SPD options below, or check that you
- * have the hardware fix on your board via "i2c probe" and looking
- * for a device at 0x53.
- */
-#undef CONFIG_SPD_EEPROM		/* Use SPD EEPROM for DDR setup */
-#undef CONFIG_DDR_SPD
-
-#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER	/* DDR controller or DMA? */
-#define CONFIG_MEM_INIT_VALUE	0xDeadBeef
-
-#define CONFIG_SYS_DDR_SDRAM_BASE	0x00000000
-#define CONFIG_SYS_SDRAM_BASE		CONFIG_SYS_DDR_SDRAM_BASE
-#define CONFIG_VERY_BIG_RAM
-
-#define CONFIG_DIMM_SLOTS_PER_CTLR	1
-#define CONFIG_CHIP_SELECTS_PER_CTRL	2
-
-/*
- * The hardware fix for the I2C address collision puts the DDR
- * SPD at 0x53, but if we are running on an older board w/o the
- * fix, it will still be at 0x51.  We check 0x53 1st.
- */
-#define SPD_EEPROM_ADDRESS	0x51	/* CTLR 0 DIMM 0 */
-#define ALT_SPD_EEPROM_ADDRESS	0x53	/* CTLR 0 DIMM 0 */
-
-/*
- * Make sure required options are set
- */
-#ifndef CONFIG_SPD_EEPROM
-	#define CONFIG_SYS_SDRAM_SIZE	256		/* DDR is 256MB */
-	#define CONFIG_SYS_DDR_CONTROL	0xc300c000
-#endif
-
-/*
- * FLASH on the Local Bus
- * Two banks, one 8MB the other 64MB, using the CFI driver.
- * JP12+SW2.8 are used to swap CS0 and CS6, defaults are to have
- * CS0 the 8MB boot flash, and CS6 the 64MB flash.
- *
- *	Default:
- *	ec00_0000	efff_ffff	64MB SODIMM
- *	ff80_0000	ffff_ffff	8MB soldered flash
- *
- *	Alternate:
- *	ef80_0000	efff_ffff	8MB soldered flash
- *	fc00_0000	ffff_ffff	64MB SODIMM
- *
- * BR0_8M:
- *    Base address 0 = 0xff80_0000 = BR0[0:16] = 1111 1111 1000 0000 0
- *    Port Size = 8 bits = BRx[19:20] = 01
- *    Use GPCM = BRx[24:26] = 000
- *    Valid = BRx[31] = 1
- *
- * BR0_64M:
- *    Base address 0 = 0xfc00_0000 = BR0[0:16] = 1111 1100 0000 0000 0
- *    Port Size = 32 bits = BRx[19:20] = 11
- *
- * 0    4    8    12   16   20   24   28
- * 1111 1111 1000 0000 0000 1000 0000 0001 = ff800801    BR0_8M
- * 1111 1100 0000 0000 0001 1000 0000 0001 = fc001801    BR0_64M
- */
-#define CONFIG_SYS_BR0_8M	0xff800801
-#define CONFIG_SYS_BR0_64M	0xfc001801
-
-/*
- * BR6_8M:
- *    Base address 6 = 0xef80_0000 = BR6[0:16] = 1110 1111 1000 0000 0
- *    Port Size = 8 bits = BRx[19:20] = 01
- *    Use GPCM = BRx[24:26] = 000
- *    Valid = BRx[31] = 1
-
- * BR6_64M:
- *    Base address 6 = 0xec00_0000 = BR6[0:16] = 1110 1100 0000 0000 0
- *    Port Size = 32 bits = BRx[19:20] = 11
- *
- * 0    4    8    12   16   20   24   28
- * 1110 1111 1000 0000 0000 1000 0000 0001 = ef800801    BR6_8M
- * 1110 1100 0000 0000 0001 1000 0000 0001 = ec001801    BR6_64M
- */
-#define CONFIG_SYS_BR6_8M	0xef800801
-#define CONFIG_SYS_BR6_64M	0xec001801
-
-/*
- * OR0_8M:
- *    Addr Mask = 8M = OR1[0:16] = 1111 1111 1000 0000 0
- *    XAM = OR0[17:18] = 11
- *    CSNT = OR0[20] = 1
- *    ACS = half cycle delay = OR0[21:22] = 11
- *    SCY = 6 = OR0[24:27] = 0110
- *    TRLX = use relaxed timing = OR0[29] = 1
- *    EAD = use external address latch delay = OR0[31] = 1
- *
- * OR0_64M:
- *    Addr Mask = 64M = OR1[0:16] = 1111 1100 0000 0000 0
- *
- *
- * 0    4    8    12   16   20   24   28
- * 1111 1111 1000 0000 0110 1110 0110 0101 = ff806e65    OR0_8M
- * 1111 1100 0000 0000 0110 1110 0110 0101 = fc006e65    OR0_64M
- */
-#define CONFIG_SYS_OR0_8M	0xff806e65
-#define CONFIG_SYS_OR0_64M	0xfc006e65
-
-/*
- * OR6_8M:
- *    Addr Mask = 8M = OR6[0:16] = 1111 1111 1000 0000 0
- *    XAM = OR6[17:18] = 11
- *    CSNT = OR6[20] = 1
- *    ACS = half cycle delay = OR6[21:22] = 11
- *    SCY = 6 = OR6[24:27] = 0110
- *    TRLX = use relaxed timing = OR6[29] = 1
- *    EAD = use external address latch delay = OR6[31] = 1
- *
- * OR6_64M:
- *    Addr Mask = 64M = OR6[0:16] = 1111 1100 0000 0000 0
- *
- * 0    4    8    12   16   20   24   28
- * 1111 1111 1000 0000 0110 1110 0110 0101 = ff806e65    OR6_8M
- * 1111 1100 0000 0000 0110 1110 0110 0101 = fc006e65    OR6_64M
- */
-#define CONFIG_SYS_OR6_8M	0xff806e65
-#define CONFIG_SYS_OR6_64M	0xfc006e65
-
-#ifndef CONFIG_SYS_ALT_BOOT		/* JP12 in default position */
-#define CONFIG_SYS_BOOT_BLOCK		0xff800000	/* start of 8MB Flash */
-#define CONFIG_SYS_ALT_FLASH		0xec000000	/* 64MB "user" flash */
-
-#define CONFIG_SYS_BR0_PRELIM		CONFIG_SYS_BR0_8M
-#define CONFIG_SYS_OR0_PRELIM		CONFIG_SYS_OR0_8M
-
-#define CONFIG_SYS_BR6_PRELIM		CONFIG_SYS_BR6_64M
-#define CONFIG_SYS_OR6_PRELIM		CONFIG_SYS_OR6_64M
-#else					/* JP12 in alternate position */
-#define CONFIG_SYS_BOOT_BLOCK		0xfc000000	/* start 64MB Flash */
-#define CONFIG_SYS_ALT_FLASH		0xef800000	/* 8MB soldered flash */
-
-#define CONFIG_SYS_BR0_PRELIM		CONFIG_SYS_BR0_64M
-#define CONFIG_SYS_OR0_PRELIM		CONFIG_SYS_OR0_64M
-
-#define CONFIG_SYS_BR6_PRELIM		CONFIG_SYS_BR6_8M
-#define CONFIG_SYS_OR6_PRELIM		CONFIG_SYS_OR6_8M
-#endif
-
-#define CONFIG_SYS_FLASH_BASE		CONFIG_SYS_BOOT_BLOCK
-#define CONFIG_SYS_FLASH_BANKS_LIST	{CONFIG_SYS_FLASH_BASE, \
-					 CONFIG_SYS_ALT_FLASH}
-#define CONFIG_SYS_MAX_FLASH_BANKS	2		/* number of banks */
-#define CONFIG_SYS_MAX_FLASH_SECT	256		/* sectors per device */
-#undef	CONFIG_SYS_FLASH_CHECKSUM
-#define CONFIG_SYS_FLASH_ERASE_TOUT	60000	/* Flash Erase Timeout (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT	500	/* Flash Write Timeout (ms) */
-
-#define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_TEXT_BASE	/* start of monitor */
-
-#define CONFIG_SYS_FLASH_EMPTY_INFO
-
-/* CS5 = Local bus peripherals controlled by the EPLD */
-
-#define CONFIG_SYS_BR5_PRELIM		0xf8000801
-#define CONFIG_SYS_OR5_PRELIM		0xff006e65
-#define CONFIG_SYS_EPLD_BASE		0xf8000000
-#define CONFIG_SYS_LED_DISP_BASE	0xf8000000
-#define CONFIG_SYS_USER_SWITCHES_BASE	0xf8100000
-#define CONFIG_SYS_BD_REV		0xf8300000
-#define CONFIG_SYS_EEPROM_BASE		0xf8b00000
-
-/*
- * SDRAM on the Local Bus (CS3 and CS4)
- * Note that most boards have a hardware errata where both the
- * LBC SDRAM and the DDR2 SDRAM decode at 0x51, making it impossible
- * to use CONFIG_DDR_SPD unless you physically remove the LBC DIMM.
- * A hardware workaround is also available, see README.sbc8548 file.
- */
-#define CONFIG_SYS_LBC_SDRAM_BASE	0xf0000000	/* Localbus SDRAM */
-#define CONFIG_SYS_LBC_SDRAM_SIZE	128		/* LBC SDRAM is 128MB */
-
-/*
- * Base Register 3 and Option Register 3 configure the 1st 1/2 SDRAM.
- * The SDRAM base address, CONFIG_SYS_LBC_SDRAM_BASE, is 0xf0000000.
- *
- * For BR3, need:
- *    Base address of 0xf0000000 = BR[0:16] = 1111 0000 0000 0000 0
- *    port-size = 32-bits = BR2[19:20] = 11
- *    no parity checking = BR2[21:22] = 00
- *    SDRAM for MSEL = BR2[24:26] = 011
- *    Valid = BR[31] = 1
- *
- * 0    4    8    12   16   20   24   28
- * 1111 0000 0000 0000 0001 1000 0110 0001 = f0001861
- *
- */
-
-#define CONFIG_SYS_BR3_PRELIM		0xf0001861
-
-/*
- * The SDRAM size in MB, of 1/2 CONFIG_SYS_LBC_SDRAM_SIZE, is 64.
- *
- * For OR3, need:
- *    64MB mask for AM, OR3[0:7] = 1111 1100
- *		   XAM, OR3[17:18] = 11
- *    10 columns OR3[19-21] = 011
- *    12 rows   OR3[23-25] = 011
- *    EAD set for extra time OR[31] = 0
- *
- * 0    4    8    12   16   20   24   28
- * 1111 1100 0000 0000 0110 1100 1100 0000 = fc006cc0
- */
-
-#define CONFIG_SYS_OR3_PRELIM		0xfc006cc0
-
-/*
- * Base Register 4 and Option Register 4 configure the 2nd 1/2 SDRAM.
- * The base address, (SDRAM_BASE + 1/2*SIZE), is 0xf4000000.
- *
- * For BR4, need:
- *    Base address of 0xf4000000 = BR[0:16] = 1111 0100 0000 0000 0
- *    port-size = 32-bits = BR2[19:20] = 11
- *    no parity checking = BR2[21:22] = 00
- *    SDRAM for MSEL = BR2[24:26] = 011
- *    Valid = BR[31] = 1
- *
- * 0    4    8    12   16   20   24   28
- * 1111 0000 0000 0000 0001 1000 0110 0001 = f4001861
- *
- */
-
-#define CONFIG_SYS_BR4_PRELIM		0xf4001861
-
-/*
- * The SDRAM size in MB, of 1/2 CONFIG_SYS_LBC_SDRAM_SIZE, is 64.
- *
- * For OR4, need:
- *    64MB mask for AM, OR3[0:7] = 1111 1100
- *		   XAM, OR3[17:18] = 11
- *    10 columns OR3[19-21] = 011
- *    12 rows   OR3[23-25] = 011
- *    EAD set for extra time OR[31] = 0
- *
- * 0    4    8    12   16   20   24   28
- * 1111 1100 0000 0000 0110 1100 1100 0000 = fc006cc0
- */
-
-#define CONFIG_SYS_OR4_PRELIM		0xfc006cc0
-
-#define CONFIG_SYS_LBC_LCRR		0x00000002    /* LB clock ratio reg */
-#define CONFIG_SYS_LBC_LBCR		0x00000000    /* LB config reg */
-#define CONFIG_SYS_LBC_LSRT		0x20000000  /* LB sdram refresh timer */
-#define CONFIG_SYS_LBC_MRTPR		0x00000000  /* LB refresh timer prescal*/
-
-/*
- * Common settings for all Local Bus SDRAM commands.
- */
-#define CONFIG_SYS_LBC_LSDMR_COMMON	( LSDMR_RFCR16		\
-				| LSDMR_BSMA1516	\
-				| LSDMR_PRETOACT3	\
-				| LSDMR_ACTTORW3	\
-				| LSDMR_BUFCMD		\
-				| LSDMR_BL8		\
-				| LSDMR_WRC2		\
-				| LSDMR_CL3		\
-				)
-
-#define CONFIG_SYS_LBC_LSDMR_PCHALL	\
-	 (CONFIG_SYS_LBC_LSDMR_COMMON | LSDMR_OP_PCHALL)
-#define CONFIG_SYS_LBC_LSDMR_ARFRSH	\
-	 (CONFIG_SYS_LBC_LSDMR_COMMON | LSDMR_OP_ARFRSH)
-#define CONFIG_SYS_LBC_LSDMR_MRW	\
-	 (CONFIG_SYS_LBC_LSDMR_COMMON | LSDMR_OP_MRW)
-#define CONFIG_SYS_LBC_LSDMR_RFEN	\
-	 (CONFIG_SYS_LBC_LSDMR_COMMON | LSDMR_RFEN)
-
-#define CONFIG_SYS_INIT_RAM_LOCK	1
-#define CONFIG_SYS_INIT_RAM_ADDR	0xe4010000	/* Initial RAM address */
-#define CONFIG_SYS_INIT_RAM_SIZE	0x4000		/* Size of used area in RAM */
-
-#define CONFIG_SYS_INIT_L2_ADDR	0xf8f80000	/* relocate boot L2SRAM */
-
-#define CONFIG_SYS_GBL_DATA_OFFSET	(CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_GBL_DATA_OFFSET
-
-/*
- * For soldered on flash, (128kB/sector) we use 2 sectors for u-boot and
- * one for env+bootpg (CONFIG_SYS_TEXT_BASE=0xfffa_0000, 384kB total).  For SODIMM
- * flash (512kB/sector) we use 1 sector for u-boot, and one for env+bootpg
- * (CONFIG_SYS_TEXT_BASE=0xfff0_0000, 1MB total).  This dynamically sets the right
- * thing for MONITOR_LEN in both cases.
- */
-#define CONFIG_SYS_MONITOR_LEN		(~CONFIG_SYS_TEXT_BASE + 1)
-#define CONFIG_SYS_MALLOC_LEN		(1024 * 1024) /* Reserved for malloc */
-
-/* Serial Port */
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	1
-#define CONFIG_SYS_NS16550_CLK		(400000000 / CONFIG_SYS_CLK_DIV)
-
-#define CONFIG_SYS_BAUDRATE_TABLE \
-	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200}
-
-#define CONFIG_SYS_NS16550_COM1	(CONFIG_SYS_CCSRBAR+0x4500)
-#define CONFIG_SYS_NS16550_COM2	(CONFIG_SYS_CCSRBAR+0x4600)
-
-/*
- * I2C
- */
-#define CONFIG_SYS_I2C
-#define CONFIG_SYS_I2C_FSL
-#define CONFIG_SYS_FSL_I2C_SPEED	400000
-#define CONFIG_SYS_FSL_I2C_SLAVE	0x7F
-#define CONFIG_SYS_FSL_I2C_OFFSET	0x3000
-#define CONFIG_SYS_I2C_EEPROM_ADDR	0x50
-
-/*
- * General PCI
- * Memory space is mapped 1-1, but I/O space must start from 0.
- */
-#define CONFIG_SYS_PCI_VIRT		0x80000000	/* 1G PCI TLB */
-#define CONFIG_SYS_PCI_PHYS		0x80000000	/* 1G PCI TLB */
-
-#define CONFIG_SYS_PCI1_MEM_VIRT	0x80000000
-#define CONFIG_SYS_PCI1_MEM_BUS		0x80000000
-#define CONFIG_SYS_PCI1_MEM_PHYS	0x80000000
-#define CONFIG_SYS_PCI1_MEM_SIZE	0x20000000	/* 512M */
-#define CONFIG_SYS_PCI1_IO_VIRT		0xe2000000
-#define CONFIG_SYS_PCI1_IO_BUS		0x00000000
-#define CONFIG_SYS_PCI1_IO_PHYS		0xe2000000
-#define CONFIG_SYS_PCI1_IO_SIZE		0x00800000	/* 8M */
-
-#ifdef CONFIG_PCIE1
-#define CONFIG_SYS_PCIE1_MEM_VIRT	0xa0000000
-#define CONFIG_SYS_PCIE1_MEM_BUS	0xa0000000
-#define CONFIG_SYS_PCIE1_MEM_PHYS	0xa0000000
-#define CONFIG_SYS_PCIE1_MEM_SIZE	0x20000000	/* 512M */
-#define CONFIG_SYS_PCIE1_IO_VIRT	0xe2800000
-#define CONFIG_SYS_PCIE1_IO_BUS		0x00000000
-#define CONFIG_SYS_PCIE1_IO_PHYS	0xe2800000
-#define CONFIG_SYS_PCIE1_IO_SIZE	0x00800000	/* 8M */
-#endif
-
-#ifdef CONFIG_RIO
-/*
- * RapidIO MMU
- */
-#define CONFIG_SYS_RIO_MEM_BASE	0xC0000000
-#define CONFIG_SYS_RIO_MEM_SIZE	0x20000000	/* 512M */
-#endif
-
-#if defined(CONFIG_PCI)
-
-#define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
-
-#endif	/* CONFIG_PCI */
-
-#if defined(CONFIG_TSEC_ENET)
-
-#define CONFIG_TSEC1	1
-#define CONFIG_TSEC1_NAME	"eTSEC0"
-#define CONFIG_TSEC2	1
-#define CONFIG_TSEC2_NAME	"eTSEC1"
-#undef CONFIG_MPC85XX_FEC
-
-#define TSEC1_PHY_ADDR		0x19
-#define TSEC2_PHY_ADDR		0x1a
-
-#define TSEC1_PHYIDX		0
-#define TSEC2_PHYIDX		0
-
-#define TSEC1_FLAGS		TSEC_GIGABIT
-#define TSEC2_FLAGS		TSEC_GIGABIT
-
-/* Options are: eTSEC[0-3] */
-#define CONFIG_ETHPRIME		"eTSEC0"
-#endif	/* CONFIG_TSEC_ENET */
-
-#define CONFIG_LOADS_ECHO	1	/* echo on for serial download */
-#define CONFIG_SYS_LOADS_BAUD_CHANGE	1	/* allow baudrate change */
-
-/*
- * BOOTP options
- */
-#define CONFIG_BOOTP_BOOTFILESIZE
-
-#undef CONFIG_WATCHDOG			/* watchdog disabled */
-
-/*
- * Miscellaneous configurable options
- */
-#define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-
-/*
- * For booting Linux, the board info and command line data
- * have to be in the first 8 MB of memory, since this is
- * the maximum mapped by the Linux kernel during initialization.
- */
-#define CONFIG_SYS_BOOTMAPSZ	(8 << 20)	/* Initial Memory map for Linux*/
-
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_KGDB_BAUDRATE	230400	/* speed to run kgdb serial port */
-#endif
-
-/*
- * Environment Configuration
- */
-#if defined(CONFIG_TSEC_ENET)
-#define CONFIG_HAS_ETH0
-#define CONFIG_HAS_ETH1
-#endif
-
-#define CONFIG_IPADDR	 192.168.0.55
-
-#define CONFIG_HOSTNAME	 "sbc8548"
-#define CONFIG_ROOTPATH	 "/opt/eldk/ppc_85xx"
-#define CONFIG_BOOTFILE	 "/uImage"
-#define CONFIG_UBOOTPATH /u-boot.bin	/* TFTP server */
-
-#define CONFIG_SERVERIP	 192.168.0.2
-#define CONFIG_GATEWAYIP 192.168.0.1
-#define CONFIG_NETMASK	 255.255.255.0
-
-#define CONFIG_LOADADDR	1000000	/*default location for tftp and bootm*/
-
-#define	CONFIG_EXTRA_ENV_SETTINGS				\
-"netdev=eth0\0"						\
-"uboot=" __stringify(CONFIG_UBOOTPATH) "\0"				\
-"tftpflash=tftpboot $loadaddr $uboot; "			\
-	"protect off " __stringify(CONFIG_SYS_TEXT_BASE) " +$filesize; " \
-	"erase " __stringify(CONFIG_SYS_TEXT_BASE) " +$filesize; "	\
-	"cp.b $loadaddr " __stringify(CONFIG_SYS_TEXT_BASE) " $filesize; " \
-	"protect on " __stringify(CONFIG_SYS_TEXT_BASE) " +$filesize; "	\
-	"cmp.b $loadaddr " __stringify(CONFIG_SYS_TEXT_BASE) " $filesize\0" \
-"consoledev=ttyS0\0"				\
-"ramdiskaddr=2000000\0"			\
-"ramdiskfile=uRamdisk\0"			\
-"fdtaddr=1e00000\0"				\
-"fdtfile=sbc8548.dtb\0"
-
-#define CONFIG_NFSBOOTCOMMAND						\
-   "setenv bootargs root=/dev/nfs rw "					\
-      "nfsroot=$serverip:$rootpath "					\
-      "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
-      "console=$consoledev,$baudrate $othbootargs;"			\
-   "tftp $loadaddr $bootfile;"						\
-   "tftp $fdtaddr $fdtfile;"						\
-   "bootm $loadaddr - $fdtaddr"
-
-#define CONFIG_RAMBOOTCOMMAND \
-   "setenv bootargs root=/dev/ram rw "					\
-      "console=$consoledev,$baudrate $othbootargs;"			\
-   "tftp $ramdiskaddr $ramdiskfile;"					\
-   "tftp $loadaddr $bootfile;"						\
-   "tftp $fdtaddr $fdtfile;"						\
-   "bootm $loadaddr $ramdiskaddr $fdtaddr"
-
-#define CONFIG_BOOTCOMMAND	CONFIG_RAMBOOTCOMMAND
-
-#endif	/* __CONFIG_H */
Signature · 1 line
2.17.1
author
#30 lore raw

PATCH 14/27 ppc: Remove TQM834x board

In reply to Tom Rini

This board has not been converted to CONFIG_DM_PCI by the deadline and is also missing conversion to CONFIG_DM. Remove it.

---
 arch/powerpc/cpu/mpc83xx/Kconfig |   6 -
 board/tqc/tqm834x/Kconfig        |  12 -
 board/tqc/tqm834x/MAINTAINERS    |   6 -
 board/tqc/tqm834x/Makefile       |   9 -
 board/tqc/tqm834x/pci.c          |  98 -------
 board/tqc/tqm834x/tqm834x.c      | 433 -------------------------------
 configs/TQM834x_defconfig        | 166 ------------
 include/configs/TQM834x.h        | 277 --------------------
 8 files changed, 1007 deletions(-)
 delete mode 100644 board/tqc/tqm834x/Kconfig
 delete mode 100644 board/tqc/tqm834x/MAINTAINERS
 delete mode 100644 board/tqc/tqm834x/Makefile
 delete mode 100644 board/tqc/tqm834x/pci.c
 delete mode 100644 board/tqc/tqm834x/tqm834x.c
 delete mode 100644 configs/TQM834x_defconfig
 delete mode 100644 include/configs/TQM834x.h
arch/powerpc/cpu/mpc83xx/Kconfig +0 -6
index e751daac6e2d..a67216a2f460 100644
@@ -89,11 +89,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
@@ -277,7 +272,6 @@ source "board/freescale/mpc8349emds/Kconfig"
 source "board/freescale/mpc837xerdb/Kconfig"
 source "board/ids/ids8313/Kconfig"
 source "board/keymile/Kconfig"
-source "board/tqc/tqm834x/Kconfig"
 source "board/gdsys/mpc8308/Kconfig"
 
 endmenu
board/tqc/tqm834x/Kconfig deleted +0 -12
deleted file mode 100644
index 028b8466e8a4..000000000000
@@ -1,12 +0,0 @@
-if TARGET_TQM834X
-
-config SYS_BOARD
-	default "tqm834x"
-
-config SYS_VENDOR
-	default "tqc"
-
-config SYS_CONFIG_NAME
-	default "TQM834x"
-
-endif
board/tqc/tqm834x/MAINTAINERS deleted +0 -6
deleted file mode 100644
index 543ab1b55283..000000000000
@@ -1,6 +0,0 @@
-TQM834X BOARD
-#M:	-
-S:	Maintained
-F:	board/tqc/tqm834x/
-F:	include/configs/TQM834x.h
-F:	configs/TQM834x_defconfig
board/tqc/tqm834x/Makefile deleted +0 -9
deleted file mode 100644
index 3aafbf79285d..000000000000
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2006
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
-# Copyright 2004 Freescale Semiconductor, Inc.
-
-obj-y += tqm834x.o
-obj-$(CONFIG_PCI) += pci.o
board/tqc/tqm834x/pci.c deleted +0 -98

98 lines not on this page · raw message

board/tqc/tqm834x/tqm834x.c deleted +0 -433

433 lines not on this page · raw message

configs/TQM834x_defconfig deleted +0 -166

166 lines not on this page · raw message

include/configs/TQM834x.h deleted +0 -277

277 lines not on this page · raw message

Signature · 1 line
2.17.1
author
#31 lore raw

Re: [PATCH 14/27] ppc: Remove TQM834x board

Quoted 4 lines · Tom Rini

This board has not been converted to CONFIG_DM_PCI by the deadline and is also missing conversion to CONFIG_DM. Remove it.

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
author
#32 lore raw

PATCH 15/27 ppc: Remove MPC8541CDS board

In reply to Tom Rini

This board has not been converted to CONFIG_DM_PCI by the deadline and is also missing conversion to CONFIG_DM. Remove it. As this is the only MPC8541 target left, remove that architecture support as well.

Cc Priyanka Jain <[email protected]>
---
 arch/powerpc/cpu/mpc85xx/Kconfig        |  18 +-
 arch/powerpc/cpu/mpc85xx/cpu.c          |   4 +-
 arch/powerpc/cpu/mpc85xx/pci.c          |   2 +-
 arch/powerpc/cpu/mpc85xx/speed.c        |   4 +-
 arch/powerpc/include/asm/cpm_85xx.h     |   2 +-
 arch/powerpc/include/asm/fsl_lbc.h      |   3 +-
 arch/powerpc/include/asm/immap_85xx.h   |   1 -
 board/freescale/common/Makefile         |   1 -
 board/freescale/mpc8541cds/Kconfig      |  12 -
 board/freescale/mpc8541cds/MAINTAINERS  |   7 -
 board/freescale/mpc8541cds/Makefile     |  10 -
 board/freescale/mpc8541cds/ddr.c        |  53 ---
 board/freescale/mpc8541cds/law.c        |  41 ---
 board/freescale/mpc8541cds/mpc8541cds.c | 429 ------------------------
 board/freescale/mpc8541cds/tlb.c        |  95 ------
 configs/MPC8541CDS_defconfig            |  40 ---
 configs/MPC8541CDS_legacy_defconfig     |  41 ---
 drivers/ddr/fsl/ctrl_regs.c             |   2 +-
 drivers/ddr/fsl/mpc85xx_ddr_gen1.c      |   2 +-
 include/configs/MPC8541CDS.h            | 384 ---------------------
 20 files changed, 10 insertions(+), 1141 deletions(-)
 delete mode 100644 board/freescale/mpc8541cds/Kconfig
 delete mode 100644 board/freescale/mpc8541cds/MAINTAINERS
 delete mode 100644 board/freescale/mpc8541cds/Makefile
 delete mode 100644 board/freescale/mpc8541cds/ddr.c
 delete mode 100644 board/freescale/mpc8541cds/law.c
 delete mode 100644 board/freescale/mpc8541cds/mpc8541cds.c
 delete mode 100644 board/freescale/mpc8541cds/tlb.c
 delete mode 100644 configs/MPC8541CDS_defconfig
 delete mode 100644 configs/MPC8541CDS_legacy_defconfig
 delete mode 100644 include/configs/MPC8541CDS.h
arch/powerpc/cpu/mpc85xx/Kconfig +1 -17
index 22cfa4dc3499..0b1385695283 100644
@@ -44,11 +44,6 @@ config TARGET_P5040DS
 	imply CMD_SATA
 	imply PANIC_HANG
 
-config TARGET_MPC8541CDS
-	bool "Support MPC8541CDS"
-	select ARCH_MPC8541
-	select FSL_VIA
-
 config TARGET_MPC8548CDS
 	bool "Support MPC8548CDS"
 	select ARCH_MPC8548
@@ -364,14 +359,6 @@ config ARCH_MPC8540
 	select FSL_LAW
 	select SYS_FSL_HAS_DDR1
 
-config ARCH_MPC8541
-	bool
-	select FSL_LAW
-	select SYS_FSL_HAS_DDR1
-	select SYS_FSL_HAS_SEC
-	select SYS_FSL_SEC_BE
-	select SYS_FSL_SEC_COMPAT_2
-
 config ARCH_MPC8544
 	bool
 	select FSL_LAW
@@ -959,7 +946,6 @@ config SYS_CCSRBAR_DEFAULT
 				ARCH_C29X	|| \
 				ARCH_MPC8536	|| \
 				ARCH_MPC8540	|| \
-				ARCH_MPC8541	|| \
 				ARCH_MPC8544	|| \
 				ARCH_MPC8548	|| \
 				ARCH_MPC8555	|| \
@@ -1193,7 +1179,6 @@ config SYS_FSL_NUM_LAWS
 			ARCH_MPC8548	|| \
 			ARCH_MPC8568
 	default 8 if	ARCH_MPC8540	|| \
-			ARCH_MPC8541	|| \
 			ARCH_MPC8555	|| \
 			ARCH_MPC8560
 	help
@@ -1267,7 +1252,7 @@ config SYS_FSL_IFC_CLK_DIV
 config SYS_FSL_LBC_CLK_DIV
 	int "Divider of platform clock"
 	depends on FSL_ELBC || ARCH_MPC8540 || \
-		ARCH_MPC8548 || ARCH_MPC8541 || \
+		ARCH_MPC8548 || \
 		ARCH_MPC8555 || ARCH_MPC8560 || \
 		ARCH_MPC8568
 
@@ -1286,7 +1271,6 @@ config FSL_VIA
 
 source "board/emulation/qemu-ppce500/Kconfig"
 source "board/freescale/corenet_ds/Kconfig"
-source "board/freescale/mpc8541cds/Kconfig"
 source "board/freescale/mpc8548cds/Kconfig"
 source "board/freescale/mpc8555cds/Kconfig"
 source "board/freescale/mpc8568mds/Kconfig"
arch/powerpc/cpu/mpc85xx/cpu.c +2 -2
index fc25bb28ad12..e8126c98f898 100644
@@ -301,8 +301,8 @@ int checkcpu (void)
 int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
 /* Everything after the first generation of PQ3 parts has RSTCR */
-#if defined(CONFIG_ARCH_MPC8540) || defined(CONFIG_ARCH_MPC8541) || \
-	defined(CONFIG_ARCH_MPC8555) || defined(CONFIG_ARCH_MPC8560)
+#if defined(CONFIG_ARCH_MPC8540) || defined(CONFIG_ARCH_MPC8555) || \
+	defined(CONFIG_ARCH_MPC8560)
 	unsigned long val, msr;
 
 	/*
arch/powerpc/cpu/mpc85xx/pci.c +1 -1
index 9a6fc13b73f1..559730181ef1 100644
@@ -120,7 +120,7 @@ pci_mpc85xx_init(struct pci_controller *board_hose)
 
 	pci_register_hose(hose);
 
-#if defined(CONFIG_TARGET_MPC8555CDS) || defined(CONFIG_TARGET_MPC8541CDS)
+#if defined(CONFIG_TARGET_MPC8555CDS)
 	/*
 	 * This is a SW workaround for an apparent HW problem
 	 * in the PCI controller on the MPC85555/41 CDS boards.
arch/powerpc/cpu/mpc85xx/speed.c +2 -2
index 864c53ce2ecb..90c9fe1af51b 100644
@@ -607,8 +607,8 @@ int get_clocks(void)
 	 * for that SOC. This information is taken from application note
 	 * AN2919.
 	 */
-#if defined(CONFIG_ARCH_MPC8540) || defined(CONFIG_ARCH_MPC8541) || \
-	defined(CONFIG_ARCH_MPC8560) || defined(CONFIG_ARCH_MPC8555)
+#if defined(CONFIG_ARCH_MPC8540) || defined(CONFIG_ARCH_MPC8560) || \
+	defined(CONFIG_ARCH_MPC8555)
 	gd->arch.i2c1_clk = sys_info.freq_systembus;
 #elif defined(CONFIG_ARCH_MPC8544)
 	/*
arch/powerpc/include/asm/cpm_85xx.h +1 -1
index b46e20e5ce89..e6f1fab5fb95 100644
@@ -77,7 +77,7 @@
  */
 #define CPM_DATAONLY_BASE	((uint)128)
 #define CPM_DP_NOSPACE		((uint)0x7FFFFFFF)
-#if defined(CONFIG_ARCH_MPC8541) || defined(CONFIG_ARCH_MPC8555)
+#if defined(CONFIG_ARCH_MPC8555)
 #define CPM_FCC_SPECIAL_BASE	((uint)0x00009000)
 #define CPM_DATAONLY_SIZE	((uint)(8 * 1024) - CPM_DATAONLY_BASE)
 #else	/* MPC8540, MPC8560 */
arch/powerpc/include/asm/fsl_lbc.h +1 -2
index bf352d9a5617..ae176082760f 100644
@@ -325,8 +325,7 @@ void lbc_sdram_init(void);
 #define LCRR_CLKDIV			0x0000001F
 #define LCRR_CLKDIV_SHIFT		0
 #if defined(CONFIG_MPC83xx) || defined(CONFIG_ARCH_MPC8540) || \
-	defined(CONFIG_ARCH_MPC8541) || defined(CONFIG_ARCH_MPC8555) || \
-	defined(CONFIG_ARCH_MPC8560)
+	defined(CONFIG_ARCH_MPC8555) || defined(CONFIG_ARCH_MPC8560)
 #define LCRR_CLKDIV_2			0x00000002
 #define LCRR_CLKDIV_4			0x00000004
 #define LCRR_CLKDIV_8			0x00000008
arch/powerpc/include/asm/immap_85xx.h +0 -1
index 59bc32fd172b..b6770c4cf4d3 100644
@@ -124,7 +124,6 @@ typedef struct ccsr_i2c {
 } ccsr_i2c_t;
 
 #if defined(CONFIG_ARCH_MPC8540) || \
-	defined(CONFIG_ARCH_MPC8541) || \
 	defined(CONFIG_ARCH_MPC8548) || \
 	defined(CONFIG_ARCH_MPC8555)
 /* DUART Registers */
board/freescale/common/Makefile +0 -1
index 114b7ba8f9f9..5d18567332fe 100644
@@ -43,7 +43,6 @@ endif
 
 obj-$(CONFIG_FSL_DCU_SII9022A)    += dcu_sii9022a.o
 
-obj-$(CONFIG_TARGET_MPC8541CDS)	+= cds_pci_ft.o
 obj-$(CONFIG_TARGET_MPC8548CDS)	+= cds_pci_ft.o
 obj-$(CONFIG_TARGET_MPC8555CDS)	+= cds_pci_ft.o
 
board/freescale/mpc8541cds/Kconfig deleted +0 -12
deleted file mode 100644
index 034eab25443d..000000000000
@@ -1,12 +0,0 @@
-if TARGET_MPC8541CDS
-
-config SYS_BOARD
-	default "mpc8541cds"
-
-config SYS_VENDOR
-	default "freescale"
-
-config SYS_CONFIG_NAME
-	default "MPC8541CDS"
-
-endif
board/freescale/mpc8541cds/MAINTAINERS deleted +0 -7
deleted file mode 100644
index cf3b9cf5f723..000000000000
@@ -1,7 +0,0 @@
-MPC8541CDS BOARD
-M:	Priyanka Jain <[email protected]>
-S:	Maintained
-F:	board/freescale/mpc8541cds/
-F:	include/configs/MPC8541CDS.h
-F:	configs/MPC8541CDS_defconfig
-F:	configs/MPC8541CDS_legacy_defconfig
board/freescale/mpc8541cds/Makefile deleted +0 -10
deleted file mode 100644
index b2b721ac92d2..000000000000
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright 2004 Freescale Semiconductor.
-# (C) Copyright 2001-2006
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-
-obj-y	+= mpc8541cds.o
-obj-y	+= ddr.o
-obj-y	+= law.o
-obj-y	+= tlb.o
board/freescale/mpc8541cds/ddr.c deleted +0 -53

53 lines not on this page · raw message

board/freescale/mpc8541cds/law.c deleted +0 -41

41 lines not on this page · raw message

board/freescale/mpc8541cds/mpc8541cds.c deleted +0 -429

429 lines not on this page · raw message

board/freescale/mpc8541cds/tlb.c deleted +0 -95

95 lines not on this page · raw message

configs/MPC8541CDS_defconfig deleted +0 -40
deleted file mode 100644
index cd2d19594e9d..000000000000
@@ -1,40 +0,0 @@
-CONFIG_PPC=y
-CONFIG_SYS_TEXT_BASE=0xfff80000
-CONFIG_ENV_SIZE=0x2000
-CONFIG_ENV_SECT_SIZE=0x40000
-CONFIG_MPC85xx=y
-# CONFIG_CMD_ERRATA is not set
-CONFIG_TARGET_MPC8541CDS=y
-CONFIG_OF_BOARD_SETUP=y
-CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_BOOTDELAY=10
-# CONFIG_MISC_INIT_R is not set
-CONFIG_HUSH_PARSER=y
-CONFIG_CMD_REGINFO=y
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_PCI=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-# CONFIG_CMD_HASH is not set
-CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xFFFC0000
-# CONFIG_MMC is not set
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_PHY_ATHEROS=y
-CONFIG_PHY_BROADCOM=y
-CONFIG_PHY_DAVICOM=y
-CONFIG_PHY_LXT=y
-CONFIG_PHY_MARVELL=y
-CONFIG_PHY_NATSEMI=y
-CONFIG_PHY_REALTEK=y
-CONFIG_PHY_SMSC=y
-CONFIG_PHY_VITESSE=y
-CONFIG_MII=y
-CONFIG_TSEC_ENET=y
-CONFIG_CONS_INDEX=2
-CONFIG_SYS_NS16550=y
-CONFIG_OF_LIBFDT=y
configs/MPC8541CDS_legacy_defconfig deleted +0 -41

41 lines not on this page · raw message

drivers/ddr/fsl/ctrl_regs.c +1 -1
index c849ef3a4c7e..b80034478e11 100644
@@ -1866,7 +1866,7 @@ static void set_ddr_sdram_clk_cntl(fsl_ddr_cfg_regs_t *ddr,
 	unsigned int clk_adjust;	/* Clock adjust */
 	unsigned int ss_en = 0;		/* Source synchronous enable */
 
-#if defined(CONFIG_ARCH_MPC8541) || defined(CONFIG_ARCH_MPC8555)
+#if defined(CONFIG_ARCH_MPC8555)
 	/* Per FSL Application Note: AN2805 */
 	ss_en = 1;
 #endif
drivers/ddr/fsl/mpc85xx_ddr_gen1.c +1 -1
index 572f3703d51a..c642a5b1eec4 100644
@@ -48,7 +48,7 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,
 	out_be32(&ddr->timing_cfg_2, regs->timing_cfg_2);
 	out_be32(&ddr->sdram_mode, regs->ddr_sdram_mode);
 	out_be32(&ddr->sdram_interval, regs->ddr_sdram_interval);
-#if defined(CONFIG_ARCH_MPC8555) || defined(CONFIG_ARCH_MPC8541)
+#if defined(CONFIG_ARCH_MPC8555)
 	out_be32(&ddr->sdram_clk_cntl, regs->ddr_sdram_clk_cntl);
 #endif
 
include/configs/MPC8541CDS.h deleted +0 -384

384 lines not on this page · raw message

Signature · 1 line
2.17.1
author
#33 lore raw

Re: [PATCH 15/27] ppc: Remove MPC8541CDS board

Quoted 6 lines · Tom Rini

This board has not been converted to CONFIG_DM_PCI by the deadline and is also missing conversion to CONFIG_DM. Remove it. As this is the only MPC8541 target left, remove that architecture support as well.

Cc Priyanka Jain <[email protected]>

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
author
#34 lore raw

PATCH 16/27 ppc: Remove MPC8555CDS boards

In reply to Tom Rini

These boards have not been converted to CONFIG_DM_PCI by the deadline and is also missing conversion to CONFIG_DM. Remove them. As this is the only ARCH_MPC8555 platform left, remove that support as well.

Cc Priyanka Jain <[email protected]>
---
 arch/powerpc/cpu/mpc85xx/Kconfig        |  18 +-
 arch/powerpc/cpu/mpc85xx/cpu.c          |   3 +-
 arch/powerpc/cpu/mpc85xx/pci.c          |  23 --
 arch/powerpc/cpu/mpc85xx/speed.c        |   3 +-
 arch/powerpc/include/asm/cpm_85xx.h     |   5 -
 arch/powerpc/include/asm/fsl_lbc.h      |   2 +-
 arch/powerpc/include/asm/immap_85xx.h   |   3 +-
 board/freescale/common/Makefile         |   1 -
 board/freescale/mpc8555cds/Kconfig      |  12 -
 board/freescale/mpc8555cds/MAINTAINERS  |   7 -
 board/freescale/mpc8555cds/Makefile     |  10 -
 board/freescale/mpc8555cds/ddr.c        |  53 ---
 board/freescale/mpc8555cds/law.c        |  41 ---
 board/freescale/mpc8555cds/mpc8555cds.c | 430 ------------------------
 board/freescale/mpc8555cds/tlb.c        |  95 ------
 configs/MPC8555CDS_defconfig            |  40 ---
 configs/MPC8555CDS_legacy_defconfig     |  41 ---
 drivers/ddr/fsl/ctrl_regs.c             |  20 +-
 drivers/ddr/fsl/mpc85xx_ddr_gen1.c      |   3 -
 include/configs/MPC8555CDS.h            | 380 ---------------------
 20 files changed, 9 insertions(+), 1181 deletions(-)
 delete mode 100644 board/freescale/mpc8555cds/Kconfig
 delete mode 100644 board/freescale/mpc8555cds/MAINTAINERS
 delete mode 100644 board/freescale/mpc8555cds/Makefile
 delete mode 100644 board/freescale/mpc8555cds/ddr.c
 delete mode 100644 board/freescale/mpc8555cds/law.c
 delete mode 100644 board/freescale/mpc8555cds/mpc8555cds.c
 delete mode 100644 board/freescale/mpc8555cds/tlb.c
 delete mode 100644 configs/MPC8555CDS_defconfig
 delete mode 100644 configs/MPC8555CDS_legacy_defconfig
 delete mode 100644 include/configs/MPC8555CDS.h
arch/powerpc/cpu/mpc85xx/Kconfig +1 -17
index 0b1385695283..891db4e37810 100644
@@ -49,11 +49,6 @@ config TARGET_MPC8548CDS
 	select ARCH_MPC8548
 	select FSL_VIA
 
-config TARGET_MPC8555CDS
-	bool "Support MPC8555CDS"
-	select ARCH_MPC8555
-	select FSL_VIA
-
 config TARGET_MPC8568MDS
 	bool "Support MPC8568MDS"
 	select ARCH_MPC8568
@@ -388,14 +383,6 @@ config ARCH_MPC8548
 	select SYS_PPC_E500_USE_DEBUG_TLB
 	imply CMD_REGINFO
 
-config ARCH_MPC8555
-	bool
-	select FSL_LAW
-	select SYS_FSL_HAS_DDR1
-	select SYS_FSL_HAS_SEC
-	select SYS_FSL_SEC_BE
-	select SYS_FSL_SEC_COMPAT_2
-
 config ARCH_MPC8560
 	bool
 	select FSL_LAW
@@ -948,7 +935,6 @@ config SYS_CCSRBAR_DEFAULT
 				ARCH_MPC8540	|| \
 				ARCH_MPC8544	|| \
 				ARCH_MPC8548	|| \
-				ARCH_MPC8555	|| \
 				ARCH_MPC8560	|| \
 				ARCH_MPC8568	|| \
 				ARCH_MPC8572	|| \
@@ -1179,7 +1165,6 @@ config SYS_FSL_NUM_LAWS
 			ARCH_MPC8548	|| \
 			ARCH_MPC8568
 	default 8 if	ARCH_MPC8540	|| \
-			ARCH_MPC8555	|| \
 			ARCH_MPC8560
 	help
 		Number of local access windows. This is fixed per SoC.
@@ -1253,7 +1238,7 @@ config SYS_FSL_LBC_CLK_DIV
 	int "Divider of platform clock"
 	depends on FSL_ELBC || ARCH_MPC8540 || \
 		ARCH_MPC8548 || \
-		ARCH_MPC8555 || ARCH_MPC8560 || \
+		ARCH_MPC8560 || \
 		ARCH_MPC8568
 
 	default 2 if	ARCH_P2041	|| \
@@ -1272,7 +1257,6 @@ config FSL_VIA
 source "board/emulation/qemu-ppce500/Kconfig"
 source "board/freescale/corenet_ds/Kconfig"
 source "board/freescale/mpc8548cds/Kconfig"
-source "board/freescale/mpc8555cds/Kconfig"
 source "board/freescale/mpc8568mds/Kconfig"
 source "board/freescale/p1010rdb/Kconfig"
 source "board/freescale/p1_p2_rdb_pc/Kconfig"
arch/powerpc/cpu/mpc85xx/cpu.c +1 -2
index e8126c98f898..610a8ec43f5b 100644
@@ -301,8 +301,7 @@ int checkcpu (void)
 int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
 /* Everything after the first generation of PQ3 parts has RSTCR */
-#if defined(CONFIG_ARCH_MPC8540) || defined(CONFIG_ARCH_MPC8555) || \
-	defined(CONFIG_ARCH_MPC8560)
+#if defined(CONFIG_ARCH_MPC8540) || defined(CONFIG_ARCH_MPC8560)
 	unsigned long val, msr;
 
 	/*
arch/powerpc/cpu/mpc85xx/pci.c +0 -23
index 559730181ef1..b7835c0fee54 100644
@@ -120,29 +120,6 @@ pci_mpc85xx_init(struct pci_controller *board_hose)
 
 	pci_register_hose(hose);
 
-#if defined(CONFIG_TARGET_MPC8555CDS)
-	/*
-	 * This is a SW workaround for an apparent HW problem
-	 * in the PCI controller on the MPC85555/41 CDS boards.
-	 * The first config cycle must be to a valid, known
-	 * device on the PCI bus in order to trick the PCI
-	 * controller state machine into a known valid state.
-	 * Without this, the first config cycle has the chance
-	 * of hanging the controller permanently, just leaving
-	 * it in a semi-working state, or leaving it working.
-	 *
-	 * Pick on the Tundra, Device 17, to get it right.
-	 */
-	{
-		u8 header_type;
-
-		pci_hose_read_config_byte(hose,
-					  PCI_BDF(0,BRIDGE_ID,0),
-					  PCI_HEADER_TYPE,
-					  &header_type);
-	}
-#endif
-
 	hose->last_busno = pci_hose_scan(hose);
 
 #ifdef CONFIG_MPC85XX_PCI2
arch/powerpc/cpu/mpc85xx/speed.c +1 -2
index 90c9fe1af51b..26067dd7132c 100644
@@ -607,8 +607,7 @@ int get_clocks(void)
 	 * for that SOC. This information is taken from application note
 	 * AN2919.
 	 */
-#if defined(CONFIG_ARCH_MPC8540) || defined(CONFIG_ARCH_MPC8560) || \
-	defined(CONFIG_ARCH_MPC8555)
+#if defined(CONFIG_ARCH_MPC8540) || defined(CONFIG_ARCH_MPC8560)
 	gd->arch.i2c1_clk = sys_info.freq_systembus;
 #elif defined(CONFIG_ARCH_MPC8544)
 	/*
arch/powerpc/include/asm/cpm_85xx.h +0 -5
index e6f1fab5fb95..d42469c6e056 100644
@@ -77,13 +77,8 @@
  */
 #define CPM_DATAONLY_BASE	((uint)128)
 #define CPM_DP_NOSPACE		((uint)0x7FFFFFFF)
-#if defined(CONFIG_ARCH_MPC8555)
-#define CPM_FCC_SPECIAL_BASE	((uint)0x00009000)
-#define CPM_DATAONLY_SIZE	((uint)(8 * 1024) - CPM_DATAONLY_BASE)
-#else	/* MPC8540, MPC8560 */
 #define CPM_FCC_SPECIAL_BASE	((uint)0x0000B000)
 #define CPM_DATAONLY_SIZE	((uint)(16 * 1024) - CPM_DATAONLY_BASE)
-#endif
 
 /* The number of pages of host memory we allocate for CPM.  This is
  * done early in kernel initialization to get physically contiguous
arch/powerpc/include/asm/fsl_lbc.h +1 -1
index ae176082760f..3b26451928a0 100644
@@ -325,7 +325,7 @@ void lbc_sdram_init(void);
 #define LCRR_CLKDIV			0x0000001F
 #define LCRR_CLKDIV_SHIFT		0
 #if defined(CONFIG_MPC83xx) || defined(CONFIG_ARCH_MPC8540) || \
-	defined(CONFIG_ARCH_MPC8555) || defined(CONFIG_ARCH_MPC8560)
+	defined(CONFIG_ARCH_MPC8560)
 #define LCRR_CLKDIV_2			0x00000002
 #define LCRR_CLKDIV_4			0x00000004
 #define LCRR_CLKDIV_8			0x00000008
arch/powerpc/include/asm/immap_85xx.h +1 -2
index b6770c4cf4d3..1411b3f38b94 100644
@@ -124,8 +124,7 @@ typedef struct ccsr_i2c {
 } ccsr_i2c_t;
 
 #if defined(CONFIG_ARCH_MPC8540) || \
-	defined(CONFIG_ARCH_MPC8548) || \
-	defined(CONFIG_ARCH_MPC8555)
+	defined(CONFIG_ARCH_MPC8548)
 /* DUART Registers */
 typedef struct ccsr_duart {
 	u8	res1[1280];
board/freescale/common/Makefile +0 -1
index 5d18567332fe..7862a791ac54 100644
@@ -44,7 +44,6 @@ endif
 obj-$(CONFIG_FSL_DCU_SII9022A)    += dcu_sii9022a.o
 
 obj-$(CONFIG_TARGET_MPC8548CDS)	+= cds_pci_ft.o
-obj-$(CONFIG_TARGET_MPC8555CDS)	+= cds_pci_ft.o
 
 obj-$(CONFIG_TARGET_MPC8536DS)	+= ics307_clk.o
 obj-$(CONFIG_TARGET_P1022DS)		+= ics307_clk.o
board/freescale/mpc8555cds/Kconfig deleted +0 -12
deleted file mode 100644
index 04bd572212a0..000000000000
@@ -1,12 +0,0 @@
-if TARGET_MPC8555CDS
-
-config SYS_BOARD
-	default "mpc8555cds"
-
-config SYS_VENDOR
-	default "freescale"
-
-config SYS_CONFIG_NAME
-	default "MPC8555CDS"
-
-endif
board/freescale/mpc8555cds/MAINTAINERS deleted +0 -7
deleted file mode 100644
index 8f32febd9147..000000000000
@@ -1,7 +0,0 @@
-MPC8555CDS BOARD
-M:	Priyanka Jain <[email protected]>
-S:	Maintained
-F:	board/freescale/mpc8555cds/
-F:	include/configs/MPC8555CDS.h
-F:	configs/MPC8555CDS_defconfig
-F:	configs/MPC8555CDS_legacy_defconfig
board/freescale/mpc8555cds/Makefile deleted +0 -10
deleted file mode 100644
index f121c2fa6b2a..000000000000
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright 2004 Freescale Semiconductor.
-# (C) Copyright 2001-2006
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-
-obj-y	+= mpc8555cds.o
-obj-y	+= ddr.o
-obj-y	+= law.o
-obj-y	+= tlb.o
board/freescale/mpc8555cds/ddr.c deleted +0 -53

53 lines not on this page · raw message

board/freescale/mpc8555cds/law.c deleted +0 -41

41 lines not on this page · raw message

board/freescale/mpc8555cds/mpc8555cds.c deleted +0 -430

430 lines not on this page · raw message

board/freescale/mpc8555cds/tlb.c deleted +0 -95

95 lines not on this page · raw message

configs/MPC8555CDS_defconfig deleted +0 -40
deleted file mode 100644
index e7a5ca00b980..000000000000
@@ -1,40 +0,0 @@
-CONFIG_PPC=y
-CONFIG_SYS_TEXT_BASE=0xfff80000
-CONFIG_ENV_SIZE=0x2000
-CONFIG_ENV_SECT_SIZE=0x40000
-CONFIG_MPC85xx=y
-# CONFIG_CMD_ERRATA is not set
-CONFIG_TARGET_MPC8555CDS=y
-CONFIG_OF_BOARD_SETUP=y
-CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_BOOTDELAY=10
-# CONFIG_MISC_INIT_R is not set
-CONFIG_HUSH_PARSER=y
-CONFIG_CMD_REGINFO=y
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_PCI=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-# CONFIG_CMD_HASH is not set
-CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xFFFC0000
-# CONFIG_MMC is not set
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_PHY_ATHEROS=y
-CONFIG_PHY_BROADCOM=y
-CONFIG_PHY_DAVICOM=y
-CONFIG_PHY_LXT=y
-CONFIG_PHY_MARVELL=y
-CONFIG_PHY_NATSEMI=y
-CONFIG_PHY_REALTEK=y
-CONFIG_PHY_SMSC=y
-CONFIG_PHY_VITESSE=y
-CONFIG_MII=y
-CONFIG_TSEC_ENET=y
-CONFIG_CONS_INDEX=2
-CONFIG_SYS_NS16550=y
-CONFIG_OF_LIBFDT=y
configs/MPC8555CDS_legacy_defconfig deleted +0 -41

41 lines not on this page · raw message

drivers/ddr/fsl/ctrl_regs.c +4 -16
index b80034478e11..b5122d1a1c37 100644
@@ -1863,25 +1863,13 @@ static void set_ddr_data_init(fsl_ddr_cfg_regs_t *ddr)
 static void set_ddr_sdram_clk_cntl(fsl_ddr_cfg_regs_t *ddr,
 					 const memctl_options_t *popts)
 {
-	unsigned int clk_adjust;	/* Clock adjust */
-	unsigned int ss_en = 0;		/* Source synchronous enable */
-
-#if defined(CONFIG_ARCH_MPC8555)
-	/* Per FSL Application Note: AN2805 */
-	ss_en = 1;
-#endif
-	if (fsl_ddr_get_version(0) >= 0x40701) {
+	if (fsl_ddr_get_version(0) >= 0x40701)
 		/* clk_adjust in 5-bits on T-series and LS-series */
-		clk_adjust = (popts->clk_adjust & 0x1F) << 22;
-	} else {
+		ddr->ddr_sdram_clk_cntl = (popts->clk_adjust & 0x1F) << 22;
+	else
 		/* clk_adjust in 4-bits on earlier MPC85xx and P-series */
-		clk_adjust = (popts->clk_adjust & 0xF) << 23;
-	}
+		ddr->ddr_sdram_clk_cntl = (popts->clk_adjust & 0xF) << 23;
 
-	ddr->ddr_sdram_clk_cntl = (0
-				   | ((ss_en & 0x1) << 31)
-				   | clk_adjust
-				   );
 	debug("FSLDDR: clk_cntl = 0x%08x\n", ddr->ddr_sdram_clk_cntl);
 }
 
drivers/ddr/fsl/mpc85xx_ddr_gen1.c +0 -3
index c642a5b1eec4..9c2ddeaf932f 100644
@@ -48,9 +48,6 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,
 	out_be32(&ddr->timing_cfg_2, regs->timing_cfg_2);
 	out_be32(&ddr->sdram_mode, regs->ddr_sdram_mode);
 	out_be32(&ddr->sdram_interval, regs->ddr_sdram_interval);
-#if defined(CONFIG_ARCH_MPC8555)
-	out_be32(&ddr->sdram_clk_cntl, regs->ddr_sdram_clk_cntl);
-#endif
 
 	/*
 	 * 200 painful micro-seconds must elapse between
include/configs/MPC8555CDS.h deleted +0 -380

380 lines not on this page · raw message

Signature · 1 line
2.17.1
author
#35 lore raw

Re: [PATCH 16/27] ppc: Remove MPC8555CDS boards

Quoted 6 lines · Tom Rini

These boards have not been converted to CONFIG_DM_PCI by the deadline and is also missing conversion to CONFIG_DM. Remove them. As this is the only ARCH_MPC8555 platform left, remove that support as well.

Cc Priyanka Jain <[email protected]>

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
author
#36 lore raw

PATCH 17/27 ppc: Remove T1023RBD boards and T1024RDB_SECURE_BOOT

In reply to Tom Rini

These boards have not been converted to CONFIG_DM_PCI by the deadline and is also missing conversion to CONFIG_DM. Remove them. As this is the only ARCH_T1023 platform left, remove that support as well.

Cc Priyanka Jain <[email protected]>
---
 arch/powerpc/cpu/mpc85xx/Kconfig           | 37 +---------
 arch/powerpc/cpu/mpc85xx/Makefile          |  2 -
 arch/powerpc/cpu/mpc85xx/speed.c           |  4 +-
 arch/powerpc/include/asm/config_mpc85xx.h  |  2 +-
 arch/powerpc/include/asm/fsl_secure_boot.h |  1 -
 arch/powerpc/include/asm/immap_85xx.h      |  4 +-
 board/freescale/t102xrdb/MAINTAINERS       |  5 --
 configs/T1023RDB_NAND_defconfig            | 80 ----------------------
 configs/T1023RDB_SDCARD_defconfig          | 77 ---------------------
 configs/T1023RDB_SPIFLASH_defconfig        | 79 ---------------------
 configs/T1023RDB_defconfig                 | 64 -----------------
 configs/T1024RDB_SECURE_BOOT_defconfig     | 70 -------------------
 drivers/net/Kconfig                        |  1 -
 drivers/net/fm/Makefile                    |  1 -
 14 files changed, 6 insertions(+), 421 deletions(-)
 delete mode 100644 configs/T1023RDB_NAND_defconfig
 delete mode 100644 configs/T1023RDB_SDCARD_defconfig
 delete mode 100644 configs/T1023RDB_SPIFLASH_defconfig
 delete mode 100644 configs/T1023RDB_defconfig
 delete mode 100644 configs/T1024RDB_SECURE_BOOT_defconfig
arch/powerpc/cpu/mpc85xx/Kconfig +1 -36
index 891db4e37810..0a2921ddb323 100644
@@ -113,16 +113,6 @@ config TARGET_QEMU_PPCE500
 	select ARCH_QEMU_E500
 	select PHYS_64BIT
 
-config TARGET_T1023RDB
-	bool "Support T1023RDB"
-	select ARCH_T1023
-	select BOARD_LATE_INIT if CHAIN_OF_TRUST
-	select SUPPORT_SPL
-	select PHYS_64BIT
-	select FSL_DDR_INTERACTIVE
-	imply CMD_EEPROM
-	imply PANIC_HANG
-
 config TARGET_T1024RDB
 	bool "Support T1024RDB"
 	select ARCH_T1024
@@ -692,27 +682,6 @@ config ARCH_P5040
 config ARCH_QEMU_E500
 	bool
 
-config ARCH_T1023
-	bool
-	select E500MC
-	select FSL_LAW
-	select SYS_FSL_DDR_VER_50
-	select SYS_FSL_ERRATUM_A008378
-	select SYS_FSL_ERRATUM_A008109
-	select SYS_FSL_ERRATUM_A009663
-	select SYS_FSL_ERRATUM_A009942
-	select SYS_FSL_ERRATUM_ESDHC111
-	select SYS_FSL_HAS_DDR3
-	select SYS_FSL_HAS_DDR4
-	select SYS_FSL_HAS_SEC
-	select SYS_FSL_QORIQ_CHASSIS2
-	select SYS_FSL_SEC_BE
-	select SYS_FSL_SEC_COMPAT_5
-	select FSL_IFC
-	imply CMD_EEPROM
-	imply CMD_NAND
-	imply CMD_REGINFO
-
 config ARCH_T1024
 	bool
 	select E500MC
@@ -916,7 +885,6 @@ config MAX_CPUS
 		     ARCH_P1024 || \
 		     ARCH_P1025 || \
 		     ARCH_P2020 || \
-		     ARCH_T1023 || \
 		     ARCH_T1024
 	default 1
 	help
@@ -952,7 +920,6 @@ config SYS_CCSRBAR_DEFAULT
 				ARCH_P3041	|| \
 				ARCH_P4080	|| \
 				ARCH_P5040	|| \
-				ARCH_T1023	|| \
 				ARCH_T1024	|| \
 				ARCH_T1040	|| \
 				ARCH_T1042	|| \
@@ -1144,8 +1111,7 @@ config SYS_FSL_NUM_LAWS
 			ARCH_T2080	|| \
 			ARCH_T4160	|| \
 			ARCH_T4240
-	default 16 if	ARCH_T1023	|| \
-			ARCH_T1024	|| \
+	default 16 if	ARCH_T1024	|| \
 			ARCH_T1040	|| \
 			ARCH_T1042
 	default 12 if	ARCH_BSC9131	|| \
@@ -1224,7 +1190,6 @@ config SYS_FSL_IFC_CLK_DIV
 	default 2 if	ARCH_B4420	|| \
 			ARCH_B4860	|| \
 			ARCH_T1024	|| \
-			ARCH_T1023	|| \
 			ARCH_T1040	|| \
 			ARCH_T1042	|| \
 			ARCH_T4160	|| \
arch/powerpc/cpu/mpc85xx/Makefile +0 -2
index b9d87ddb655e..4d9a07b5d9c3 100644
@@ -47,7 +47,6 @@ obj-$(CONFIG_ARCH_B4420) += b4860_ids.o
 obj-$(CONFIG_ARCH_B4860) += b4860_ids.o
 obj-$(CONFIG_ARCH_T1040) += t1040_ids.o
 obj-$(CONFIG_ARCH_T1042)	+= t1040_ids.o
-obj-$(CONFIG_ARCH_T1023) += t1024_ids.o
 obj-$(CONFIG_ARCH_T1024) += t1024_ids.o
 obj-$(CONFIG_ARCH_T2080) += t2080_ids.o
 
@@ -83,7 +82,6 @@ obj-$(CONFIG_ARCH_B4860) += b4860_serdes.o
 obj-$(CONFIG_ARCH_BSC9132) += bsc9132_serdes.o
 obj-$(CONFIG_ARCH_T1040) += t1040_serdes.o
 obj-$(CONFIG_ARCH_T1042)	+= t1040_serdes.o
-obj-$(CONFIG_ARCH_T1023) += t1024_serdes.o
 obj-$(CONFIG_ARCH_T1024) += t1024_serdes.o
 obj-$(CONFIG_ARCH_T2080) += t2080_serdes.o
 
arch/powerpc/cpu/mpc85xx/speed.c +2 -2
index 26067dd7132c..e6e3f17bb272 100644
@@ -201,7 +201,7 @@ void get_sys_info(sys_info_t *sys_info)
 	defined(CONFIG_ARCH_T2080)
 #define FM1_CLK_SEL	0xe0000000
 #define FM1_CLK_SHIFT	29
-#elif defined(CONFIG_ARCH_T1024) || defined(CONFIG_ARCH_T1023)
+#elif defined(CONFIG_ARCH_T1024)
 #define FM1_CLK_SEL	0x00000007
 #define FM1_CLK_SHIFT	0
 #else
@@ -211,7 +211,7 @@ void get_sys_info(sys_info_t *sys_info)
 #define FM1_CLK_SHIFT	26
 #endif
 #if !defined(CONFIG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV)
-#if defined(CONFIG_ARCH_T1024) || defined(CONFIG_ARCH_T1023)
+#if defined(CONFIG_ARCH_T1024)
 	rcw_tmp = in_be32(&gur->rcwsr[15]) - 4;
 #else
 	rcw_tmp = in_be32(&gur->rcwsr[7]);
arch/powerpc/include/asm/config_mpc85xx.h +1 -1
index 20535487310f..a52b31ec3950 100644
@@ -313,7 +313,7 @@
 #define QE_NUM_OF_SNUM			28
 #define CONFIG_SYS_FSL_SFP_VER_3_0
 
-#elif defined(CONFIG_ARCH_T1024) || defined(CONFIG_ARCH_T1023)
+#elif defined(CONFIG_ARCH_T1024)
 #define CONFIG_E5500
 #define CONFIG_FSL_CORENET	     /* Freescale CoreNet platform */
 #define CONFIG_SYS_FSL_CORES_PER_CLUSTER 1
arch/powerpc/include/asm/fsl_secure_boot.h +0 -1
index 53bfb8f64af7..991d75312a34 100644
@@ -28,7 +28,6 @@
 	defined(CONFIG_TARGET_T1042RDB) || \
 	defined(CONFIG_TARGET_T1042D4RDB) || \
 	defined(CONFIG_TARGET_T1042RDB_PI) || \
-	defined(CONFIG_ARCH_T1023) || \
 	defined(CONFIG_ARCH_T1024)
 #ifndef CONFIG_SYS_RAMBOOT
 #define CONFIG_SYS_CPC_REINIT_F
arch/powerpc/include/asm/immap_85xx.h +2 -2
index 1411b3f38b94..bb6a684d5b05 100644
@@ -1792,7 +1792,7 @@ typedef struct ccsr_gur {
 #define PXCKEN_MASK	0x80000000
 #define PXCK_MASK	0x00FF0000
 #define PXCK_BITS_START	16
-#elif defined(CONFIG_ARCH_T1024) || defined(CONFIG_ARCH_T1023)
+#elif defined(CONFIG_ARCH_T1024)
 #define FSL_CORENET2_RCWSR4_SRDS1_PRTCL		0xff800000
 #define FSL_CORENET2_RCWSR4_SRDS1_PRTCL_SHIFT	23
 #define FSL_CORENET_RCWSR6_BOOT_LOC		0x0f800000
@@ -2500,7 +2500,7 @@ typedef struct ccsr_gur {
 
 #ifdef CONFIG_SYS_FSL_QORIQ_CHASSIS2
 #define MAX_SERDES 4
-#if defined(CONFIG_ARCH_T1024) || defined(CONFIG_ARCH_T1023)
+#if defined(CONFIG_ARCH_T1024)
 #define SRDS_MAX_LANES 4
 #else
 #define SRDS_MAX_LANES 8
board/freescale/t102xrdb/MAINTAINERS +0 -5
index ebb17b81313b..914c5063df9f 100644
@@ -7,8 +7,3 @@ F:	configs/T1024RDB_defconfig
 F:	configs/T1024RDB_NAND_defconfig
 F:	configs/T1024RDB_SDCARD_defconfig
 F:	configs/T1024RDB_SPIFLASH_defconfig
-F:	configs/T1024RDB_SECURE_BOOT_defconfig
-F:	configs/T1023RDB_defconfig
-F:	configs/T1023RDB_NAND_defconfig
-F:	configs/T1023RDB_SDCARD_defconfig
-F:	configs/T1023RDB_SPIFLASH_defconfig
configs/T1023RDB_NAND_defconfig deleted +0 -80

80 lines not on this page · raw message

configs/T1023RDB_SDCARD_defconfig deleted +0 -77

77 lines not on this page · raw message

configs/T1023RDB_SPIFLASH_defconfig deleted +0 -79

79 lines not on this page · raw message

configs/T1023RDB_defconfig deleted +0 -64

64 lines not on this page · raw message

configs/T1024RDB_SECURE_BOOT_defconfig deleted +0 -70

70 lines not on this page · raw message

drivers/net/Kconfig +0 -1
index 382639044bff..0220dd2a5f2d 100644
@@ -732,7 +732,6 @@ config SYS_DPAA_QBMAN
 		     ARCH_B4420 || \
 		     ARCH_P1023 || \
 		     ARCH_P2041 || \
-		     ARCH_T1023 || \
 		     ARCH_T1024 || \
 		     ARCH_T1040 || \
 		     ARCH_T1042 || \
drivers/net/fm/Makefile +0 -1
index b4ede61113fc..c988e4e9257f 100644
@@ -23,7 +23,6 @@ obj-$(CONFIG_ARCH_P4080) += p4080.o
 obj-$(CONFIG_ARCH_P5040) += p5040.o
 obj-$(CONFIG_ARCH_T1040) += t1040.o
 obj-$(CONFIG_ARCH_T1042)	+= t1040.o
-obj-$(CONFIG_ARCH_T1023) += t1024.o
 obj-$(CONFIG_ARCH_T1024) += t1024.o
 obj-$(CONFIG_ARCH_T2080) += t2080.o
 obj-$(CONFIG_ARCH_T4240) += t4240.o
Signature · 1 line
2.17.1
author
#37 lore raw

Re: [PATCH 17/27] ppc: Remove T1023RBD boards and T1024RDB_SECURE_BOOT

Quoted 6 lines · Tom Rini

These boards have not been converted to CONFIG_DM_PCI by the deadline and is also missing conversion to CONFIG_DM. Remove them. As this is the only ARCH_T1023 platform left, remove that support as well.

Cc Priyanka Jain <[email protected]>

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
#38 lore raw

Re: [PATCH 17/27] ppc: Remove T1023RBD boards and T1024RDB_SECURE_BOOT

Hello list!
I know this mail will be OT, but I am worried about what will happen to a new project using the PowerPC T2080,e6500 64-bit PPC on this web site:

https://www.powerpc-notebook.org

I suspect the same architecture will be move outside the official Linux release when the same device-model will not match the kernel. And this will be a pity for all people who are believe on architectures and the power of opensource other than x86 and arm processors.

So, this project will be a no-go or dead project before it will be launched.

Are my worries overkill?

I hope so.

Quoted 11 lines · Tom Rini
Quoted 6 lines · Tom Rini

These boards have not been converted to CONFIG_DM_PCI by the deadline and is also missing conversion to CONFIG_DM. Remove them. As this is the only ARCH_T1023 platform left, remove that support as well.

Cc Priyanka Jain <[email protected]>

Applied to u-boot/master, thanks!

Signature · 4 lines
Eurek s.r.l.                          |
Electronic Engineering                | http://www.eurek.it
via Celletta 8/B, 40026 Imola, Italy  | Phone: +39-(0)542-609120
p.iva 00690621206 - c.f. 04020030377  | Fax:   +39-(0)542-609212
author
#39 lore raw

Re: [PATCH 17/27] ppc: Remove T1023RBD boards and T1024RDB_SECURE_BOOT

Quoted 11 lines · gianluca

Hello list!
I know this mail will be OT, but I am worried about what will happen to a new project using the PowerPC T2080,e6500 64-bit PPC on this web site:

https://www.powerpc-notebook.org

I suspect the same architecture will be move outside the official Linux release when the same device-model will not match the kernel. And this will be a pity for all people who are believe on architectures and the power of opensource other than x86 and arm processors.

Quoted 5 lines

So, this project will be a no-go or dead project before it will be launched.

Are my worries overkill?

I hope so.

The platform can come back if someone is going to be actively maintaining the support. No one had been doing that, so I'm not sure what hidden breakage existed underneath the technical debt.

Signature · 1 line
Tom
#40 lore raw

Re: [PATCH 17/27] ppc: Remove T1023RBD boards and T1024RDB_SECURE_BOOT

Quoted 15 lines · Tom Rini
Quoted 13 lines · gianluca

Hello list!
I know this mail will be OT, but I am worried about what will happen to a new project using the PowerPC T2080,e6500 64-bit PPC on this web site:

https://www.powerpc-notebook.org

I suspect the same architecture will be move outside the official Linux release when the same device-model will not match the kernel. And this will be a pity for all people who are believe on architectures and the power of opensource other than x86 and arm processors.

So, this project will be a no-go or dead project before it will be launched.

Quoted 8 lines
Quoted 3 lines

Are my worries overkill?

I hope so.

The platform can come back if someone is going to be actively maintaining the support. No one had been doing that, so I'm not sure what hidden breakage existed underneath the technical debt.

Thanks a lot Tom. I will report this to the open progress ppc platform group.

I think they will do whatever it takes to maintain this platform as soon as possible.

Regards,

Signature · 4 lines
Eurek s.r.l.                          |
Electronic Engineering                | http://www.eurek.it
via Celletta 8/B, 40026 Imola, Italy  | Phone: +39-(0)542-609120
p.iva 00690621206 - c.f. 04020030377  | Fax:   +39-(0)542-609212
author
#41 lore raw

PATCH 18/27 ppc: Remove MPC8568MDS board

In reply to Tom Rini

This board has not been converted to CONFIG_DM_PCI by the deadline and is also missing conversion to CONFIG_DM. Remove it. As this is the last ARCH_MPC8568 platform, remove that support as well.

Cc Priyanka Jain <[email protected]>
---
 arch/powerpc/cpu/mpc85xx/Kconfig          |  21 +-
 arch/powerpc/cpu/mpc85xx/Makefile         |   1 -
 arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c |  58 ----
 arch/powerpc/include/asm/config_mpc85xx.h |  10 -
 arch/powerpc/include/asm/immap_85xx.h     |   6 +-
 board/freescale/mpc8568mds/Kconfig        |  12 -
 board/freescale/mpc8568mds/MAINTAINERS    |   6 -
 board/freescale/mpc8568mds/Makefile       |  11 -
 board/freescale/mpc8568mds/bcsr.c         |  61 ----
 board/freescale/mpc8568mds/bcsr.h         |  92 -----
 board/freescale/mpc8568mds/ddr.c          |  53 ---
 board/freescale/mpc8568mds/law.c          |  40 ---
 board/freescale/mpc8568mds/mpc8568mds.c   | 359 -------------------
 board/freescale/mpc8568mds/tlb.c          |  83 -----
 configs/MPC8568MDS_defconfig              |  42 ---
 include/configs/MPC8568MDS.h              | 400 ----------------------
 16 files changed, 3 insertions(+), 1252 deletions(-)
 delete mode 100644 arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
 delete mode 100644 board/freescale/mpc8568mds/Kconfig
 delete mode 100644 board/freescale/mpc8568mds/MAINTAINERS
 delete mode 100644 board/freescale/mpc8568mds/Makefile
 delete mode 100644 board/freescale/mpc8568mds/bcsr.c
 delete mode 100644 board/freescale/mpc8568mds/bcsr.h
 delete mode 100644 board/freescale/mpc8568mds/ddr.c
 delete mode 100644 board/freescale/mpc8568mds/law.c
 delete mode 100644 board/freescale/mpc8568mds/mpc8568mds.c
 delete mode 100644 board/freescale/mpc8568mds/tlb.c
 delete mode 100644 configs/MPC8568MDS_defconfig
 delete mode 100644 include/configs/MPC8568MDS.h
arch/powerpc/cpu/mpc85xx/Kconfig +2 -19
index 0a2921ddb323..cd7aa953567b 100644
@@ -49,10 +49,6 @@ config TARGET_MPC8548CDS
 	select ARCH_MPC8548
 	select FSL_VIA
 
-config TARGET_MPC8568MDS
-	bool "Support MPC8568MDS"
-	select ARCH_MPC8568
-
 config TARGET_P1010RDB_PA
 	bool "Support P1010RDB_PA"
 	select ARCH_P1010
@@ -378,15 +374,6 @@ config ARCH_MPC8560
 	select FSL_LAW
 	select SYS_FSL_HAS_DDR1
 
-config ARCH_MPC8568
-	bool
-	select FSL_LAW
-	select FSL_PCIE_RESET
-	select SYS_FSL_HAS_DDR2
-	select SYS_FSL_HAS_SEC
-	select SYS_FSL_SEC_BE
-	select SYS_FSL_SEC_COMPAT_2
-
 config ARCH_MPC8572
 	bool
 	select FSL_LAW
@@ -904,7 +891,6 @@ config SYS_CCSRBAR_DEFAULT
 				ARCH_MPC8544	|| \
 				ARCH_MPC8548	|| \
 				ARCH_MPC8560	|| \
-				ARCH_MPC8568	|| \
 				ARCH_MPC8572	|| \
 				ARCH_P1010	|| \
 				ARCH_P1011	|| \
@@ -1128,8 +1114,7 @@ config SYS_FSL_NUM_LAWS
 			ARCH_P1025	|| \
 			ARCH_P2020
 	default 10 if	ARCH_MPC8544	|| \
-			ARCH_MPC8548	|| \
-			ARCH_MPC8568
+			ARCH_MPC8548
 	default 8 if	ARCH_MPC8540	|| \
 			ARCH_MPC8560
 	help
@@ -1203,8 +1188,7 @@ config SYS_FSL_LBC_CLK_DIV
 	int "Divider of platform clock"
 	depends on FSL_ELBC || ARCH_MPC8540 || \
 		ARCH_MPC8548 || \
-		ARCH_MPC8560 || \
-		ARCH_MPC8568
+		ARCH_MPC8560
 
 	default 2 if	ARCH_P2041	|| \
 			ARCH_P3041	|| \
@@ -1222,7 +1206,6 @@ config FSL_VIA
 source "board/emulation/qemu-ppce500/Kconfig"
 source "board/freescale/corenet_ds/Kconfig"
 source "board/freescale/mpc8548cds/Kconfig"
-source "board/freescale/mpc8568mds/Kconfig"
 source "board/freescale/p1010rdb/Kconfig"
 source "board/freescale/p1_p2_rdb_pc/Kconfig"
 source "board/freescale/p2041rdb/Kconfig"
arch/powerpc/cpu/mpc85xx/Makefile +0 -1
index 4d9a07b5d9c3..8cd4b44ec5f9 100644
@@ -61,7 +61,6 @@ obj-$(CONFIG_ARCH_C29X)	+= c29x_serdes.o
 obj-$(CONFIG_ARCH_MPC8536) += mpc8536_serdes.o
 obj-$(CONFIG_ARCH_MPC8544) += mpc8544_serdes.o
 obj-$(CONFIG_ARCH_MPC8548) += mpc8548_serdes.o
-obj-$(CONFIG_ARCH_MPC8568) += mpc8568_serdes.o
 obj-$(CONFIG_ARCH_MPC8572) += mpc8572_serdes.o
 obj-$(CONFIG_ARCH_P1010)	+= p1010_serdes.o
 obj-$(CONFIG_ARCH_P1011)	+= p1021_serdes.o
arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c deleted +0 -58

58 lines not on this page · raw message

arch/powerpc/include/asm/config_mpc85xx.h +0 -10
index a52b31ec3950..33a3b3a13db7 100644
@@ -28,16 +28,6 @@
 #define CONFIG_SYS_FSL_RMU
 #define CONFIG_SYS_FSL_SRIO_MSG_UNIT_NUM	2
 
-#elif defined(CONFIG_ARCH_MPC8568)
-#define QE_MURAM_SIZE			0x10000UL
-#define MAX_QE_RISC			2
-#define QE_NUM_OF_SNUM			28
-#define CONFIG_SYS_FSL_SRIO_MAX_PORTS	1
-#define CONFIG_SYS_FSL_SRIO_OB_WIN_NUM	9
-#define CONFIG_SYS_FSL_SRIO_IB_WIN_NUM	5
-#define CONFIG_SYS_FSL_RMU
-#define CONFIG_SYS_FSL_SRIO_MSG_UNIT_NUM	2
-
 #elif defined(CONFIG_ARCH_P1010)
 #define CONFIG_FSL_SDHC_V2_3
 #define CONFIG_TSECV2
arch/powerpc/include/asm/immap_85xx.h +1 -5
index bb6a684d5b05..900b8f43c82e 100644
@@ -2457,11 +2457,7 @@ typedef struct ccsr_gur {
 	u32	svr;		/* System version */
 	u8	res10[8];
 	u32	rstcr;		/* Reset control */
-#if defined(CONFIG_ARCH_MPC8568)
-	u8	res11a[76];
-	par_io_t qe_par_io[7];
-	u8	res11b[1600];
-#elif defined(CONFIG_ARCH_P1021) || defined(CONFIG_ARCH_P1025)
+#if defined(CONFIG_ARCH_P1021) || defined(CONFIG_ARCH_P1025)
 	u8      res11a[12];
 	u32     iovselsr;
 	u8      res11b[60];
board/freescale/mpc8568mds/Kconfig deleted +0 -12
deleted file mode 100644
index 4e178c503968..000000000000
@@ -1,12 +0,0 @@
-if TARGET_MPC8568MDS
-
-config SYS_BOARD
-	default "mpc8568mds"
-
-config SYS_VENDOR
-	default "freescale"
-
-config SYS_CONFIG_NAME
-	default "MPC8568MDS"
-
-endif
board/freescale/mpc8568mds/MAINTAINERS deleted +0 -6
deleted file mode 100644
index f4747866d2bd..000000000000
@@ -1,6 +0,0 @@
-MPC8568MDS BOARD
-M:	Priyanka Jain <[email protected]>
-S:	Maintained
-F:	board/freescale/mpc8568mds/
-F:	include/configs/MPC8568MDS.h
-F:	configs/MPC8568MDS_defconfig
board/freescale/mpc8568mds/Makefile deleted +0 -11
deleted file mode 100644
index 1e9095bdddd6..000000000000
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright 2004-2007 Freescale Semiconductor.
-# (C) Copyright 2001-2006
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-
-obj-y	+= mpc8568mds.o
-obj-y	+= bcsr.o
-obj-y	+= ddr.o
-obj-y	+= law.o
-obj-y	+= tlb.o
board/freescale/mpc8568mds/bcsr.c deleted +0 -61

61 lines not on this page · raw message

board/freescale/mpc8568mds/bcsr.h deleted +0 -92

92 lines not on this page · raw message

board/freescale/mpc8568mds/ddr.c deleted +0 -53

53 lines not on this page · raw message

board/freescale/mpc8568mds/law.c deleted +0 -40
deleted file mode 100644
index c04c36b5d82c..000000000000
@@ -1,40 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2008, 2010-2011 Freescale Semiconductor, Inc.
- *
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- */
-
-#include <common.h>
-#include <asm/fsl_law.h>
-#include <asm/mmu.h>
-
-/*
- * LAW(Local Access Window) configuration:
- *
- *0)   0x0000_0000   0x7fff_ffff     DDR                     2G
- *1)   0x8000_0000   0x9fff_ffff     PCI1 MEM                512MB
- *2)   0xa000_0000   0xbfff_ffff     PCIe MEM                512MB
- *-)   0xe000_0000   0xe00f_ffff     CCSR                    1M
- *3)   0xe200_0000   0xe27f_ffff     PCI1 I/O                8M
- *4)   0xe280_0000   0xe2ff_ffff     PCIe I/O                8M
- *5)   0xc000_0000   0xdfff_ffff     SRIO                    512MB
- *6.a) 0xf000_0000   0xf3ff_ffff     SDRAM                   64MB
- *6.b) 0xf800_0000   0xf800_7fff     BCSR                    32KB
- *6.c) 0xf800_8000   0xf800_ffff     PIB (CS4)		     32KB
- *6.d) 0xf801_0000   0xf801_7fff     PIB (CS5)		     32KB
- *6.e) 0xfe00_0000   0xffff_ffff     Flash                   32MB
- *
- *Notes:
- *    CCSRBAR and L2-as-SRAM don't need a configured Local Access Window.
- *    If flash is 8M at default position (last 8M), no LAW needed.
- *
- */
-
-struct law_entry law_table[] = {
-	/* LBC window - maps 256M.  That's SDRAM, BCSR, PIBs, and Flash */
-	SET_LAW(CONFIG_SYS_LBC_SDRAM_BASE, LAW_SIZE_256M, LAW_TRGT_IF_LBC),
-};
-
-int num_law_entries = ARRAY_SIZE(law_table);
board/freescale/mpc8568mds/mpc8568mds.c deleted +0 -359

359 lines not on this page · raw message

board/freescale/mpc8568mds/tlb.c deleted +0 -83

83 lines not on this page · raw message

configs/MPC8568MDS_defconfig deleted +0 -42

42 lines not on this page · raw message

include/configs/MPC8568MDS.h deleted +0 -400

400 lines not on this page · raw message

Signature · 1 line
2.17.1
author
#42 lore raw

Re: [PATCH 18/27] ppc: Remove MPC8568MDS board

Quoted 6 lines · Tom Rini

This board has not been converted to CONFIG_DM_PCI by the deadline and is also missing conversion to CONFIG_DM. Remove it. As this is the last ARCH_MPC8568 platform, remove that support as well.

Cc Priyanka Jain <[email protected]>

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
author
#43 lore raw

PATCH 19/27 ppc: Remove kmcoge4 board

In reply to Tom Rini

This board has not been converted to CONFIG_DM_PCI by the deadline and is also missing conversion to CONFIG_DM. Remove it.

Cc Valentin Longchamp <[email protected]>
---
 board/keymile/Kconfig                 |   1 -
 board/keymile/kmp204x/Kconfig         |  20 --
 board/keymile/kmp204x/MAINTAINERS     |   6 -
 board/keymile/kmp204x/Makefile        |  10 -
 board/keymile/kmp204x/ddr.c           |  70 -----
 board/keymile/kmp204x/eth.c           |  71 -----
 board/keymile/kmp204x/kmp204x.c       | 265 ----------------
 board/keymile/kmp204x/kmp204x.h       |   8 -
 board/keymile/kmp204x/law.c           |  39 ---
 board/keymile/kmp204x/pbi.cfg         |  74 -----
 board/keymile/kmp204x/pci.c           | 125 --------
 board/keymile/kmp204x/rcw_kmp204x.cfg |  11 -
 board/keymile/kmp204x/tlb.c           | 109 -------
 configs/kmcoge4_defconfig             |  72 -----
 include/configs/kmp204x.h             | 416 --------------------------
 15 files changed, 1297 deletions(-)
 delete mode 100644 board/keymile/kmp204x/Kconfig
 delete mode 100644 board/keymile/kmp204x/MAINTAINERS
 delete mode 100644 board/keymile/kmp204x/Makefile
 delete mode 100644 board/keymile/kmp204x/ddr.c
 delete mode 100644 board/keymile/kmp204x/eth.c
 delete mode 100644 board/keymile/kmp204x/kmp204x.c
 delete mode 100644 board/keymile/kmp204x/kmp204x.h
 delete mode 100644 board/keymile/kmp204x/law.c
 delete mode 100644 board/keymile/kmp204x/pbi.cfg
 delete mode 100644 board/keymile/kmp204x/pci.c
 delete mode 100644 board/keymile/kmp204x/rcw_kmp204x.cfg
 delete mode 100644 board/keymile/kmp204x/tlb.c
 delete mode 100644 configs/kmcoge4_defconfig
 delete mode 100644 include/configs/kmp204x.h
board/keymile/Kconfig +0 -1
index 86a667067de9..b76ad485f565 100644
@@ -125,7 +125,6 @@ config SYS_IVM_EEPROM_PAGE_LEN
 
 source "board/keymile/km83xx/Kconfig"
 source "board/keymile/kmcent2/Kconfig"
-source "board/keymile/kmp204x/Kconfig"
 source "board/keymile/km_arm/Kconfig"
 source "board/keymile/pg-wcom-ls102xa/Kconfig"
 
board/keymile/kmp204x/Kconfig deleted +0 -20
deleted file mode 100644
index f74d4295c7ad..000000000000
@@ -1,20 +0,0 @@
-if TARGET_KMP204X
-
-config SYS_BOARD
-	default "kmp204x"
-
-config SYS_VENDOR
-	default "keymile"
-
-config SYS_CONFIG_NAME
-	default "kmp204x"
-
-config BOARD_SPECIFIC_OPTIONS # dummy
-	def_bool y
-	select ARCH_P2041
-	select FSL_DDR_INTERACTIVE
-	select PHYS_64BIT
-	imply CMD_CRAMFS
-	imply FS_CRAMFS
-
-endif
board/keymile/kmp204x/MAINTAINERS deleted +0 -6
deleted file mode 100644
index 8b9afffdc721..000000000000
@@ -1,6 +0,0 @@
-KMP204X BOARD
-M:	Valentin Longchamp <[email protected]>
-S:	Maintained
-F:	board/keymile/kmp204x/
-F:	include/configs/kmp204x.h
-F:	configs/kmcoge4_defconfig
board/keymile/kmp204x/Makefile deleted +0 -10
deleted file mode 100644
index 5523ee99aae8..000000000000
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2001-2007
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
-# See file CREDITS for list of people who contributed to this
-# project.
-
-obj-y	:= kmp204x.o ddr.o eth.o tlb.o pci.o law.o ../common/common.o\
-		../common/ivm.o ../common/qrio.o
board/keymile/kmp204x/ddr.c deleted +0 -70

70 lines not on this page · raw message

board/keymile/kmp204x/eth.c deleted +0 -71

71 lines not on this page · raw message

board/keymile/kmp204x/kmp204x.c deleted +0 -265

265 lines not on this page · raw message

board/keymile/kmp204x/kmp204x.h deleted +0 -8
deleted file mode 100644
index 3b858a557117..000000000000
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2013 Keymile AG
- * Valentin Longchamp <[email protected]>
- */
-
-
-void pci_of_setup(void *blob, struct bd_info *bd);
board/keymile/kmp204x/law.c deleted +0 -39
deleted file mode 100644
index 2d83dfea15f8..000000000000
@@ -1,39 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2013 Keymile AG
- * Valentin Longchamp <[email protected]>
- *
- * Copyright 2008-2011 Freescale Semiconductor, Inc.
- *
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- */
-
-#include <common.h>
-#include <asm/fsl_law.h>
-#include <asm/mmu.h>
-
-struct law_entry law_table[] = {
-#ifdef CONFIG_SYS_BMAN_MEM_PHYS
-	SET_LAW(CONFIG_SYS_BMAN_MEM_PHYS, LAW_SIZE_2M, LAW_TRGT_IF_BMAN),
-#endif
-#ifdef CONFIG_SYS_QMAN_MEM_PHYS
-	SET_LAW(CONFIG_SYS_QMAN_MEM_PHYS, LAW_SIZE_2M, LAW_TRGT_IF_QMAN),
-#endif
-#ifdef CONFIG_SYS_DCSRBAR_PHYS
-	/* Limit DCSR to 32M to access NPC Trace Buffer */
-	SET_LAW(CONFIG_SYS_DCSRBAR_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_DCSR),
-#endif
-#ifdef CONFIG_SYS_NAND_BASE_PHYS
-	SET_LAW(CONFIG_SYS_NAND_BASE_PHYS, LAW_SIZE_32K, LAW_TRGT_IF_LBC),
-#endif
-	SET_LAW(CONFIG_SYS_QRIO_BASE_PHYS, LAW_SIZE_64K, LAW_TRGT_IF_LBC),
-#ifdef CONFIG_SYS_LBAPP1_BASE_PHYS
-	SET_LAW(CONFIG_SYS_LBAPP1_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_LBC),
-#endif
-#ifdef CONFIG_SYS_LBAPP2_BASE_PHYS
-	SET_LAW(CONFIG_SYS_LBAPP2_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_LBC),
-#endif
-};
-
-int num_law_entries = ARRAY_SIZE(law_table);
board/keymile/kmp204x/pbi.cfg deleted +0 -74

74 lines not on this page · raw message

board/keymile/kmp204x/pci.c deleted +0 -125

125 lines not on this page · raw message

board/keymile/kmp204x/rcw_kmp204x.cfg deleted +0 -11
deleted file mode 100644
index 236d5138bc7e..000000000000
@@ -1,11 +0,0 @@
-#
-# Default RCW for kmp204x boards
-#
-
-#PBL preamble and RCW header
-aa55aa55 010e0100
-#64 bytes RCW data
-14600000 00000000 28200000 00000000
-148E70CF CFC02000 58000000 41000000
-00000000 00000000 00000000 F0428816
-00000000 00000000 00000000 00000000
board/keymile/kmp204x/tlb.c deleted +0 -109

109 lines not on this page · raw message

configs/kmcoge4_defconfig deleted +0 -72

72 lines not on this page · raw message

include/configs/kmp204x.h deleted +0 -416

416 lines not on this page · raw message

Signature · 1 line
2.17.1
author
#44 lore raw

Re: [PATCH 19/27] ppc: Remove kmcoge4 board

Quoted 5 lines · Tom Rini

This board has not been converted to CONFIG_DM_PCI by the deadline and is also missing conversion to CONFIG_DM. Remove it.

Cc Valentin Longchamp <[email protected]>

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
author
#45 lore raw

PATCH 20/27 ppc: Remove xpedite boards

In reply to Tom Rini

These boards have not been converted to CONFIG_DM_PCI by the deadline and is also missing conversion to CONFIG_DM. Remove them. As this includes the last ARCH_MPC8572 platform, remove that as well.

---
 arch/powerpc/cpu/mpc85xx/Kconfig          |  40 +-
 arch/powerpc/cpu/mpc85xx/Makefile         |   1 -
 arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c |  74 ---
 arch/powerpc/cpu/mpc86xx/Kconfig          |   5 -
 arch/powerpc/include/asm/fsl_law.h        |   4 +-
 arch/powerpc/include/asm/immap_85xx.h     |   2 +-
 board/xes/common/Makefile                 |   1 -
 board/xes/xpedite517x/Kconfig             |  12 -
 board/xes/xpedite517x/MAINTAINERS         |   6 -
 board/xes/xpedite517x/Makefile            |   8 -
 board/xes/xpedite517x/ddr.c               | 124 -----
 board/xes/xpedite517x/law.c               |  27 -
 board/xes/xpedite517x/xpedite517x.c       |  86 ---
 board/xes/xpedite520x/Kconfig             |  12 -
 board/xes/xpedite520x/MAINTAINERS         |   6 -
 board/xes/xpedite520x/Makefile            |  11 -
 board/xes/xpedite520x/ddr.c               |  68 ---
 board/xes/xpedite520x/law.c               |  26 -
 board/xes/xpedite520x/tlb.c               |  68 ---
 board/xes/xpedite520x/xpedite520x.c       |  82 ---
 board/xes/xpedite537x/Kconfig             |  12 -
 board/xes/xpedite537x/MAINTAINERS         |   6 -
 board/xes/xpedite537x/Makefile            |  11 -
 board/xes/xpedite537x/ddr.c               | 234 --------
 board/xes/xpedite537x/law.c               |  25 -
 board/xes/xpedite537x/tlb.c               |  82 ---
 board/xes/xpedite537x/xpedite537x.c       |  82 ---
 board/xes/xpedite550x/Kconfig             |  12 -
 board/xes/xpedite550x/MAINTAINERS         |   6 -
 board/xes/xpedite550x/Makefile            |   8 -
 board/xes/xpedite550x/ddr.c               | 135 -----
 board/xes/xpedite550x/law.c               |  25 -
 board/xes/xpedite550x/tlb.c               |  81 ---
 board/xes/xpedite550x/xpedite550x.c       |  82 ---
 configs/xpedite517x_defconfig             |  54 --
 configs/xpedite520x_defconfig             |  54 --
 configs/xpedite537x_defconfig             |  57 --
 configs/xpedite550x_defconfig             |  57 --
 drivers/ddr/fsl/Kconfig                   |   1 -
 env/Kconfig                               |   2 +-
 include/configs/xpedite517x.h             | 646 ----------------------
 include/configs/xpedite520x.h             | 445 ---------------
 include/configs/xpedite537x.h             | 496 -----------------
 include/configs/xpedite550x.h             | 494 -----------------
 44 files changed, 5 insertions(+), 3765 deletions(-)
 delete mode 100644 arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c
 delete mode 100644 board/xes/xpedite517x/Kconfig
 delete mode 100644 board/xes/xpedite517x/MAINTAINERS
 delete mode 100644 board/xes/xpedite517x/Makefile
 delete mode 100644 board/xes/xpedite517x/ddr.c
 delete mode 100644 board/xes/xpedite517x/law.c
 delete mode 100644 board/xes/xpedite517x/xpedite517x.c
 delete mode 100644 board/xes/xpedite520x/Kconfig
 delete mode 100644 board/xes/xpedite520x/MAINTAINERS
 delete mode 100644 board/xes/xpedite520x/Makefile
 delete mode 100644 board/xes/xpedite520x/ddr.c
 delete mode 100644 board/xes/xpedite520x/law.c
 delete mode 100644 board/xes/xpedite520x/tlb.c
 delete mode 100644 board/xes/xpedite520x/xpedite520x.c
 delete mode 100644 board/xes/xpedite537x/Kconfig
 delete mode 100644 board/xes/xpedite537x/MAINTAINERS
 delete mode 100644 board/xes/xpedite537x/Makefile
 delete mode 100644 board/xes/xpedite537x/ddr.c
 delete mode 100644 board/xes/xpedite537x/law.c
 delete mode 100644 board/xes/xpedite537x/tlb.c
 delete mode 100644 board/xes/xpedite537x/xpedite537x.c
 delete mode 100644 board/xes/xpedite550x/Kconfig
 delete mode 100644 board/xes/xpedite550x/MAINTAINERS
 delete mode 100644 board/xes/xpedite550x/Makefile
 delete mode 100644 board/xes/xpedite550x/ddr.c
 delete mode 100644 board/xes/xpedite550x/law.c
 delete mode 100644 board/xes/xpedite550x/tlb.c
 delete mode 100644 board/xes/xpedite550x/xpedite550x.c
 delete mode 100644 configs/xpedite517x_defconfig
 delete mode 100644 configs/xpedite520x_defconfig
 delete mode 100644 configs/xpedite537x_defconfig
 delete mode 100644 configs/xpedite550x_defconfig
 delete mode 100644 include/configs/xpedite517x.h
 delete mode 100644 include/configs/xpedite520x.h
 delete mode 100644 include/configs/xpedite537x.h
 delete mode 100644 include/configs/xpedite550x.h
arch/powerpc/cpu/mpc85xx/Kconfig +1 -39
index cd7aa953567b..876f768e8601 100644
@@ -185,20 +185,6 @@ config TARGET_KMCENT2
 	bool "Support kmcent2"
 	select VENDOR_KM
 
-config TARGET_XPEDITE520X
-	bool "Support xpedite520x"
-	select ARCH_MPC8548
-
-config TARGET_XPEDITE537X
-	bool "Support xpedite537x"
-	select ARCH_MPC8572
-# Use DDR3 controller with DDR2 DIMMs on this board
-	select SYS_FSL_DDRC_GEN3
-
-config TARGET_XPEDITE550X
-	bool "Support xpedite550x"
-	select ARCH_P2020
-
 config TARGET_UCP1020
 	bool "Support uCP1020"
 	select ARCH_P1020
@@ -374,23 +360,6 @@ config ARCH_MPC8560
 	select FSL_LAW
 	select SYS_FSL_HAS_DDR1
 
-config ARCH_MPC8572
-	bool
-	select FSL_LAW
-	select SYS_FSL_ERRATUM_A004508
-	select SYS_FSL_ERRATUM_A005125
-	select SYS_FSL_ERRATUM_DDR_115
-	select SYS_FSL_ERRATUM_DDR111_DDR134
-	select FSL_PCIE_RESET
-	select SYS_FSL_HAS_DDR2
-	select SYS_FSL_HAS_DDR3
-	select SYS_FSL_HAS_SEC
-	select SYS_FSL_SEC_BE
-	select SYS_FSL_SEC_COMPAT_2
-	select SYS_PPC_E500_USE_DEBUG_TLB
-	select FSL_ELBC
-	imply CMD_NAND
-
 config ARCH_P1010
 	bool
 	select FSL_LAW
@@ -865,7 +834,6 @@ config MAX_CPUS
 		     ARCH_T2080
 	default 2 if ARCH_B4420 || \
 		     ARCH_BSC9132 || \
-		     ARCH_MPC8572 || \
 		     ARCH_P1020 || \
 		     ARCH_P1021 || \
 		     ARCH_P1023 || \
@@ -891,7 +859,6 @@ config SYS_CCSRBAR_DEFAULT
 				ARCH_MPC8544	|| \
 				ARCH_MPC8548	|| \
 				ARCH_MPC8560	|| \
-				ARCH_MPC8572	|| \
 				ARCH_P1010	|| \
 				ARCH_P1011	|| \
 				ARCH_P1020	|| \
@@ -1104,7 +1071,6 @@ config SYS_FSL_NUM_LAWS
 			ARCH_BSC9132	|| \
 			ARCH_C29X	|| \
 			ARCH_MPC8536	|| \
-			ARCH_MPC8572	|| \
 			ARCH_P1010	|| \
 			ARCH_P1011	|| \
 			ARCH_P1020	|| \
@@ -1151,8 +1117,7 @@ config SYS_PPC_E500_DEBUG_TLB
 	depends on SYS_PPC_E500_USE_DEBUG_TLB
 	default 0 if	ARCH_MPC8544 || ARCH_MPC8548
 	default 1 if	ARCH_MPC8536
-	default 2 if	ARCH_MPC8572	|| \
-			ARCH_P1011	|| \
+	default 2 if	ARCH_P1011	|| \
 			ARCH_P1020	|| \
 			ARCH_P1021	|| \
 			ARCH_P1024	|| \
@@ -1216,9 +1181,6 @@ source "board/freescale/t208xrdb/Kconfig"
 source "board/freescale/t4rdb/Kconfig"
 source "board/keymile/Kconfig"
 source "board/socrates/Kconfig"
-source "board/xes/xpedite520x/Kconfig"
-source "board/xes/xpedite537x/Kconfig"
-source "board/xes/xpedite550x/Kconfig"
 source "board/Arcturus/ucp1020/Kconfig"
 
 endmenu
arch/powerpc/cpu/mpc85xx/Makefile +0 -1
index 8cd4b44ec5f9..bbaae0d8454f 100644
@@ -61,7 +61,6 @@ obj-$(CONFIG_ARCH_C29X)	+= c29x_serdes.o
 obj-$(CONFIG_ARCH_MPC8536) += mpc8536_serdes.o
 obj-$(CONFIG_ARCH_MPC8544) += mpc8544_serdes.o
 obj-$(CONFIG_ARCH_MPC8548) += mpc8548_serdes.o
-obj-$(CONFIG_ARCH_MPC8572) += mpc8572_serdes.o
 obj-$(CONFIG_ARCH_P1010)	+= p1010_serdes.o
 obj-$(CONFIG_ARCH_P1011)	+= p1021_serdes.o
 obj-$(CONFIG_ARCH_P1020)	+= p1021_serdes.o
arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c deleted +0 -74

74 lines not on this page · raw message

arch/powerpc/cpu/mpc86xx/Kconfig +0 -5
index 7de42b5f2576..1ee87038bed4 100644
@@ -13,10 +13,6 @@ config TARGET_SBC8641D
 	select ARCH_MPC8641
 	select BOARD_EARLY_INIT_F
 
-config TARGET_XPEDITE517X
-	bool "Support xpedite517x"
-	select ARCH_MPC8641
-
 endchoice
 
 config ARCH_MPC8610
@@ -52,6 +48,5 @@ config SYS_FSL_NUM_LAWS
 		If not sure, do not change.
 
 source "board/sbc8641d/Kconfig"
-source "board/xes/xpedite517x/Kconfig"
 
 endmenu
arch/powerpc/include/asm/fsl_law.h +2 -2
index 888640df6f81..77cdc80fdcd0 100644
@@ -84,7 +84,7 @@ enum law_trgt_if {
 #if defined(CONFIG_ARCH_BSC9131) || defined(CONFIG_ARCH_BSC9132)
 	LAW_TRGT_IF_OCN_DSP = 0x03,
 #else
-#if !defined(CONFIG_ARCH_MPC8572) && !defined(CONFIG_ARCH_P2020)
+#if !defined(CONFIG_ARCH_P2020)
 	LAW_TRGT_IF_PCIE_3 = 0x03,
 #endif
 #endif
@@ -120,7 +120,7 @@ enum law_trgt_if {
 #define LAW_TRGT_IF_PCIE_1	LAW_TRGT_IF_PCI
 #endif
 
-#if defined(CONFIG_ARCH_MPC8572) || defined(CONFIG_ARCH_P2020)
+#if defined(CONFIG_ARCH_P2020)
 #define LAW_TRGT_IF_PCIE_3	LAW_TRGT_IF_PCI
 #endif
 #endif /* CONFIG_FSL_CORENET */
arch/powerpc/include/asm/immap_85xx.h +1 -1
index 900b8f43c82e..70112c91fc51 100644
@@ -2853,7 +2853,7 @@ struct ccsr_pman {
 #define CONFIG_SYS_MPC85xx_PCIX2_OFFSET		0x9000
 #define CONFIG_SYS_MPC85xx_PCIE1_OFFSET         0xa000
 #define CONFIG_SYS_MPC85xx_PCIE2_OFFSET         0x9000
-#if defined(CONFIG_ARCH_MPC8572) || defined(CONFIG_ARCH_P2020)
+#if defined(CONFIG_ARCH_P2020)
 #define CONFIG_SYS_MPC85xx_PCIE3_OFFSET         0x8000
 #else
 #define CONFIG_SYS_MPC85xx_PCIE3_OFFSET         0xb000
board/xes/common/Makefile +0 -1
index b5c6900021c4..49320305470e 100644
@@ -4,7 +4,6 @@
 # Wolfgang Denk, DENX Software Engineering, wd at denx.de.
 
 obj-$(CONFIG_FSL_PCI_INIT)	+= fsl_8xxx_pci.o
-obj-$(CONFIG_ARCH_MPC8572)		+= fsl_8xxx_clk.o
 obj-$(CONFIG_MPC86xx)		+= fsl_8xxx_clk.o
 obj-$(CONFIG_ARCH_P2020)		+= fsl_8xxx_clk.o
 obj-$(CONFIG_MPC85xx)		+= fsl_8xxx_misc.o board.o
board/xes/xpedite517x/Kconfig deleted +0 -12
deleted file mode 100644
index 91bbd22451b1..000000000000
@@ -1,12 +0,0 @@
-if TARGET_XPEDITE517X
-
-config SYS_BOARD
-	default "xpedite517x"
-
-config SYS_VENDOR
-	default "xes"
-
-config SYS_CONFIG_NAME
-	default "xpedite517x"
-
-endif
board/xes/xpedite517x/MAINTAINERS deleted +0 -6
deleted file mode 100644
index 26e0acccb056..000000000000
@@ -1,6 +0,0 @@
-XPEDITE517X BOARD
-M:	Peter Tyser <[email protected]>
-S:	Maintained
-F:	board/xes/xpedite517x/
-F:	include/configs/xpedite517x.h
-F:	configs/xpedite517x_defconfig
board/xes/xpedite517x/Makefile deleted +0 -8
deleted file mode 100644
index 10ac76a37a19..000000000000
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2001
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-
-obj-y	+= xpedite517x.o
-obj-y	+= ddr.o
-obj-y	+= law.o
board/xes/xpedite517x/ddr.c deleted +0 -124

124 lines not on this page · raw message

board/xes/xpedite517x/law.c deleted +0 -27
deleted file mode 100644
index b82f9f0d3b11..000000000000
@@ -1,27 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2008 Freescale Semiconductor, Inc.
- *
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- */
-
-#include <common.h>
-#include <asm/fsl_law.h>
-#include <asm/mmu.h>
-
-/*
- * Notes:
- *    CCSRBAR don't need a configured Local Access Window.
- *    If flash is 8M at default position (last 8M), no LAW needed.
- */
-
-struct law_entry law_table[] = {
-	SET_LAW(CONFIG_SYS_FLASH_BASE2, LAW_SIZE_256M, LAW_TRGT_IF_LBC),
-#ifdef CONFIG_SYS_NAND_BASE
-	/* NAND LAW covers 2 NAND flashes */
-	SET_LAW(CONFIG_SYS_NAND_BASE, LAW_SIZE_512K, LAW_TRGT_IF_LBC),
-#endif
-};
-
-int num_law_entries = ARRAY_SIZE(law_table);
board/xes/xpedite517x/xpedite517x.c deleted +0 -86

86 lines not on this page · raw message

board/xes/xpedite520x/Kconfig deleted +0 -12
deleted file mode 100644
index 9c0c2461fde8..000000000000
@@ -1,12 +0,0 @@
-if TARGET_XPEDITE520X
-
-config SYS_BOARD
-	default "xpedite520x"
-
-config SYS_VENDOR
-	default "xes"
-
-config SYS_CONFIG_NAME
-	default "xpedite520x"
-
-endif
board/xes/xpedite520x/MAINTAINERS deleted +0 -6
deleted file mode 100644
index f7bd437cc66d..000000000000
@@ -1,6 +0,0 @@
-XPEDITE520X BOARD
-M:	Peter Tyser <[email protected]>
-S:	Maintained
-F:	board/xes/xpedite520x/
-F:	include/configs/xpedite520x.h
-F:	configs/xpedite520x_defconfig
board/xes/xpedite520x/Makefile deleted +0 -11
deleted file mode 100644
index 12e75da5b3cf..000000000000
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright 2008 Extreme Engineering Solutions, Inc.
-# Copyright 2004 Freescale Semiconductor.
-# (C) Copyright 2001-2006
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-
-obj-y	+= xpedite520x.o
-obj-y	+= ddr.o
-obj-y	+= law.o
-obj-y	+= tlb.o
board/xes/xpedite520x/ddr.c deleted +0 -68

68 lines not on this page · raw message

board/xes/xpedite520x/law.c deleted +0 -26
deleted file mode 100644
index 10613ead3f21..000000000000
@@ -1,26 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2008 Extreme Engineering Solutions, Inc.
- * Copyright 2008 Freescale Semiconductor, Inc.
- *
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- */
-
-#include <common.h>
-#include <asm/fsl_law.h>
-#include <asm/mmu.h>
-
-/*
- * Notes:
- *    CCSRBAR and L2-as-SRAM don't need a configured Local Access Window.
- *    If flash is 8M at default position (last 8M), no LAW needed.
- */
-
-struct law_entry law_table[] = {
-	/* LBC window - maps 256M 0xf0000000 -> 0xffffffff */
-	SET_LAW(CONFIG_SYS_FLASH_BASE2, LAW_SIZE_256M, LAW_TRGT_IF_LBC),
-	SET_LAW(CONFIG_SYS_NAND_BASE, LAW_SIZE_1M, LAW_TRGT_IF_LBC),
-};
-
-int num_law_entries = ARRAY_SIZE(law_table);
board/xes/xpedite520x/tlb.c deleted +0 -68

68 lines not on this page · raw message

board/xes/xpedite520x/xpedite520x.c deleted +0 -82

82 lines not on this page · raw message

board/xes/xpedite537x/Kconfig deleted +0 -12
deleted file mode 100644
index 35b3917a6da9..000000000000
@@ -1,12 +0,0 @@
-if TARGET_XPEDITE537X
-
-config SYS_BOARD
-	default "xpedite537x"
-
-config SYS_VENDOR
-	default "xes"
-
-config SYS_CONFIG_NAME
-	default "xpedite537x"
-
-endif
board/xes/xpedite537x/MAINTAINERS deleted +0 -6
deleted file mode 100644
index b6123acc0f99..000000000000
@@ -1,6 +0,0 @@
-XPEDITE537X BOARD
-M:	Peter Tyser <[email protected]>
-S:	Maintained
-F:	board/xes/xpedite537x/
-F:	include/configs/xpedite537x.h
-F:	configs/xpedite537x_defconfig
board/xes/xpedite537x/Makefile deleted +0 -11
deleted file mode 100644
index 82575cf05ec6..000000000000
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright 2008 Extreme Engineering Solutions, Inc.
-# Copyright 2007 Freescale Semiconductor, Inc.
-# (C) Copyright 2001-2006
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-
-obj-y	+= xpedite537x.o
-obj-y	+= ddr.o
-obj-y	+= law.o
-obj-y	+= tlb.o
board/xes/xpedite537x/ddr.c deleted +0 -234

234 lines not on this page · raw message

board/xes/xpedite537x/law.c deleted +0 -25
deleted file mode 100644
index a1f375900cbe..000000000000
@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2008 Extreme Engineering Solutions, Inc.
- * Copyright 2008 Freescale Semiconductor, Inc.
- *
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- */
-
-#include <common.h>
-#include <asm/fsl_law.h>
-#include <asm/mmu.h>
-
-/*
- * Notes:
- *    CCSRBAR and L2-as-SRAM don't need a configured Local Access Window.
- *    If flash is 8M at default position (last 8M), no LAW needed.
- */
-
-struct law_entry law_table[] = {
-	SET_LAW(CONFIG_SYS_FLASH_BASE2, LAW_SIZE_256M, LAW_TRGT_IF_LBC),
-	SET_LAW(CONFIG_SYS_NAND_BASE, LAW_SIZE_1M, LAW_TRGT_IF_LBC),
-};
-
-int num_law_entries = ARRAY_SIZE(law_table);
board/xes/xpedite537x/tlb.c deleted +0 -82

82 lines not on this page · raw message

board/xes/xpedite537x/xpedite537x.c deleted +0 -82

82 lines not on this page · raw message

board/xes/xpedite550x/Kconfig deleted +0 -12
deleted file mode 100644
index 1b00137a48c2..000000000000
@@ -1,12 +0,0 @@
-if TARGET_XPEDITE550X
-
-config SYS_BOARD
-	default "xpedite550x"
-
-config SYS_VENDOR
-	default "xes"
-
-config SYS_CONFIG_NAME
-	default "xpedite550x"
-
-endif
board/xes/xpedite550x/MAINTAINERS deleted +0 -6
deleted file mode 100644
index 017f3687578b..000000000000
@@ -1,6 +0,0 @@
-XPEDITE550X BOARD
-M:	Peter Tyser <[email protected]>
-S:	Maintained
-F:	board/xes/xpedite550x/
-F:	include/configs/xpedite550x.h
-F:	configs/xpedite550x_defconfig
board/xes/xpedite550x/Makefile deleted +0 -8
deleted file mode 100644
index 1aacb375cc50..000000000000
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright 2007-2008 Freescale Semiconductor, Inc.
-
-obj-y	+= xpedite550x.o
-obj-y	+= ddr.o
-obj-y	+= law.o
-obj-y	+= tlb.o
board/xes/xpedite550x/ddr.c deleted +0 -135

135 lines not on this page · raw message

board/xes/xpedite550x/law.c deleted +0 -25
deleted file mode 100644
index 1e2d604d9d48..000000000000
@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2010 Extreme Engineering Solutions, Inc.
- * Copyright 2008 Freescale Semiconductor, Inc.
- *
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- */
-
-#include <common.h>
-#include <asm/fsl_law.h>
-#include <asm/mmu.h>
-
-/*
- * Notes:
- *    CCSRBAR and L2-as-SRAM don't need a configured Local Access Window.
- *    If flash is 8M at default position (last 8M), no LAW needed.
- */
-
-struct law_entry law_table[] = {
-	SET_LAW(CONFIG_SYS_FLASH_BASE2, LAW_SIZE_256M, LAW_TRGT_IF_LBC),
-	SET_LAW(CONFIG_SYS_NAND_BASE, LAW_SIZE_1M, LAW_TRGT_IF_LBC),
-};
-
-int num_law_entries = ARRAY_SIZE(law_table);
board/xes/xpedite550x/tlb.c deleted +0 -81

81 lines not on this page · raw message

board/xes/xpedite550x/xpedite550x.c deleted +0 -82

82 lines not on this page · raw message

configs/xpedite517x_defconfig deleted +0 -54

54 lines not on this page · raw message

configs/xpedite520x_defconfig deleted +0 -54

54 lines not on this page · raw message

configs/xpedite537x_defconfig deleted +0 -57

57 lines not on this page · raw message

configs/xpedite550x_defconfig deleted +0 -57

57 lines not on this page · raw message

drivers/ddr/fsl/Kconfig +0 -1
index 8b480dfd6901..890e62190b1a 100644
@@ -41,7 +41,6 @@ config SYS_NUM_DDR_CTLRS
 			ARCH_T4240
 	default 2 if	ARCH_B4860	|| \
 			ARCH_BSC9132	|| \
-			ARCH_MPC8572	|| \
 			ARCH_MPC8641	|| \
 			ARCH_P4080	|| \
 			ARCH_P5040	|| \
env/Kconfig +1 -1
index ea0ee1e8bafa..c06b8ba8cb7e 100644
@@ -85,7 +85,7 @@ config ENV_IS_IN_FLASH
 	default y if M548x || M547x || M5282
 	default y if MCF532x || MCF52x2
 	default y if MPC86xx || MPC83xx
-	default y if ARCH_MPC8572 || ARCH_MPC8548 || ARCH_MPC8641
+	default y if ARCH_MPC8548 || ARCH_MPC8641
 	default y if SH && !CPU_SH4
 	help
 	  Define this if you have a flash device which you want to use for the
include/configs/xpedite517x.h deleted +0 -646

646 lines not on this page · raw message

include/configs/xpedite520x.h deleted +0 -445

445 lines not on this page · raw message

include/configs/xpedite537x.h deleted +0 -496

125 lines not on this page · raw message

include/configs/xpedite550x.h deleted +0 -494

494 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.17.1

Part of the diff is not shown here. View the raw message.

#46 lore raw

PATCH 20/27 ppc: Remove xpedite boards

----- Original Message -----

Quoted 95 lines

From: "Tom Rini" <[email protected]>
To: "U-Boot Mailing List" <[email protected]>
Cc: "ptyser" <[email protected]>
Sent: Friday, May 14, 2021 8:34:25 PM
Subject: [PATCH 20/27] ppc: Remove xpedite boards

These boards have not been converted to CONFIG_DM_PCI by the deadline and is also missing conversion to CONFIG_DM. Remove them. As this includes the last ARCH_MPC8572 platform, remove that as well.

---

arch/powerpc/cpu/mpc85xx/Kconfig          |  40 +-
arch/powerpc/cpu/mpc85xx/Makefile         |   1 -
arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c |  74 ---
arch/powerpc/cpu/mpc86xx/Kconfig          |   5 -
arch/powerpc/include/asm/fsl_law.h        |   4 +-
arch/powerpc/include/asm/immap_85xx.h     |   2 +-
board/xes/common/Makefile                 |   1 -
board/xes/xpedite517x/Kconfig             |  12 -
board/xes/xpedite517x/MAINTAINERS         |   6 -
board/xes/xpedite517x/Makefile            |   8 -
board/xes/xpedite517x/ddr.c               | 124 -----
board/xes/xpedite517x/law.c               |  27 -
board/xes/xpedite517x/xpedite517x.c       |  86 ---
board/xes/xpedite520x/Kconfig             |  12 -
board/xes/xpedite520x/MAINTAINERS         |   6 -
board/xes/xpedite520x/Makefile            |  11 -
board/xes/xpedite520x/ddr.c               |  68 ---
board/xes/xpedite520x/law.c               |  26 -
board/xes/xpedite520x/tlb.c               |  68 ---
board/xes/xpedite520x/xpedite520x.c       |  82 ---
board/xes/xpedite537x/Kconfig             |  12 -
board/xes/xpedite537x/MAINTAINERS         |   6 -
board/xes/xpedite537x/Makefile            |  11 -
board/xes/xpedite537x/ddr.c               | 234 --------
board/xes/xpedite537x/law.c               |  25 -
board/xes/xpedite537x/tlb.c               |  82 ---
board/xes/xpedite537x/xpedite537x.c       |  82 ---
board/xes/xpedite550x/Kconfig             |  12 -
board/xes/xpedite550x/MAINTAINERS         |   6 -
board/xes/xpedite550x/Makefile            |   8 -
board/xes/xpedite550x/ddr.c               | 135 -----
board/xes/xpedite550x/law.c               |  25 -
board/xes/xpedite550x/tlb.c               |  81 ---
board/xes/xpedite550x/xpedite550x.c       |  82 ---
configs/xpedite517x_defconfig             |  54 --
configs/xpedite520x_defconfig             |  54 --
configs/xpedite537x_defconfig             |  57 --
configs/xpedite550x_defconfig             |  57 --
drivers/ddr/fsl/Kconfig                   |   1 -
env/Kconfig                               |   2 +-
include/configs/xpedite517x.h             | 646 ----------------------
include/configs/xpedite520x.h             | 445 ---------------
include/configs/xpedite537x.h             | 496 -----------------
include/configs/xpedite550x.h             | 494 -----------------
44 files changed, 5 insertions(+), 3765 deletions(-)

delete mode 100644 arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c delete mode 100644 board/xes/xpedite517x/Kconfig delete mode 100644 board/xes/xpedite517x/MAINTAINERS delete mode 100644 board/xes/xpedite517x/Makefile delete mode 100644 board/xes/xpedite517x/ddr.c delete mode 100644 board/xes/xpedite517x/law.c delete mode 100644 board/xes/xpedite517x/xpedite517x.c delete mode 100644 board/xes/xpedite520x/Kconfig delete mode 100644 board/xes/xpedite520x/MAINTAINERS delete mode 100644 board/xes/xpedite520x/Makefile delete mode 100644 board/xes/xpedite520x/ddr.c delete mode 100644 board/xes/xpedite520x/law.c delete mode 100644 board/xes/xpedite520x/tlb.c delete mode 100644 board/xes/xpedite520x/xpedite520x.c delete mode 100644 board/xes/xpedite537x/Kconfig delete mode 100644 board/xes/xpedite537x/MAINTAINERS delete mode 100644 board/xes/xpedite537x/Makefile delete mode 100644 board/xes/xpedite537x/ddr.c delete mode 100644 board/xes/xpedite537x/law.c delete mode 100644 board/xes/xpedite537x/tlb.c delete mode 100644 board/xes/xpedite537x/xpedite537x.c delete mode 100644 board/xes/xpedite550x/Kconfig delete mode 100644 board/xes/xpedite550x/MAINTAINERS delete mode 100644 board/xes/xpedite550x/Makefile delete mode 100644 board/xes/xpedite550x/ddr.c delete mode 100644 board/xes/xpedite550x/law.c delete mode 100644 board/xes/xpedite550x/tlb.c delete mode 100644 board/xes/xpedite550x/xpedite550x.c delete mode 100644 configs/xpedite517x_defconfig delete mode 100644 configs/xpedite520x_defconfig delete mode 100644 configs/xpedite537x_defconfig delete mode 100644 configs/xpedite550x_defconfig delete mode 100644 include/configs/xpedite517x.h delete mode 100644 include/configs/xpedite520x.h delete mode 100644 include/configs/xpedite537x.h delete mode 100644 include/configs/xpedite550x.h

<snip>

author
#47 lore raw

Re: [PATCH 20/27] ppc: Remove xpedite boards

In reply to Tom Rini
Quoted 7 lines · Tom Rini

These boards have not been converted to CONFIG_DM_PCI by the deadline and is also missing conversion to CONFIG_DM. Remove them. As this includes the last ARCH_MPC8572 platform, remove that as well.

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
author
#48 lore raw

PATCH 21/27 ppc: Remove sbc8641d board

In reply to Tom Rini

This board has not been converted to CONFIG_DM_PCI by the deadline and is also missing conversion to CONFIG_DM. Remove it. This is also the last of the ARCH_MPC8641/MPC8610 platforms, so remove that support as well.

Cc Paul Gortmaker <[email protected]>
Cc Priyanka Jain <[email protected]>
---
 .azure-pipelines.yml                      |    2 +-
 MAINTAINERS                               |    6 -
 README                                    |    3 +-
 arch/powerpc/Kconfig                      |    7 -
 arch/powerpc/cpu/mpc86xx/Kconfig          |   52 -
 arch/powerpc/cpu/mpc86xx/Makefile         |   24 -
 arch/powerpc/cpu/mpc86xx/cache.S          |  332 ------
 arch/powerpc/cpu/mpc86xx/config.mk        |    6 -
 arch/powerpc/cpu/mpc86xx/cpu.c            |  207 ----
 arch/powerpc/cpu/mpc86xx/cpu_init.c       |  104 --
 arch/powerpc/cpu/mpc86xx/fdt.c            |   52 -
 arch/powerpc/cpu/mpc86xx/interrupts.c     |  116 --
 arch/powerpc/cpu/mpc86xx/mp.c             |  130 ---
 arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c |   87 --
 arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c |   96 --
 arch/powerpc/cpu/mpc86xx/release.S        |  149 ---
 arch/powerpc/cpu/mpc86xx/speed.c          |  134 ---
 arch/powerpc/cpu/mpc86xx/start.S          |  982 -----------------
 arch/powerpc/cpu/mpc86xx/traps.c          |  199 ----
 arch/powerpc/cpu/mpc86xx/u-boot.lds       |   77 --
 arch/powerpc/include/asm/config.h         |    4 -
 arch/powerpc/include/asm/config_mpc86xx.h |    9 -
 arch/powerpc/include/asm/fsl_law.h        |    7 -
 arch/powerpc/include/asm/fsl_pci.h        |    2 +-
 arch/powerpc/include/asm/immap_86xx.h     | 1221 ---------------------
 arch/powerpc/include/asm/ppc.h            |    4 -
 board/sbc8641d/Kconfig                    |    9 -
 board/sbc8641d/MAINTAINERS                |    6 -
 board/sbc8641d/Makefile                   |    8 -
 board/sbc8641d/README                     |   49 -
 board/sbc8641d/ddr.c                      |   53 -
 board/sbc8641d/law.c                      |   39 -
 board/sbc8641d/sbc8641d.c                 |  268 -----
 configs/sbc8641d_defconfig                |   39 -
 doc/git-mailrc                            |    1 -
 drivers/ddr/fsl/Kconfig                   |   12 +-
 drivers/ddr/fsl/Makefile                  |    1 -
 drivers/ddr/fsl/mpc86xx_ddr.c             |   84 --
 env/Kconfig                               |    2 +-
 include/configs/sbc8641d.h                |  509 ---------
 include/post.h                            |    5 -
 41 files changed, 6 insertions(+), 5091 deletions(-)
 delete mode 100644 arch/powerpc/cpu/mpc86xx/Kconfig
 delete mode 100644 arch/powerpc/cpu/mpc86xx/Makefile
 delete mode 100644 arch/powerpc/cpu/mpc86xx/cache.S
 delete mode 100644 arch/powerpc/cpu/mpc86xx/config.mk
 delete mode 100644 arch/powerpc/cpu/mpc86xx/cpu.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/cpu_init.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/fdt.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/interrupts.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/mp.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/release.S
 delete mode 100644 arch/powerpc/cpu/mpc86xx/speed.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/start.S
 delete mode 100644 arch/powerpc/cpu/mpc86xx/traps.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/u-boot.lds
 delete mode 100644 arch/powerpc/include/asm/config_mpc86xx.h
 delete mode 100644 arch/powerpc/include/asm/immap_86xx.h
 delete mode 100644 board/sbc8641d/Kconfig
 delete mode 100644 board/sbc8641d/MAINTAINERS
 delete mode 100644 board/sbc8641d/Makefile
 delete mode 100644 board/sbc8641d/README
 delete mode 100644 board/sbc8641d/ddr.c
 delete mode 100644 board/sbc8641d/law.c
 delete mode 100644 board/sbc8641d/sbc8641d.c
 delete mode 100644 configs/sbc8641d_defconfig
 delete mode 100644 drivers/ddr/fsl/mpc86xx_ddr.c
 delete mode 100644 include/configs/sbc8641d.h
.azure-pipelines.yml +1 -1
index 59e99b8894c5..8a567832ddac 100644
@@ -415,7 +415,7 @@ jobs:
         t208xrdb_corenet_ds:
           BUILDMAN: "t208xrdb corenet_ds"
         fsl_ppc:
-          BUILDMAN: "t4qds b4860qds mpc83xx&freescale mpc86xx&freescale"
+          BUILDMAN: "t4qds b4860qds mpc83xx&freescale"
         t102x:
           BUILDMAN: "t102*"
         p1_p2_rdb_pc:
MAINTAINERS +0 -6
index 20092cb36740..7e36eb56a3af 100644
@@ -973,12 +973,6 @@ S:	Maintained
 T:	git https://source.denx.de/u-boot/custodians/u-boot-mpc85xx.git
 F:	arch/powerpc/cpu/mpc85xx/
 
-POWERPC MPC86XX
-M:	Priyanka Jain <[email protected]>
-S:	Maintained
-T:	git https://source.denx.de/u-boot/custodians/u-boot-mpc86xx.git
-F:	arch/powerpc/cpu/mpc86xx/
-
 RISC-V
 M:	Rick Chen <[email protected]>
 S:	Maintained
README +1 -2
index ad13092bbb7a..63568dc43c74 100644
@@ -423,8 +423,7 @@ The following options need to be configured:
 
 		CONFIG_SYS_FSL_DDR
 		Freescale DDR driver in use. This type of DDR controller is
-		found in mpc83xx, mpc85xx, mpc86xx as well as some ARM core
-		SoCs.
+		found in mpc83xx, mpc85xx as well as some ARM core SoCs.
 
 		CONFIG_SYS_FSL_DDR_ADDR
 		Freescale DDR memory-mapped register base.
arch/powerpc/Kconfig +0 -7
index 133447648cc6..737bdd8edb41 100644
@@ -25,12 +25,6 @@ config MPC85xx
 	imply CMD_IRQ
 	imply USB_EHCI_HCD if USB
 
-config MPC86xx
-	bool "MPC86xx"
-	select SYS_FSL_DDR
-	select SYS_FSL_DDR_BE
-	imply CMD_REGINFO
-
 config MPC8xx
 	bool "MPC8xx"
 	select BOARD_EARLY_INIT_F
@@ -47,7 +41,6 @@ config HIGH_BATS
 
 source "arch/powerpc/cpu/mpc83xx/Kconfig"
 source "arch/powerpc/cpu/mpc85xx/Kconfig"
-source "arch/powerpc/cpu/mpc86xx/Kconfig"
 source "arch/powerpc/cpu/mpc8xx/Kconfig"
 source "arch/powerpc/lib/Kconfig"
 
arch/powerpc/cpu/mpc86xx/Kconfig deleted +0 -52

52 lines not on this page · raw message

arch/powerpc/cpu/mpc86xx/Makefile deleted +0 -24
deleted file mode 100644
index 6e12be6a3f24..000000000000
@@ -1,24 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright 2007 Freescale Semiconductor, Inc.
-# (C) Copyright 2002,2003 Motorola Inc.
-# Xianghua Xiao,X.Xiao at motorola.com
-#
-# (C) Copyright 2004 Freescale Semiconductor. (MC86xx Port)
-# Jeff Brown
-#
-
-extra-y	= start.o
-extra-y	+= traps.o
-
-obj-y += cache.o
-obj-$(CONFIG_MP) += release.o
-
-obj-y	+= cpu.o
-obj-y	+= cpu_init.o
-obj-$(CONFIG_OF_LIBFDT) += fdt.o
-obj-y	+= interrupts.o
-obj-$(CONFIG_MP) += mp.o
-obj-$(CONFIG_ARCH_MPC8610) += mpc8610_serdes.o
-obj-$(CONFIG_ARCH_MPC8641) += mpc8641_serdes.o
-obj-y	+= speed.o
arch/powerpc/cpu/mpc86xx/cache.S deleted +0 -332

332 lines not on this page · raw message

arch/powerpc/cpu/mpc86xx/config.mk deleted +0 -6
deleted file mode 100644
index 5db5b0b4ed7e..000000000000
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2004 Freescale Semiconductor.
-# Jeff Brown
-
-PLATFORM_CPPFLAGS += -mcpu=7400 -mstring -maltivec -mabi=altivec -msoft-float
arch/powerpc/cpu/mpc86xx/cpu.c deleted +0 -207

207 lines not on this page · raw message

arch/powerpc/cpu/mpc86xx/cpu_init.c deleted +0 -104

104 lines not on this page · raw message

arch/powerpc/cpu/mpc86xx/fdt.c deleted +0 -52

52 lines not on this page · raw message

arch/powerpc/cpu/mpc86xx/interrupts.c deleted +0 -116

116 lines not on this page · raw message

arch/powerpc/cpu/mpc86xx/mp.c deleted +0 -130

130 lines not on this page · raw message

arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c deleted +0 -87

87 lines not on this page · raw message

arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c deleted +0 -96

96 lines not on this page · raw message

arch/powerpc/cpu/mpc86xx/release.S deleted +0 -149

149 lines not on this page · raw message

arch/powerpc/cpu/mpc86xx/speed.c deleted +0 -134

134 lines not on this page · raw message

arch/powerpc/cpu/mpc86xx/start.S deleted +0 -982

982 lines not on this page · raw message

arch/powerpc/cpu/mpc86xx/traps.c deleted +0 -199

199 lines not on this page · raw message

arch/powerpc/cpu/mpc86xx/u-boot.lds deleted +0 -77

77 lines not on this page · raw message

arch/powerpc/include/asm/config.h +0 -4
index 99b410dc9b09..2c96378efef8 100644
@@ -10,10 +10,6 @@
 #include <asm/config_mpc85xx.h>
 #endif
 
-#ifdef CONFIG_MPC86xx
-#include <asm/config_mpc86xx.h>
-#endif
-
 #ifndef HWCONFIG_BUFFER_SIZE
   #define HWCONFIG_BUFFER_SIZE 256
 #endif
arch/powerpc/include/asm/config_mpc86xx.h deleted +0 -9
deleted file mode 100644
index f19ff7a6a128..000000000000
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright 2011 Freescale Semiconductor, Inc.
- */
-
-#ifndef _ASM_MPC86xx_CONFIG_H_
-#define _ASM_MPC86xx_CONFIG_H_
-
-#endif /* _ASM_MPC85xx_CONFIG_H_ */
arch/powerpc/include/asm/fsl_law.h +0 -7
index 77cdc80fdcd0..39fbc04e4744 100644
@@ -78,9 +78,6 @@ enum law_trgt_if {
 enum law_trgt_if {
 	LAW_TRGT_IF_PCI = 0x00,
 	LAW_TRGT_IF_PCI_2 = 0x01,
-#ifndef CONFIG_ARCH_MPC8641
-	LAW_TRGT_IF_PCIE_1 = 0x02,
-#endif
 #if defined(CONFIG_ARCH_BSC9131) || defined(CONFIG_ARCH_BSC9132)
 	LAW_TRGT_IF_OCN_DSP = 0x03,
 #else
@@ -116,10 +113,6 @@ enum law_trgt_if {
 #define LAW_TRGT_IF_RIO_1	LAW_TRGT_IF_RIO
 #define LAW_TRGT_IF_IFC		LAW_TRGT_IF_LBC
 
-#ifdef CONFIG_ARCH_MPC8641
-#define LAW_TRGT_IF_PCIE_1	LAW_TRGT_IF_PCI
-#endif
-
 #if defined(CONFIG_ARCH_P2020)
 #define LAW_TRGT_IF_PCIE_3	LAW_TRGT_IF_PCI
 #endif
arch/powerpc/include/asm/fsl_pci.h +1 -1
index 508834829b95..06f9bfb8ac73 100644
@@ -30,7 +30,7 @@ void fsl_pci_config_unlock(struct pci_controller *hose);
 void ft_fsl_pci_setup(void *blob, const char *compat, unsigned long ctrl_addr);
 
 /*
- * Common PCI/PCIE Register structure for mpc85xx and mpc86xx
+ * Common PCI/PCIE Register structure for mpc85xx
  */
 
 /*
arch/powerpc/include/asm/immap_86xx.h deleted +0 -1221

159 lines not on this page · raw message

arch/powerpc/include/asm/ppc.h +0 -4
index 055364c58fd9..2923350bd7b9 100644

Lines of this file are not shown. View the raw message.

board/sbc8641d/Kconfig deleted +0 -9
deleted file mode 100644
index 8dfc90cf8bc9..000000000000

Lines of this file are not shown. View the raw message.

board/sbc8641d/MAINTAINERS deleted +0 -6
deleted file mode 100644
index a50b541ffe84..000000000000

Lines of this file are not shown. View the raw message.

board/sbc8641d/Makefile deleted +0 -8
deleted file mode 100644
index c48f82d3d931..000000000000

Lines of this file are not shown. View the raw message.

board/sbc8641d/README deleted +0 -49

49 lines not on this page · raw message

board/sbc8641d/ddr.c deleted +0 -53

53 lines not on this page · raw message

board/sbc8641d/law.c deleted +0 -39
deleted file mode 100644
index dc4696d123f4..000000000000

Lines of this file are not shown. View the raw message.

board/sbc8641d/sbc8641d.c deleted +0 -268

268 lines not on this page · raw message

configs/sbc8641d_defconfig deleted +0 -39
deleted file mode 100644
index ea601dea6f40..000000000000

Lines of this file are not shown. View the raw message.

doc/git-mailrc +0 -1
index f520ff89b390..b8299a1a6c30 100644

Lines of this file are not shown. View the raw message.

drivers/ddr/fsl/Kconfig +2 -10
index 890e62190b1a..e6a51f560978 100644

Lines of this file are not shown. View the raw message.

drivers/ddr/fsl/Makefile +0 -1
index c675f44ab00c..8081d0cd82f3 100644

Lines of this file are not shown. View the raw message.

drivers/ddr/fsl/mpc86xx_ddr.c deleted +0 -84

84 lines not on this page · raw message

env/Kconfig +1 -1
index c06b8ba8cb7e..691f4d480cc4 100644

Lines of this file are not shown. View the raw message.

include/configs/sbc8641d.h deleted +0 -509

509 lines not on this page · raw message

include/post.h +0 -5
index 5695e2b5334f..a07a6bc5e252 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.17.1

Part of the diff is not shown here. View the raw message.

#49 lore raw

PATCH 21/27 ppc: Remove sbc8641d board

Hi Tom,

Quoted 71 lines · Tom Rini

This board has not been converted to CONFIG_DM_PCI by the deadline and is also missing conversion to CONFIG_DM. Remove it. This is also the last of the ARCH_MPC8641/MPC8610 platforms, so remove that support as well.

Cc Paul Gortmaker <[email protected]>
Cc Priyanka Jain <[email protected]>
---
 .azure-pipelines.yml                      |    2 +-
 MAINTAINERS                               |    6 -
 README                                    |    3 +-
 arch/powerpc/Kconfig                      |    7 -
 arch/powerpc/cpu/mpc86xx/Kconfig          |   52 -
 arch/powerpc/cpu/mpc86xx/Makefile         |   24 -
 arch/powerpc/cpu/mpc86xx/cache.S          |  332 ------
 arch/powerpc/cpu/mpc86xx/config.mk        |    6 -
 arch/powerpc/cpu/mpc86xx/cpu.c            |  207 ----
 arch/powerpc/cpu/mpc86xx/cpu_init.c       |  104 --
 arch/powerpc/cpu/mpc86xx/fdt.c            |   52 -
 arch/powerpc/cpu/mpc86xx/interrupts.c     |  116 --
 arch/powerpc/cpu/mpc86xx/mp.c             |  130 ---
 arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c |   87 --
 arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c |   96 --
 arch/powerpc/cpu/mpc86xx/release.S        |  149 ---
 arch/powerpc/cpu/mpc86xx/speed.c          |  134 ---
 arch/powerpc/cpu/mpc86xx/start.S          |  982 -----------------
 arch/powerpc/cpu/mpc86xx/traps.c          |  199 ----
 arch/powerpc/cpu/mpc86xx/u-boot.lds       |   77 --
 arch/powerpc/include/asm/config.h         |    4 -
 arch/powerpc/include/asm/config_mpc86xx.h |    9 -
 arch/powerpc/include/asm/fsl_law.h        |    7 -
 arch/powerpc/include/asm/fsl_pci.h        |    2 +-
 arch/powerpc/include/asm/immap_86xx.h     | 1221 ---------------------
 arch/powerpc/include/asm/ppc.h            |    4 -
 board/sbc8641d/Kconfig                    |    9 -
 board/sbc8641d/MAINTAINERS                |    6 -
 board/sbc8641d/Makefile                   |    8 -
 board/sbc8641d/README                     |   49 -
 board/sbc8641d/ddr.c                      |   53 -
 board/sbc8641d/law.c                      |   39 -
 board/sbc8641d/sbc8641d.c                 |  268 -----
 configs/sbc8641d_defconfig                |   39 -
 doc/git-mailrc                            |    1 -
 drivers/ddr/fsl/Kconfig                   |   12 +-
 drivers/ddr/fsl/Makefile                  |    1 -
 drivers/ddr/fsl/mpc86xx_ddr.c             |   84 --
 env/Kconfig                               |    2 +-
 include/configs/sbc8641d.h                |  509 ---------
 include/post.h                            |    5 -
 41 files changed, 6 insertions(+), 5091 deletions(-)
 delete mode 100644 arch/powerpc/cpu/mpc86xx/Kconfig
 delete mode 100644 arch/powerpc/cpu/mpc86xx/Makefile
 delete mode 100644 arch/powerpc/cpu/mpc86xx/cache.S
 delete mode 100644 arch/powerpc/cpu/mpc86xx/config.mk
 delete mode 100644 arch/powerpc/cpu/mpc86xx/cpu.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/cpu_init.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/fdt.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/interrupts.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/mp.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/release.S
 delete mode 100644 arch/powerpc/cpu/mpc86xx/speed.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/start.S
 delete mode 100644 arch/powerpc/cpu/mpc86xx/traps.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/u-boot.lds
 delete mode 100644 arch/powerpc/include/asm/config_mpc86xx.h
 delete mode 100644 arch/powerpc/include/asm/immap_86xx.h
 delete mode 100644 board/sbc8641d/Kconfig
 delete mode 100644 board/sbc8641d/MAINTAINERS
Quoted 9 lines
 delete mode 100644 board/sbc8641d/Makefile
 delete mode 100644 board/sbc8641d/README
 delete mode 100644 board/sbc8641d/ddr.c
 delete mode 100644 board/sbc8641d/law.c
 delete mode 100644 board/sbc8641d/sbc8641d.c
 delete mode 100644 configs/sbc8641d_defconfig
 delete mode 100644 drivers/ddr/fsl/mpc86xx_ddr.c
 delete mode 100644 include/configs/sbc8641d.h
#50 lore raw

PATCH 21/27 ppc: Remove sbc8641d board

In reply to Tom Rini
Quoted 5 lines · [[PATCH 21/27] ppc: Remove sbc8641d board] On 14/05/2021 (Fri 21:34) Tom Rini…

This board has not been converted to CONFIG_DM_PCI by the deadline and is also missing conversion to CONFIG_DM. Remove it. This is also the last of the ARCH_MPC8641/MPC8610 platforms, so remove that support as well.

Cc Paul Gortmaker <[email protected]>

Ack'd -- I'd sent the kernel removal several months ago, but that hasn't been merged yet...

https://patchwork.ozlabs.org/project/linuxppc-dev/patch/20210111082823.99562-3-paul.gortmaker at windriver.com/

Thanks,
Paul.
--

Quoted 5,520 lines
Cc Priyanka Jain <[email protected]>
---
 .azure-pipelines.yml                      |    2 +-
 MAINTAINERS                               |    6 -
 README                                    |    3 +-
 arch/powerpc/Kconfig                      |    7 -
 arch/powerpc/cpu/mpc86xx/Kconfig          |   52 -
 arch/powerpc/cpu/mpc86xx/Makefile         |   24 -
 arch/powerpc/cpu/mpc86xx/cache.S          |  332 ------
 arch/powerpc/cpu/mpc86xx/config.mk        |    6 -
 arch/powerpc/cpu/mpc86xx/cpu.c            |  207 ----
 arch/powerpc/cpu/mpc86xx/cpu_init.c       |  104 --
 arch/powerpc/cpu/mpc86xx/fdt.c            |   52 -
 arch/powerpc/cpu/mpc86xx/interrupts.c     |  116 --
 arch/powerpc/cpu/mpc86xx/mp.c             |  130 ---
 arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c |   87 --
 arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c |   96 --
 arch/powerpc/cpu/mpc86xx/release.S        |  149 ---
 arch/powerpc/cpu/mpc86xx/speed.c          |  134 ---
 arch/powerpc/cpu/mpc86xx/start.S          |  982 -----------------
 arch/powerpc/cpu/mpc86xx/traps.c          |  199 ----
 arch/powerpc/cpu/mpc86xx/u-boot.lds       |   77 --
 arch/powerpc/include/asm/config.h         |    4 -
 arch/powerpc/include/asm/config_mpc86xx.h |    9 -
 arch/powerpc/include/asm/fsl_law.h        |    7 -
 arch/powerpc/include/asm/fsl_pci.h        |    2 +-
 arch/powerpc/include/asm/immap_86xx.h     | 1221 ---------------------
 arch/powerpc/include/asm/ppc.h            |    4 -
 board/sbc8641d/Kconfig                    |    9 -
 board/sbc8641d/MAINTAINERS                |    6 -
 board/sbc8641d/Makefile                   |    8 -
 board/sbc8641d/README                     |   49 -
 board/sbc8641d/ddr.c                      |   53 -
 board/sbc8641d/law.c                      |   39 -
 board/sbc8641d/sbc8641d.c                 |  268 -----
 configs/sbc8641d_defconfig                |   39 -
 doc/git-mailrc                            |    1 -
 drivers/ddr/fsl/Kconfig                   |   12 +-
 drivers/ddr/fsl/Makefile                  |    1 -
 drivers/ddr/fsl/mpc86xx_ddr.c             |   84 --
 env/Kconfig                               |    2 +-
 include/configs/sbc8641d.h                |  509 ---------
 include/post.h                            |    5 -
 41 files changed, 6 insertions(+), 5091 deletions(-)
 delete mode 100644 arch/powerpc/cpu/mpc86xx/Kconfig
 delete mode 100644 arch/powerpc/cpu/mpc86xx/Makefile
 delete mode 100644 arch/powerpc/cpu/mpc86xx/cache.S
 delete mode 100644 arch/powerpc/cpu/mpc86xx/config.mk
 delete mode 100644 arch/powerpc/cpu/mpc86xx/cpu.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/cpu_init.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/fdt.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/interrupts.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/mp.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/release.S
 delete mode 100644 arch/powerpc/cpu/mpc86xx/speed.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/start.S
 delete mode 100644 arch/powerpc/cpu/mpc86xx/traps.c
 delete mode 100644 arch/powerpc/cpu/mpc86xx/u-boot.lds
 delete mode 100644 arch/powerpc/include/asm/config_mpc86xx.h
 delete mode 100644 arch/powerpc/include/asm/immap_86xx.h
 delete mode 100644 board/sbc8641d/Kconfig
 delete mode 100644 board/sbc8641d/MAINTAINERS
 delete mode 100644 board/sbc8641d/Makefile
 delete mode 100644 board/sbc8641d/README
 delete mode 100644 board/sbc8641d/ddr.c
 delete mode 100644 board/sbc8641d/law.c
 delete mode 100644 board/sbc8641d/sbc8641d.c
 delete mode 100644 configs/sbc8641d_defconfig
 delete mode 100644 drivers/ddr/fsl/mpc86xx_ddr.c
 delete mode 100644 include/configs/sbc8641d.h
.azure-pipelines.yml +1 -1
index 59e99b8894c5..8a567832ddac 100644
@@ -415,7 +415,7 @@ jobs:
         t208xrdb_corenet_ds:
           BUILDMAN: "t208xrdb corenet_ds"
         fsl_ppc:
-          BUILDMAN: "t4qds b4860qds mpc83xx&freescale mpc86xx&freescale"
+          BUILDMAN: "t4qds b4860qds mpc83xx&freescale"
         t102x:
           BUILDMAN: "t102*"
         p1_p2_rdb_pc:
MAINTAINERS +0 -6
index 20092cb36740..7e36eb56a3af 100644
@@ -973,12 +973,6 @@ S:	Maintained
 T:	git https://source.denx.de/u-boot/custodians/u-boot-mpc85xx.git
 F:	arch/powerpc/cpu/mpc85xx/
 
-POWERPC MPC86XX
-M:	Priyanka Jain <[email protected]>
-S:	Maintained
-T:	git https://source.denx.de/u-boot/custodians/u-boot-mpc86xx.git
-F:	arch/powerpc/cpu/mpc86xx/
-
 RISC-V
 M:	Rick Chen <[email protected]>
 S:	Maintained
README +1 -2
index ad13092bbb7a..63568dc43c74 100644
@@ -423,8 +423,7 @@ The following options need to be configured:
 
 		CONFIG_SYS_FSL_DDR
 		Freescale DDR driver in use. This type of DDR controller is
-		found in mpc83xx, mpc85xx, mpc86xx as well as some ARM core
-		SoCs.
+		found in mpc83xx, mpc85xx as well as some ARM core SoCs.
 
 		CONFIG_SYS_FSL_DDR_ADDR
 		Freescale DDR memory-mapped register base.
arch/powerpc/Kconfig +0 -7
index 133447648cc6..737bdd8edb41 100644
@@ -25,12 +25,6 @@ config MPC85xx
 	imply CMD_IRQ
 	imply USB_EHCI_HCD if USB
 
-config MPC86xx
-	bool "MPC86xx"
-	select SYS_FSL_DDR
-	select SYS_FSL_DDR_BE
-	imply CMD_REGINFO
-
 config MPC8xx
 	bool "MPC8xx"
 	select BOARD_EARLY_INIT_F
@@ -47,7 +41,6 @@ config HIGH_BATS
 
 source "arch/powerpc/cpu/mpc83xx/Kconfig"
 source "arch/powerpc/cpu/mpc85xx/Kconfig"
-source "arch/powerpc/cpu/mpc86xx/Kconfig"
 source "arch/powerpc/cpu/mpc8xx/Kconfig"
 source "arch/powerpc/lib/Kconfig"
 
arch/powerpc/cpu/mpc86xx/Kconfig deleted +0 -52
deleted file mode 100644
index 1ee87038bed4..000000000000
@@ -1,52 +0,0 @@
-menu "mpc86xx CPU"
-	depends on MPC86xx
-
-config SYS_CPU
-	default "mpc86xx"
-
-choice
-	prompt "Target select"
-	optional
-
-config TARGET_SBC8641D
-	bool "Support sbc8641d"
-	select ARCH_MPC8641
-	select BOARD_EARLY_INIT_F
-
-endchoice
-
-config ARCH_MPC8610
-	bool
-	select FSL_LAW
-	select SYS_FSL_HAS_DDR1
-	select SYS_FSL_HAS_DDR2
-
-config ARCH_MPC8641
-	bool
-	select FSL_LAW
-	select SYS_FSL_HAS_DDR1
-	select SYS_FSL_HAS_DDR2
-
-config FSL_LAW
-	bool
-	help
-		Use Freescale common code for Local Access Window
-
-config SYS_CCSRBAR_DEFAULT
-	hex "Default CCSRBAR address"
-	default 0xff700000 if ARCH_MPC8610 || ARCH_MPC8641
-	help
-		Default value of CCSRBAR comes from power-on-reset. It
-		is fixed on each SoC. Some SoCs can have different value
-		if changed by pre-boot regime. The value here must match
-		the current value in SoC. If not sure, do not change.
-config SYS_FSL_NUM_LAWS
-	int "Number of local access windows"
-	default 10 if ARCH_MPC8610 || ARCH_MPC8641
-	help
-		Number of local access windows. This is fixed per SoC.
-		If not sure, do not change.
-
-source "board/sbc8641d/Kconfig"
-
-endmenu
arch/powerpc/cpu/mpc86xx/Makefile deleted +0 -24
deleted file mode 100644
index 6e12be6a3f24..000000000000
@@ -1,24 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright 2007 Freescale Semiconductor, Inc.
-# (C) Copyright 2002,2003 Motorola Inc.
-# Xianghua Xiao,X.Xiao at motorola.com
-#
-# (C) Copyright 2004 Freescale Semiconductor. (MC86xx Port)
-# Jeff Brown
-#
-
-extra-y	= start.o
-extra-y	+= traps.o
-
-obj-y += cache.o
-obj-$(CONFIG_MP) += release.o
-
-obj-y	+= cpu.o
-obj-y	+= cpu_init.o
-obj-$(CONFIG_OF_LIBFDT) += fdt.o
-obj-y	+= interrupts.o
-obj-$(CONFIG_MP) += mp.o
-obj-$(CONFIG_ARCH_MPC8610) += mpc8610_serdes.o
-obj-$(CONFIG_ARCH_MPC8641) += mpc8641_serdes.o
-obj-y	+= speed.o
arch/powerpc/cpu/mpc86xx/cache.S deleted +0 -332
deleted file mode 100644
index 34968c604d7b..000000000000
@@ -1,332 +0,0 @@
-#include <config.h>
-#include <mpc86xx.h>
-
-#include <ppc_asm.tmpl>
-#include <ppc_defs.h>
-
-#include <asm/cache.h>
-#include <asm/mmu.h>
-
-#ifndef CACHE_LINE_SIZE
-# define CACHE_LINE_SIZE L1_CACHE_BYTES
-#endif
-
-#if CACHE_LINE_SIZE == 128
-#define LG_CACHE_LINE_SIZE 7
-#elif CACHE_LINE_SIZE == 32
-#define LG_CACHE_LINE_SIZE 5
-#elif CACHE_LINE_SIZE == 16
-#define LG_CACHE_LINE_SIZE 4
-#elif CACHE_LINE_SIZE == 8
-#define LG_CACHE_LINE_SIZE 3
-#else
-# error "Invalid cache line size!"
-#endif
-
-/*
- * Most of this code is taken from 74xx_7xx/cache.S
- * and then cleaned up a bit
- */
-
-/*
- * Invalidate L1 instruction cache.
- */
-_GLOBAL(invalidate_l1_instruction_cache)
-	/* use invalidate-all bit in HID0 */
-	mfspr	r3,HID0
-	ori	r3,r3,HID0_ICFI
-	mtspr	HID0,r3
-	isync
-	blr
-
-/*
- * Invalidate L1 data cache.
- */
-_GLOBAL(invalidate_l1_data_cache)
-	mfspr	r3,HID0
-	ori	r3,r3,HID0_DCFI
-	mtspr	HID0,r3
-	isync
-	blr
-
-/*
- * Flush data cache.
- */
-_GLOBAL(flush_dcache)
-	lis	r3,0
-	lis	r5,CACHE_LINE_SIZE
-flush:
-	cmp	0,1,r3,r5
-	bge	done
-	lwz	r5,0(r3)
-	lis	r5,CACHE_LINE_SIZE
-	addi	r3,r3,0x4
-	b	flush
-done:
-	blr
-/*
- * Write any modified data cache blocks out to memory
- * and invalidate the corresponding instruction cache blocks.
- * This is a no-op on the 601.
- *
- * flush_icache_range(unsigned long start, unsigned long stop)
- */
-_GLOBAL(flush_icache_range)
-	li	r5,CACHE_LINE_SIZE-1
-	andc	r3,r3,r5
-	subf	r4,r3,r4
-	add	r4,r4,r5
-	srwi.	r4,r4,LG_CACHE_LINE_SIZE
-	beqlr
-	mtctr	r4
-	mr	r6,r3
-1:	dcbst	0,r3
-	addi	r3,r3,CACHE_LINE_SIZE
-	bdnz	1b
-	sync				/* wait for dcbst's to get to ram */
-	mtctr	r4
-2:	icbi	0,r6
-	addi	r6,r6,CACHE_LINE_SIZE
-	bdnz	2b
-	sync				/* additional sync needed on g4 */
-	isync
-	blr
-/*
- * Write any modified data cache blocks out to memory.
- * Does not invalidate the corresponding cache lines (especially for
- * any corresponding instruction cache).
- *
- * clean_dcache_range(unsigned long start, unsigned long stop)
- */
-_GLOBAL(clean_dcache_range)
-	li	r5,CACHE_LINE_SIZE-1
-	andc	r3,r3,r5	/* align r3 down to cache line */
-	subf	r4,r3,r4	/* r4 = offset of stop from start of cache line */
-	add	r4,r4,r5	/* r4 += cache_line_size-1 */
-	srwi.	r4,r4,LG_CACHE_LINE_SIZE  /* r4 = number of cache lines to flush */
-	beqlr				  /* if r4 == 0 return */
-	mtctr	r4			  /* ctr = r4 */
-
-	sync
-1:	dcbst	0,r3
-	addi	r3,r3,CACHE_LINE_SIZE
-	bdnz	1b
-	sync				/* wait for dcbst's to get to ram */
-	blr
-
-/*
- * Flush a particular page from the data cache to RAM.
- * Note: this is necessary because the instruction cache does *not*
- * snoop from the data cache.
- *
- *	void __flush_page_to_ram(void *page)
- */
-_GLOBAL(__flush_page_to_ram)
-	rlwinm	r3,r3,0,0,19		/* Get page base address */
-	li	r4,4096/CACHE_LINE_SIZE	/* Number of lines in a page */
-	mtctr	r4
-	mr	r6,r3
-0:	dcbst	0,r3			/* Write line to ram */
-	addi	r3,r3,CACHE_LINE_SIZE
-	bdnz	0b
-	sync
-	mtctr	r4
-1:	icbi	0,r6
-	addi	r6,r6,CACHE_LINE_SIZE
-	bdnz	1b
-	sync
-	isync
-	blr
-
-/*
- * Flush a particular page from the instruction cache.
- * Note: this is necessary because the instruction cache does *not*
- * snoop from the data cache.
- *
- *	void __flush_icache_page(void *page)
- */
-_GLOBAL(__flush_icache_page)
-	li	r4,4096/CACHE_LINE_SIZE	/* Number of lines in a page */
-	mtctr	r4
-1:	icbi	0,r3
-	addi	r3,r3,CACHE_LINE_SIZE
-	bdnz	1b
-	sync
-	isync
-	blr
-
-/*
- * Clear a page using the dcbz instruction, which doesn't cause any
- * memory traffic (except to write out any cache lines which get
- * displaced).  This only works on cacheable memory.
- */
-_GLOBAL(clear_page)
-	li	r0,4096/CACHE_LINE_SIZE
-	mtctr	r0
-1:	dcbz	0,r3
-	addi	r3,r3,CACHE_LINE_SIZE
-	bdnz	1b
-	blr
-
-/*
- * Enable L1 Instruction cache
- */
-_GLOBAL(icache_enable)
-	mfspr	r3, HID0
-	li	r5, HID0_ICFI|HID0_ILOCK
-	andc	r3, r3, r5
-	ori	r3, r3, HID0_ICE
-	ori	r5, r3, HID0_ICFI
-	mtspr	HID0, r5
-	mtspr	HID0, r3
-	isync
-	blr
-
-/*
- * Disable L1 Instruction cache
- */
-_GLOBAL(icache_disable)
-	mflr	r4
-	bl	invalidate_l1_instruction_cache		/* uses r3 */
-	sync
-	mtlr	r4
-	mfspr	r3, HID0
-	li	r5, 0
-	ori	r5, r5, HID0_ICE
-	andc	r3, r3, r5
-	mtspr	HID0, r3
-	isync
-	blr
-
-/*
- * Is instruction cache enabled?
- */
-_GLOBAL(icache_status)
-	mfspr	r3, HID0
-	andi.	r3, r3, HID0_ICE
-	blr
-
-
-_GLOBAL(l1dcache_enable)
-	mfspr	r3, HID0
-	li	r5, HID0_DCFI|HID0_DLOCK
-	andc	r3, r3, r5
-	mtspr	HID0, r3		/* no invalidate, unlock */
-	ori	r3, r3, HID0_DCE
-	ori	r5, r3, HID0_DCFI
-	mtspr	HID0, r5		/* enable + invalidate */
-	mtspr	HID0, r3		/* enable */
-	sync
-	blr
-
-/*
- * Enable data cache(s) - L1 and optionally L2
- * Calls l2cache_enable. LR saved in r5
- */
-_GLOBAL(dcache_enable)
-	mfspr	r3, HID0
-	li	r5, HID0_DCFI|HID0_DLOCK
-	andc	r3, r3, r5
-	mtspr	HID0, r3		/* no invalidate, unlock */
-	ori	r3, r3, HID0_DCE
-	ori	r5, r3, HID0_DCFI
-	mtspr	HID0, r5		/* enable + invalidate */
-	mtspr	HID0, r3		/* enable */
-	sync
-#ifdef CONFIG_SYS_L2
-	mflr	r5
-	bl	l2cache_enable		/* uses r3 and r4 */
-	sync
-	mtlr	r5
-#endif
-	blr
-
-
-/*
- * Disable data cache(s) - L1 and optionally L2
- * Calls flush_dcache and l2cache_disable_no_flush.
- * LR saved in r4
- */
-_GLOBAL(dcache_disable)
-	mflr	r4			/* save link register */
-	bl	flush_dcache	/* uses r3 and r5 */
-	sync
-	mfspr	r3, HID0
-	li	r5, HID0_DCFI|HID0_DLOCK
-	andc	r3, r3, r5
-	mtspr	HID0, r3		/* no invalidate, unlock */
-	li	r5, HID0_DCE|HID0_DCFI
-	andc	r3, r3, r5		/* no enable, no invalidate */
-	mtspr	HID0, r3
-	sync
-#ifdef CONFIG_SYS_L2
-	bl	l2cache_disable_no_flush /* uses r3 */
-#endif
-	mtlr	r4			/* restore link register */
-	blr
-
-/*
- * Is data cache enabled?
- */
-_GLOBAL(dcache_status)
-	mfspr	r3, HID0
-	andi.	r3, r3, HID0_DCE
-	blr
-
-/*
- * Invalidate L2 cache using L2I, assume L2 is enabled
- */
-_GLOBAL(l2cache_invalidate)
-	mfspr	r3, l2cr
-	rlwinm.	r3, r3, 0, 0, 0
-	beq	1f
-
-	mfspr	r3, l2cr
-	rlwinm	r3, r3, 0, 1, 31
-
-#ifdef	CONFIG_ALTIVEC
-	dssall
-#endif
-	sync
-	mtspr	l2cr, r3
-	sync
-1:	mfspr	r3, l2cr
-	oris	r3, r3, L2CR_L2I at h
-	mtspr	l2cr, r3
-
-invl2:
-	mfspr	r3, l2cr
-	andis.	r3, r3, L2CR_L2I at h
-	bne	invl2
-	blr
-
-/*
- * Enable L2 cache
- * Calls l2cache_invalidate. LR is saved in r4
- */
-_GLOBAL(l2cache_enable)
-	mflr	r4			/* save link register */
-	bl	l2cache_invalidate	/* uses r3 */
-	sync
-	lis	r3, L2_ENABLE at h
-	ori	r3, r3, L2_ENABLE at l
-	mtspr	l2cr, r3
-	isync
-	mtlr	r4			/* restore link register */
-	blr
-
-/*
- * Disable L2 cache
- * Calls flush_dcache. LR is saved in r4
- */
-_GLOBAL(l2cache_disable)
-	mflr	r4			/* save link register */
-	bl	flush_dcache		/* uses r3 and r5 */
-	sync
-	mtlr	r4			/* restore link register */
-l2cache_disable_no_flush:		/* provide way to disable L2 w/o flushing */
-	lis	r3, L2_INIT at h
-	ori	r3, r3, L2_INIT at l
-	mtspr	l2cr, r3
-	isync
-	blr
arch/powerpc/cpu/mpc86xx/config.mk deleted +0 -6
deleted file mode 100644
index 5db5b0b4ed7e..000000000000
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2004 Freescale Semiconductor.
-# Jeff Brown
-
-PLATFORM_CPPFLAGS += -mcpu=7400 -mstring -maltivec -mabi=altivec -msoft-float
arch/powerpc/cpu/mpc86xx/cpu.c deleted +0 -207
deleted file mode 100644
index 98b42bff7a3b..000000000000
@@ -1,207 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2006,2009-2010 Freescale Semiconductor, Inc.
- * Jeff Brown
- * Srikanth Srinivasan (srikanth.srinivasan at freescale.com)
- */
-
-#include <common.h>
-#include <cpu_func.h>
-#include <log.h>
-#include <time.h>
-#include <vsprintf.h>
-#include <watchdog.h>
-#include <command.h>
-#include <asm/cache.h>
-#include <asm/global_data.h>
-#include <asm/mmu.h>
-#include <mpc86xx.h>
-#include <asm/fsl_law.h>
-#include <asm/ppc.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * Default board reset function
- */
-static void
-__board_reset(void)
-{
-	/* Do nothing */
-}
-void board_reset(void) __attribute__((weak, alias("__board_reset")));
-
-
-int
-checkcpu(void)
-{
-	sys_info_t sysinfo;
-	uint pvr, svr;
-	uint major, minor;
-	char buf1[32], buf2[32];
-	volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
-	volatile ccsr_gur_t *gur = &immap->im_gur;
-	struct cpu_type *cpu;
-	uint msscr0 = mfspr(MSSCR0);
-
-	svr = get_svr();
-	major = SVR_MAJ(svr);
-	minor = SVR_MIN(svr);
-
-	if (cpu_numcores() > 1) {
-#ifndef CONFIG_MP
-		puts("Unicore software on multiprocessor system!!\n"
-		     "To enable mutlticore build define CONFIG_MP\n");
-#endif
-	}
-	puts("CPU:   ");
-
-	cpu = gd->arch.cpu;
-
-	puts(cpu->name);
-
-	printf(", Version: %d.%d, (0x%08x)\n", major, minor, svr);
-	puts("Core:  ");
-
-	pvr = get_pvr();
-	major = PVR_E600_MAJ(pvr);
-	minor = PVR_E600_MIN(pvr);
-
-	printf("e600 Core %d", (msscr0 & 0x20) ? 1 : 0);
-	if (gur->pordevsr & MPC86xx_PORDEVSR_CORE1TE)
-		puts("\n    Core1Translation Enabled");
-	debug(" (MSSCR0=%x, PORDEVSR=%x)", msscr0, gur->pordevsr);
-
-	printf(", Version: %d.%d, (0x%08x)\n", major, minor, pvr);
-
-	get_sys_info(&sysinfo);
-
-	puts("Clock Configuration:\n");
-	printf("       CPU:%-4s MHz, ", strmhz(buf1, sysinfo.freq_processor));
-	printf("MPX:%-4s MHz\n", strmhz(buf1, sysinfo.freq_systembus));
-	printf("       DDR:%-4s MHz (%s MT/s data rate), ",
-		strmhz(buf1, sysinfo.freq_systembus / 2),
-		strmhz(buf2, sysinfo.freq_systembus));
-
-	if (sysinfo.freq_localbus > LCRR_CLKDIV) {
-		printf("LBC:%-4s MHz\n", strmhz(buf1, sysinfo.freq_localbus));
-	} else {
-		printf("LBC: unknown (LCRR[CLKDIV] = 0x%02lx)\n",
-		       sysinfo.freq_localbus);
-	}
-
-	puts("L1:    D-cache 32 KiB enabled\n");
-	puts("       I-cache 32 KiB enabled\n");
-
-	puts("L2:    ");
-	if (get_l2cr() & 0x80000000) {
-#if defined(CONFIG_ARCH_MPC8610)
-		puts("256");
-#elif defined(CONFIG_ARCH_MPC8641)
-		puts("512");
-#endif
-		puts(" KiB enabled\n");
-	} else {
-		puts("Disabled\n");
-	}
-
-	return 0;
-}
-
-
-int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
-{
-	volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
-	volatile ccsr_gur_t *gur = &immap->im_gur;
-
-	/* Attempt board-specific reset */
-	board_reset();
-
-	/* Next try asserting HRESET_REQ */
-	out_be32(&gur->rstcr, MPC86xx_RSTCR_HRST_REQ);
-
-	while (1)
-		;
-
-	return 1;
-}
-
-
-/*
- * Get timebase clock frequency
- */
-unsigned long
-get_tbclk(void)
-{
-	sys_info_t sys_info;
-
-	get_sys_info(&sys_info);
-	return (sys_info.freq_systembus + 3L) / 4L;
-}
-
-
-#if defined(CONFIG_WATCHDOG)
-void
-watchdog_reset(void)
-{
-#if defined(CONFIG_ARCH_MPC8610)
-	/*
-	 * This actually feed the hard enabled watchdog.
-	 */
-	volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
-	volatile ccsr_wdt_t *wdt = &immap->im_wdt;
-	volatile ccsr_gur_t *gur = &immap->im_gur;
-	u32 tmp = gur->pordevsr;
-
-	if (tmp & 0x4000) {
-		wdt->swsrr = 0x556c;
-		wdt->swsrr = 0xaa39;
-	}
-#endif
-}
-#endif	/* CONFIG_WATCHDOG */
-
-/*
- * Print out the state of various machine registers.
- * Currently prints out LAWs, BR0/OR0, and BATs
- */
-void print_reginfo(void)
-{
-	print_bats();
-	print_laws();
-	print_lbc_regs();
-}
-
-/*
- * Set the DDR BATs to reflect the actual size of DDR.
- *
- * dram_size is the actual size of DDR, in bytes
- *
- * Note: we assume that CONFIG_MAX_MEM_MAPPED is 2G or smaller as we only
- * are using a single BAT to cover DDR.
- *
- * If this is not true, (e.g. CONFIG_MAX_MEM_MAPPED is 2GB but HID0_XBSEN
- * is not defined) then we might have a situation where U-Boot will attempt
- * to relocated itself outside of the region mapped by DBAT0.
- * This will cause a machine check.
- *
- * Currently we are limited to power of two sized DDR since we only use a
- * single bat.  If a non-power of two size is used that is less than
- * CONFIG_MAX_MEM_MAPPED u-boot will crash.
- *
- */
-void setup_ddr_bat(phys_addr_t dram_size)
-{
-	unsigned long batu, bl;
-
-	bl = TO_BATU_BL(min(dram_size, CONFIG_MAX_MEM_MAPPED));
-
-	if (BATU_SIZE(bl) != dram_size) {
-		u64 sz = (u64)dram_size - BATU_SIZE(bl);
-		print_size(sz, " left unmapped\n");
-	}
-
-	batu = bl | BATU_VS | BATU_VP;
-	write_bat(DBAT0, batu, CONFIG_SYS_DBAT0L);
-	write_bat(IBAT0, batu, CONFIG_SYS_IBAT0L);
-}
arch/powerpc/cpu/mpc86xx/cpu_init.c deleted +0 -104
deleted file mode 100644
index 73779f862c2a..000000000000
@@ -1,104 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2004,2009-2011 Freescale Semiconductor, Inc.
- * Jeff Brown
- * Srikanth Srinivasan (srikanth.srinivasan at freescale.com)
- */
-
-/*
- * cpu_init.c - low level cpu init
- */
-
-#include <asm-offsets.h>
-#include <config.h>
-#include <common.h>
-#include <init.h>
-#include <mpc86xx.h>
-#include <asm/global_data.h>
-#include <asm/mmu.h>
-#include <asm/fsl_law.h>
-#include <asm/fsl_serdes.h>
-#include <asm/mp.h>
-
-extern void srio_init(void);
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * Breathe some life into the CPU...
- *
- * Set up the memory map
- * initialize a bunch of registers
- */
-
-void cpu_init_f(void)
-{
-	/* Pointer is writable since we allocated a register for it */
-	gd = (gd_t *) (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_GBL_DATA_OFFSET);
-
-	/* Clear initial global data */
-	memset ((void *) gd, 0, sizeof (gd_t));
-
-#ifdef CONFIG_FSL_LAW
-	init_laws();
-#endif
-
-	setup_bats();
-
-	init_early_memctl_regs();
-
-#if defined(CONFIG_FSL_DMA)
-	dma_init();
-#endif
-
-	/* enable the timebase bit in HID0 */
-	set_hid0(get_hid0() | 0x4000000);
-
-	/* enable EMCP, SYNCBE | ABE bits in HID1 */
-	set_hid1(get_hid1() | 0x80000C00);
-}
-
-/*
- * initialize higher level parts of CPU like timers
- */
-int cpu_init_r(void)
-{
-	/* needs to be in ram since code uses global static vars */
-	fsl_serdes_init();
-
-#ifdef CONFIG_SYS_SRIO
-	srio_init();
-#endif
-
-#if defined(CONFIG_MP)
-	setup_mp();
-#endif
-	return 0;
-}
-
-#ifdef CONFIG_ADDR_MAP
-/* Initialize address mapping array */
-void init_addr_map(void)
-{
-	int i;
-	ppc_bat_t bat = DBAT0;
-	phys_size_t size;
-	unsigned long upper, lower;
-
-	for (i = 0; i < CONFIG_SYS_NUM_ADDR_MAP; i++, bat++) {
-		if (read_bat(bat, &upper, &lower) != -1) {
-			if (!BATU_VALID(upper))
-				size = 0;
-			else
-				size = BATU_SIZE(upper);
-			addrmap_set_entry(BATU_VADDR(upper), BATL_PADDR(lower),
-					  size, i);
-		}
-#ifdef CONFIG_HIGH_BATS
-		/* High bats are not contiguous with low BAT numbers */
-		if (bat == DBAT3)
-			bat = DBAT4 - 1;
-#endif
-	}
-}
-#endif
arch/powerpc/cpu/mpc86xx/fdt.c deleted +0 -52
deleted file mode 100644
index 1313d8adde66..000000000000
@@ -1,52 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright 2008, 2011 Freescale Semiconductor, Inc.
- */
-
-#include <common.h>
-#include <asm/global_data.h>
-#include <linux/libfdt.h>
-#include <fdt_support.h>
-#include <asm/mp.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-extern void ft_fixup_num_cores(void *blob);
-extern void ft_srio_setup(void *blob);
-
-void ft_cpu_setup(void *blob, struct bd_info *bd)
-{
-#ifdef CONFIG_MP
-	int off;
-	u32 bootpg = determine_mp_bootpg(NULL);
-#endif
-
-	do_fixup_by_prop_u32(blob, "device_type", "cpu", 4,
-			     "timebase-frequency", bd->bi_busfreq / 4, 1);
-	do_fixup_by_prop_u32(blob, "device_type", "cpu", 4,
-			     "bus-frequency", bd->bi_busfreq, 1);
-	do_fixup_by_prop_u32(blob, "device_type", "cpu", 4,
-			     "clock-frequency", bd->bi_intfreq, 1);
-	do_fixup_by_prop_u32(blob, "device_type", "soc", 4,
-			     "bus-frequency", bd->bi_busfreq, 1);
-
-	fdt_fixup_memory(blob, (u64)gd->ram_base, (u64)gd->ram_size);
-
-#ifdef CONFIG_SYS_NS16550
-	do_fixup_by_compat_u32(blob, "ns16550",
-			       "clock-frequency", CONFIG_SYS_NS16550_CLK, 1);
-#endif
-
-#ifdef CONFIG_MP
-	/* Reserve the boot page so OSes dont use it */
-	off = fdt_add_mem_rsv(blob, bootpg, (u64)4096);
-	if (off < 0)
-		printf("%s: %s\n", __FUNCTION__, fdt_strerror(off));
-
-	ft_fixup_num_cores(blob);
-#endif
-
-#ifdef CONFIG_SYS_SRIO
-	ft_srio_setup(blob);
-#endif
-}
arch/powerpc/cpu/mpc86xx/interrupts.c deleted +0 -116
deleted file mode 100644
index 5a916600ed62..000000000000
@@ -1,116 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2000-2002
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * (C) Copyright 2002 (440 port)
- * Scott McNutt, Artesyn Communication Producs, smcnutt at artsyncp.com
- *
- * (C) Copyright 2003 Motorola Inc. (MPC85xx port)
- * Xianghua Xiao (X.Xiao at motorola.com)
- *
- * (C) Copyright 2004, 2007 Freescale Semiconductor. (MPC86xx Port)
- * Jeff Brown
- * Srikanth Srinivasan (srikanth.srinivasan at freescale.com)
- */
-
-#include <common.h>
-#include <irq_func.h>
-#include <log.h>
-#include <mpc86xx.h>
-#include <command.h>
-#include <time.h>
-#include <asm/processor.h>
-#ifdef CONFIG_POST
-#include <post.h>
-#endif
-#include <asm/ptrace.h>
-
-void interrupt_init_cpu(unsigned *decrementer_count)
-{
-	volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
-	volatile ccsr_pic_t *pic = &immr->im_pic;
-
-#ifdef CONFIG_POST
-	/*
-	 * The POST word is stored in the PIC's TFRR register which gets
-	 * cleared when the PIC is reset.  Save it off so we can restore it
-	 * later.
-	 */
-	ulong post_word = post_word_load();
-#endif
-
-	pic->gcr = MPC86xx_PICGCR_RST;
-	while (pic->gcr & MPC86xx_PICGCR_RST)
-		;
-	pic->gcr = MPC86xx_PICGCR_MODE;
-
-	*decrementer_count = get_tbclk() / CONFIG_SYS_HZ;
-	debug("interrupt init: tbclk() = %ld MHz, decrementer_count = %d\n",
-	      (get_tbclk() / 1000000),
-	      *decrementer_count);
-
-#ifdef CONFIG_INTERRUPTS
-
-	pic->iivpr1 = 0x810001;	/* 50220 enable mcm interrupts */
-	debug("iivpr1@%p = %x\n", &pic->iivpr1, pic->iivpr1);
-
-	pic->iivpr2 = 0x810002;	/* 50240 enable ddr interrupts */
-	debug("iivpr2@%p = %x\n", &pic->iivpr2, pic->iivpr2);
-
-	pic->iivpr3 = 0x810003;	/* 50260 enable lbc interrupts */
-	debug("iivpr3@%p = %x\n", &pic->iivpr3, pic->iivpr3);
-
-#if defined(CONFIG_PCI1) || defined(CONFIG_PCIE1)
-	pic->iivpr8 = 0x810008;	/* enable pcie1 interrupts */
-	debug("iivpr8@%p = %x\n", &pic->iivpr8, pic->iivpr8);
-#endif
-#if defined(CONFIG_PCI2) || defined(CONFIG_PCIE2)
-	pic->iivpr9 = 0x810009;	/* enable pcie2 interrupts */
-	debug("iivpr9@%p = %x\n", &pic->iivpr9, pic->iivpr9);
-#endif
-
-	pic->ctpr = 0;	/* 40080 clear current task priority register */
-#endif
-
-#ifdef CONFIG_POST
-	post_word_store(post_word);
-#endif
-}
-
-/*
- * timer_interrupt - gets called when the decrementer overflows,
- * with interrupts disabled.
- * Trivial implementation - no need to be really accurate.
- */
-void timer_interrupt_cpu(struct pt_regs *regs)
-{
-	/* nothing to do here */
-}
-
-/*
- * Install and free a interrupt handler. Not implemented yet.
- */
-void irq_install_handler(int vec, interrupt_handler_t *handler, void *arg)
-{
-}
-
-void irq_free_handler(int vec)
-{
-}
-
-/*
- * irqinfo - print information about PCI devices,not implemented.
- */
-int do_irqinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
-{
-	return 0;
-}
-
-/*
- * Handle external interrupts
- */
-void external_interrupt(struct pt_regs *regs)
-{
-	puts("external_interrupt(oops!)\n");
-}
arch/powerpc/cpu/mpc86xx/mp.c deleted +0 -130
deleted file mode 100644
index e6795e06c98b..000000000000
@@ -1,130 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2008-2010 Freescale Semiconductor, Inc.
- */
-
-#include <common.h>
-#include <cpu_func.h>
-#include <asm/global_data.h>
-#include <asm/processor.h>
-#include <asm/mmu.h>
-#include <ioports.h>
-#include <lmb.h>
-#include <asm/io.h>
-#include <asm/mp.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-int cpu_reset(u32 nr)
-{
-	/* dummy function so common/cmd_mp.c will build
-	 * should be implemented in the future, when cpu_release()
-	 * is supported.  Be aware there may be a similiar bug
-	 * as exists on MPC85xx w/its PIC having a timing window
-	 * associated to resetting the core */
-	return 1;
-}
-
-int cpu_status(u32 nr)
-{
-	/* dummy function so common/cmd_mp.c will build */
-	return 0;
-}
-
-int cpu_disable(u32 nr)
-{
-	volatile immap_t *immap = (immap_t *) CONFIG_SYS_CCSRBAR;
-	volatile ccsr_gur_t *gur = &immap->im_gur;
-
-	switch (nr) {
-	case 0:
-		setbits_be32(&gur->devdisr, MPC86xx_DEVDISR_CPU0);
-		break;
-	case 1:
-		setbits_be32(&gur->devdisr, MPC86xx_DEVDISR_CPU1);
-		break;
-	default:
-		printf("Invalid cpu number for disable %d\n", nr);
-		return 1;
-	}
-
-	return 0;
-}
-
-int is_core_disabled(int nr) {
-	immap_t *immap = (immap_t *) CONFIG_SYS_CCSRBAR;
-	ccsr_gur_t *gur = &immap->im_gur;
-	u32 devdisr = in_be32(&gur->devdisr);
-
-	switch (nr) {
-	case 0:
-		return (devdisr & MPC86xx_DEVDISR_CPU0);
-	case 1:
-		return (devdisr & MPC86xx_DEVDISR_CPU1);
-	default:
-		printf("Invalid cpu number for disable %d\n", nr);
-	}
-
-	return 0;
-}
-
-int cpu_release(u32 nr, int argc, char *const argv[])
-{
-	/* dummy function so common/cmd_mp.c will build
-	 * should be implemented in the future */
-	return 1;
-}
-
-u32 determine_mp_bootpg(unsigned int *pagesize)
-{
-	if (pagesize)
-		*pagesize = 4096;
-
-	/* if we have 4G or more of memory, put the boot page at 4Gb-1M */
-	if ((u64)gd->ram_size > 0xfffff000)
-		return (0xfff00000);
-
-	return (gd->ram_size - (1024 * 1024));
-}
-
-void cpu_mp_lmb_reserve(struct lmb *lmb)
-{
-	u32 bootpg = determine_mp_bootpg(NULL);
-
-	/* tell u-boot we stole a page */
-	lmb_reserve(lmb, bootpg, 4096);
-}
-
-/*
- * Copy the code for other cpus to execute into an
- * aligned location accessible via BPTR
- */
-void setup_mp(void)
-{
-	extern ulong __secondary_start_page;
-	ulong fixup = (ulong)&__secondary_start_page;
-	u32 bootpg = determine_mp_bootpg(NULL);
-	u32 bootpg_va;
-
-	if (bootpg >= CONFIG_SYS_MAX_DDR_BAT_SIZE) {
-		/* We're not covered by the DDR mapping, set up BAT  */
-		write_bat(DBAT7, CONFIG_SYS_SCRATCH_VA | BATU_BL_128K |
-			  BATU_VS | BATU_VP,
-			  bootpg | BATL_PP_RW | BATL_MEMCOHERENCE);
-		bootpg_va = CONFIG_SYS_SCRATCH_VA;
-	} else {
-		bootpg_va = bootpg;
-	}
-
-	memcpy((void *)bootpg_va, (void *)fixup, 4096);
-	flush_cache(bootpg_va, 4096);
-
-	/* remove the temporary BAT mapping */
-	if (bootpg >= CONFIG_SYS_MAX_DDR_BAT_SIZE)
-		write_bat(DBAT7, 0, 0);
-
-	/* If the physical location of bootpg is not at fff00000, set BPTR */
-	if (bootpg != 0xfff00000)
-		out_be32((uint *)(CONFIG_SYS_CCSRBAR + 0x20), 0x80000000 |
-			 (bootpg >> 12));
-}
arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c deleted +0 -87
deleted file mode 100644
index ecc88ba43746..000000000000
@@ -1,87 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2010 Freescale Semiconductor, Inc.
- */
-
-#include <config.h>
-#include <common.h>
-#include <log.h>
-#include <asm/io.h>
-#include <asm/immap_86xx.h>
-#include <asm/fsl_serdes.h>
-
-#define SRDS1_MAX_LANES		4
-#define SRDS2_MAX_LANES		4
-
-static u32 serdes1_prtcl_map, serdes2_prtcl_map;
-
-static u8 serdes1_cfg_tbl[][SRDS1_MAX_LANES] = {
-	[0x1] = {PCIE1, PCIE1, PCIE1, PCIE1},
-	[0x4] = {PCIE1, PCIE1, PCIE1, PCIE1},
-	[0x7] = {NONE, NONE, NONE, NONE},
-};
-
-static u8 serdes2_cfg_tbl[][SRDS2_MAX_LANES] = {
-	[0x0] = {PCIE2, PCIE2, PCIE2, PCIE2},
-	[0x4] = {PCIE2, PCIE2, PCIE2, PCIE2},
-	[0x7] = {NONE, NONE, NONE, NONE},
-};
-
-int is_serdes_configured(enum srds_prtcl device)
-{
-	int ret;
-
-	if (!(serdes1_prtcl_map & (1 << NONE)))
-		fsl_serdes_init();
-
-	ret = (1 << device) & serdes1_prtcl_map;
-
-	if (ret)
-		return ret;
-
-	if (!(serdes2_prtcl_map & (1 << NONE)))
-		fsl_serdes_init();
-
-	return (1 << device) & serdes2_prtcl_map;
-}
-
-void fsl_serdes_init(void)
-{
-	immap_t *immap = (immap_t *) CONFIG_SYS_CCSRBAR;
-	ccsr_gur_t *gur = &immap->im_gur;
-	u32 pordevsr = in_be32(&gur->pordevsr);
-	u32 srds_cfg = (pordevsr & MPC8610_PORDEVSR_IO_SEL) >>
-				MPC8610_PORDEVSR_IO_SEL_SHIFT;
-	int lane;
-
-	if (serdes1_prtcl_map & (1 << NONE) &&
-	    serdes2_prtcl_map & (1 << NONE))
-		return;
-
-	debug("PORDEVSR[IO_SEL_SRDS] = %x\n", srds_cfg);
-
-	if (srds_cfg >= ARRAY_SIZE(serdes1_cfg_tbl)) {
-		printf("Invalid PORDEVSR[IO_SEL_SRDS] = %d\n", srds_cfg);
-		return;
-	}
-	for (lane = 0; lane < SRDS1_MAX_LANES; lane++) {
-		enum srds_prtcl lane_prtcl = serdes1_cfg_tbl[srds_cfg][lane];
-		serdes1_prtcl_map |= (1 << lane_prtcl);
-	}
-
-	/* Set the first bit to indicate serdes has been initialized */
-	serdes1_prtcl_map |= (1 << NONE);
-
-	if (srds_cfg >= ARRAY_SIZE(serdes2_cfg_tbl)) {
-		printf("Invalid PORDEVSR[IO_SEL_SRDS] = %d\n", srds_cfg);
-		return;
-	}
-
-	for (lane = 0; lane < SRDS2_MAX_LANES; lane++) {
-		enum srds_prtcl lane_prtcl = serdes2_cfg_tbl[srds_cfg][lane];
-		serdes2_prtcl_map |= (1 << lane_prtcl);
-	}
-
-	/* Set the first bit to indicate serdes has been initialized */
-	serdes2_prtcl_map |= (1 << NONE);
-}
arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c deleted +0 -96
deleted file mode 100644
index 4df446618c09..000000000000
@@ -1,96 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2010 Freescale Semiconductor, Inc.
- */
-
-#include <config.h>
-#include <common.h>
-#include <log.h>
-#include <asm/io.h>
-#include <asm/immap_86xx.h>
-#include <asm/fsl_serdes.h>
-
-#define SRDS1_MAX_LANES		4
-#define SRDS2_MAX_LANES		4
-
-static u32 serdes1_prtcl_map, serdes2_prtcl_map;
-
-static u8 serdes1_cfg_tbl[][SRDS1_MAX_LANES] = {
-	[0x2] = {PCIE1, PCIE1, PCIE1, PCIE1},
-	[0x3] = {PCIE1, PCIE1, PCIE1, PCIE1},
-	[0x5] = {PCIE1, PCIE1, PCIE1, PCIE1},
-	[0x6] = {PCIE1, PCIE1, PCIE1, PCIE1},
-	[0x7] = {PCIE1, PCIE1, PCIE1, PCIE1},
-	[0xf] = {PCIE1, PCIE1, PCIE1, PCIE1},
-};
-
-static u8 serdes2_cfg_tbl[][SRDS2_MAX_LANES] = {
-	[0x3] = {PCIE2, PCIE2, PCIE2, PCIE2},
-	[0x5] = {SRIO1, SRIO1, SRIO1, SRIO1},
-	[0x6] = {SRIO1, SRIO1, SRIO1, SRIO1},
-	[0x7] = {SRIO1, SRIO1, SRIO1, SRIO1},
-	[0x9] = {SRIO1, SRIO1, SRIO1, SRIO1},
-	[0xa] = {SRIO1, SRIO1, SRIO1, SRIO1},
-	[0xb] = {SRIO1, SRIO1, SRIO1, SRIO1},
-	[0xe] = {PCIE2, PCIE2, PCIE2, PCIE2},
-	[0xf] = {PCIE2, PCIE2, PCIE2, PCIE2},
-};
-
-int is_serdes_configured(enum srds_prtcl device)
-{
-	int ret;
-
-	if (!(serdes1_prtcl_map & (1 << NONE)))
-		fsl_serdes_init();
-
-	ret = (1 << device) & serdes1_prtcl_map;
-
-	if (ret)
-		return ret;
-
-	if (!(serdes2_prtcl_map & (1 << NONE)))
-		fsl_serdes_init();
-
-	return (1 << device) & serdes2_prtcl_map;
-}
-
-void fsl_serdes_init(void)
-{
-	immap_t *immap = (immap_t *) CONFIG_SYS_CCSRBAR;
-	ccsr_gur_t *gur = &immap->im_gur;
-	u32 pordevsr = in_be32(&gur->pordevsr);
-	u32 srds_cfg = (pordevsr & MPC8641_PORDEVSR_IO_SEL) >>
-				MPC8641_PORDEVSR_IO_SEL_SHIFT;
-	int lane;
-
-	if (serdes1_prtcl_map & (1 << NONE) &&
-	    serdes2_prtcl_map & (1 << NONE))
-		return;
-
-	debug("PORDEVSR[IO_SEL_SRDS] = %x\n", srds_cfg);
-
-	if (srds_cfg >= ARRAY_SIZE(serdes1_cfg_tbl)) {
-		printf("Invalid PORDEVSR[IO_SEL_SRDS] = %d\n", srds_cfg);
-		return;
-	}
-	for (lane = 0; lane < SRDS1_MAX_LANES; lane++) {
-		enum srds_prtcl lane_prtcl = serdes1_cfg_tbl[srds_cfg][lane];
-		serdes1_prtcl_map |= (1 << lane_prtcl);
-	}
-
-	/* Set the first bit to indicate serdes has been initialized */
-	serdes1_prtcl_map |= (1 << NONE);
-
-	if (srds_cfg >= ARRAY_SIZE(serdes2_cfg_tbl)) {
-		printf("Invalid PORDEVSR[IO_SEL_SRDS] = %d\n", srds_cfg);
-		return;
-	}
-
-	for (lane = 0; lane < SRDS2_MAX_LANES; lane++) {
-		enum srds_prtcl lane_prtcl = serdes2_cfg_tbl[srds_cfg][lane];
-		serdes2_prtcl_map |= (1 << lane_prtcl);
-	}
-
-	/* Set the first bit to indicate serdes has been initialized */
-	serdes2_prtcl_map |= (1 << NONE);
-}
arch/powerpc/cpu/mpc86xx/release.S deleted +0 -149
deleted file mode 100644
index 72ad8834c979..000000000000
@@ -1,149 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright 2004, 2007, 2008 Freescale Semiconductor.
- * Srikanth Srinivasan <[email protected]>
- */
-#include <config.h>
-#include <mpc86xx.h>
-
-#include <ppc_asm.tmpl>
-#include <ppc_defs.h>
-
-#include <asm/cache.h>
-#include <asm/mmu.h>
-
-/* If this is a multi-cpu system then we need to handle the
- * 2nd cpu.  The assumption is that the 2nd cpu is being
- * held in boot holdoff mode until the 1st cpu unlocks it
- * from Linux.	We'll do some basic cpu init and then pass
- * it to the Linux Reset Vector.
- * Sri:	 Much of this initialization is not required. Linux
- * rewrites the bats, and the sprs and also enables the L1 cache.
- *
- * Core 0 must copy this to a 1M aligned region and set BPTR
- * to point to it.
- */
-	.align 12
-.globl __secondary_start_page
-__secondary_start_page:
-	.space 0x100	/* space over to reset vector loc */
-	mfspr	r0, MSSCR0
-	andi.	r0, r0, 0x0020
-	rlwinm	r0,r0,27,31,31
-	mtspr	PIR, r0
-
-	/* Invalidate BATs */
-	li	r0, 0
-	mtspr	IBAT0U, r0
-	mtspr	IBAT1U, r0
-	mtspr	IBAT2U, r0
-	mtspr	IBAT3U, r0
-	mtspr	IBAT4U, r0
-	mtspr	IBAT5U, r0
-	mtspr	IBAT6U, r0
-	mtspr	IBAT7U, r0
-	isync
-	mtspr	DBAT0U, r0
-	mtspr	DBAT1U, r0
-	mtspr	DBAT2U, r0
-	mtspr	DBAT3U, r0
-	mtspr	DBAT4U, r0
-	mtspr	DBAT5U, r0
-	mtspr	DBAT6U, r0
-	mtspr	DBAT7U, r0
-	isync
-	sync
-
-	/* enable extended addressing */
-	mfspr	r0, HID0
-	lis	r0, (HID0_HIGH_BAT_EN | HID0_XBSEN | HID0_XAEN)@h
-	ori	r0, r0, (HID0_HIGH_BAT_EN | HID0_XBSEN | HID0_XAEN)@l
-	mtspr	HID0, r0
-	sync
-	isync
-
-#ifdef CONFIG_SYS_L2
-	/* init the L2 cache */
-	addis	r3, r0, L2_INIT at h
-	ori	r3, r3, L2_INIT at l
-	sync
-	mtspr	l2cr, r3
-#ifdef CONFIG_ALTIVEC
-	dssall
-#endif
-	/* invalidate the L2 cache */
-	mfspr	r3, l2cr
-	rlwinm.	r3, r3, 0, 0, 0
-	beq	1f
-
-	mfspr	r3, l2cr
-	rlwinm	r3, r3, 0, 1, 31
-
-#ifdef	CONFIG_ALTIVEC
-	dssall
-#endif
-	sync
-	mtspr	l2cr, r3
-	sync
-1:	mfspr	r3, l2cr
-	oris	r3, r3, L2CR_L2I at h
-	mtspr	l2cr, r3
-
-invl2:
-	mfspr	r3, l2cr
-	andis.	r3, r3, L2CR_L2I at h
-	bne	invl2
-	sync
-#endif
-
-	/* enable and invalidate the data cache */
-	mfspr	r3, HID0
-	li	r5, HID0_DCFI|HID0_DLOCK
-	andc	r3, r3, r5
-	mtspr	HID0, r3		/* no invalidate, unlock */
-	ori	r3, r3, HID0_DCE
-	ori	r5, r3, HID0_DCFI
-	mtspr	HID0, r5		/* enable + invalidate */
-	mtspr	HID0, r3		/* enable */
-	sync
-#ifdef CONFIG_SYS_L2
-	sync
-	lis	r3, L2_ENABLE at h
-	ori	r3, r3, L2_ENABLE at l
-	mtspr	l2cr, r3
-	isync
-	sync
-#endif
-
-	/* enable and invalidate the instruction cache*/
-	mfspr	r3, HID0
-	li	r5, HID0_ICFI|HID0_ILOCK
-	andc	r3, r3, r5
-	ori	r3, r3, HID0_ICE
-	ori	r5, r3, HID0_ICFI
-	mtspr	HID0, r5
-	mtspr	HID0, r3
-	isync
-	sync
-
-	/* TBEN in HID0 */
-	mfspr	r4, HID0
-	oris	r4, r4, 0x0400
-	mtspr	HID0, r4
-	sync
-	isync
-
-	/* MCP|SYNCBE|ABE in HID1 */
-	mfspr	r4, HID1
-	oris	r4, r4, 0x8000
-	ori	r4, r4, 0x0C00
-	mtspr	HID1, r4
-	sync
-	isync
-
-	lis	r3, CONFIG_LINUX_RESET_VEC at h
-	ori	r3, r3, CONFIG_LINUX_RESET_VEC at l
-	mtlr	r3
-	blr
-
-	/* Never Returns, Running in Linux Now */
arch/powerpc/cpu/mpc86xx/speed.c deleted +0 -134
deleted file mode 100644
index 86c1709c4ca2..000000000000
@@ -1,134 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2004 Freescale Semiconductor.
- * Jeff Brown
- * Srikanth Srinivasan (srikanth.srinivasan at freescale.com)
- *
- * (C) Copyright 2000-2002
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- */
-
-#include <common.h>
-#include <clock_legacy.h>
-#include <mpc86xx.h>
-#include <asm/global_data.h>
-#include <asm/processor.h>
-#include <asm/io.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/* used in some defintiions of CONFIG_SYS_CLK_FREQ */
-extern unsigned long get_board_sys_clk(unsigned long dummy);
-
-void get_sys_info(sys_info_t *sys_info)
-{
-	volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
-	volatile ccsr_gur_t *gur = &immap->im_gur;
-	uint plat_ratio, e600_ratio;
-
-	plat_ratio = (gur->porpllsr) & 0x0000003e;
-	plat_ratio >>= 1;
-
-	switch (plat_ratio) {
-	case 0x0:
-		sys_info->freq_systembus = 16 * CONFIG_SYS_CLK_FREQ;
-		break;
-	case 0x02:
-	case 0x03:
-	case 0x04:
-	case 0x05:
-	case 0x06:
-	case 0x08:
-	case 0x09:
-	case 0x0a:
-	case 0x0c:
-	case 0x10:
-		sys_info->freq_systembus = plat_ratio * CONFIG_SYS_CLK_FREQ;
-		break;
-	default:
-		sys_info->freq_systembus = 0;
-		break;
-	}
-
-	e600_ratio = (gur->porpllsr) & 0x003f0000;
-	e600_ratio >>= 16;
-
-	switch (e600_ratio) {
-	case 0x10:
-		sys_info->freq_processor = 2 * sys_info->freq_systembus;
-		break;
-	case 0x19:
-		sys_info->freq_processor = 5 * sys_info->freq_systembus / 2;
-		break;
-	case 0x20:
-		sys_info->freq_processor = 3 * sys_info->freq_systembus;
-		break;
-	case 0x39:
-		sys_info->freq_processor = 7 * sys_info->freq_systembus / 2;
-		break;
-	case 0x28:
-		sys_info->freq_processor = 4 * sys_info->freq_systembus;
-		break;
-	case 0x1d:
-		sys_info->freq_processor = 9 * sys_info->freq_systembus / 2;
-		break;
-	default:
-		sys_info->freq_processor = e600_ratio +
-						sys_info->freq_systembus;
-		break;
-	}
-
-	sys_info->freq_localbus = sys_info->freq_systembus;
-}
-
-
-/*
- * Measure CPU clock speed (core clock GCLK1, GCLK2)
- * (Approx. GCLK frequency in Hz)
- */
-
-int get_clocks(void)
-{
-	sys_info_t sys_info;
-
-	get_sys_info(&sys_info);
-	gd->cpu_clk = sys_info.freq_processor;
-	gd->bus_clk = sys_info.freq_systembus;
-	gd->arch.lbc_clk = sys_info.freq_localbus;
-
-	/*
-	 * The base clock for I2C depends on the actual SOC.  Unfortunately,
-	 * there is no pattern that can be used to determine the frequency, so
-	 * the only choice is to look up the actual SOC number and use the value
-	 * for that SOC. This information is taken from application note
-	 * AN2919.
-	 */
-#ifdef CONFIG_ARCH_MPC8610
-	gd->arch.i2c1_clk = sys_info.freq_systembus;
-#else
-	gd->arch.i2c1_clk = sys_info.freq_systembus / 2;
-#endif
-	gd->arch.i2c2_clk = gd->arch.i2c1_clk;
-
-	if (gd->cpu_clk != 0)
-		return 0;
-	else
-		return 1;
-}
-
-
-/*
- * get_bus_freq
- *	Return system bus freq in Hz
- */
-
-ulong get_bus_freq(ulong dummy)
-{
-	ulong val;
-	sys_info_t sys_info;
-
-	get_sys_info(&sys_info);
-	val = sys_info.freq_systembus;
-
-	return val;
-}
arch/powerpc/cpu/mpc86xx/start.S deleted +0 -982
deleted file mode 100644
index f4651ce8d46f..000000000000
@@ -1,982 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright 2004, 2007, 2011 Freescale Semiconductor.
- * Srikanth Srinivasan <[email protected]>
- */
-
-/*  U-Boot - Startup Code for 86xx PowerPC based Embedded Boards
- *
- *
- *  The processor starts at 0xfff00100 and the code is executed
- *  from flash. The code is organized to be at an other address
- *  in memory, but as long we don't jump around before relocating.
- *  board_init lies at a quite high address and when the cpu has
- *  jumped there, everything is ok.
- */
-#include <asm-offsets.h>
-#include <config.h>
-#include <mpc86xx.h>
-#include <version.h>
-
-#include <ppc_asm.tmpl>
-#include <ppc_defs.h>
-
-#include <asm/cache.h>
-#include <asm/mmu.h>
-#include <asm/u-boot.h>
-
-/*
- * Need MSR_DR | MSR_IR enabled to access I/O (printf) in exceptions
- */
-
-/*
- * Set up GOT: Global Offset Table
- *
- * Use r12 to access the GOT
- */
-	START_GOT
-	GOT_ENTRY(_GOT2_TABLE_)
-	GOT_ENTRY(_FIXUP_TABLE_)
-
-	GOT_ENTRY(_start)
-	GOT_ENTRY(_start_of_vectors)
-	GOT_ENTRY(_end_of_vectors)
-	GOT_ENTRY(transfer_to_handler)
-
-	GOT_ENTRY(__init_end)
-	GOT_ENTRY(__bss_end)
-	GOT_ENTRY(__bss_start)
-	END_GOT
-
-/*
- * r3 - 1st arg to board_init(): IMMP pointer
- * r4 - 2nd arg to board_init(): boot flag
- */
-	.text
-	.long	0x27051956		/* U-Boot Magic Number */
-	.globl	version_string
-version_string:
-	.ascii U_BOOT_VERSION_STRING, "\0"
-
-	. = EXC_OFF_SYS_RESET
-	.globl	_start
-_start:
-	b	boot_cold
-
-	/* the boot code is located below the exception table */
-
-	.globl	_start_of_vectors
-_start_of_vectors:
-
-/* Machine check */
-	STD_EXCEPTION(0x200, MachineCheck, MachineCheckException)
-
-/* Data Storage exception. */
-	STD_EXCEPTION(0x300, DataStorage, UnknownException)
-
-/* Instruction Storage exception. */
-	STD_EXCEPTION(0x400, InstStorage, UnknownException)
-
-/* External Interrupt exception. */
-	STD_EXCEPTION(0x500, ExtInterrupt, external_interrupt)
-
-/* Alignment exception. */
-	. = 0x600
-Alignment:
-	EXCEPTION_PROLOG(SRR0, SRR1)
-	mfspr	r4,DAR
-	stw	r4,_DAR(r21)
-	mfspr	r5,DSISR
-	stw	r5,_DSISR(r21)
-	addi	r3,r1,STACK_FRAME_OVERHEAD
-	EXC_XFER_TEMPLATE(Alignment, AlignmentException, MSR_KERNEL, COPY_EE)
-
-/* Program check exception */
-	. = 0x700
-ProgramCheck:
-	EXCEPTION_PROLOG(SRR0, SRR1)
-	addi	r3,r1,STACK_FRAME_OVERHEAD
-	EXC_XFER_TEMPLATE(ProgramCheck, ProgramCheckException,
-		MSR_KERNEL, COPY_EE)
-
-	STD_EXCEPTION(0x800, FPUnavailable, UnknownException)
-
-	/* I guess we could implement decrementer, and may have
-	 * to someday for timekeeping.
-	 */
-	STD_EXCEPTION(0x900, Decrementer, timer_interrupt)
-	STD_EXCEPTION(0xa00, Trap_0a, UnknownException)
-	STD_EXCEPTION(0xb00, Trap_0b, UnknownException)
-	STD_EXCEPTION(0xc00, SystemCall, UnknownException)
-	STD_EXCEPTION(0xd00, SingleStep, UnknownException)
-	STD_EXCEPTION(0xe00, Trap_0e, UnknownException)
-	STD_EXCEPTION(0xf00, Trap_0f, UnknownException)
-	STD_EXCEPTION(0x1000, SoftEmu, SoftEmuException)
-	STD_EXCEPTION(0x1100, InstructionTLBMiss, UnknownException)
-	STD_EXCEPTION(0x1200, DataTLBMiss, UnknownException)
-	STD_EXCEPTION(0x1300, InstructionTLBError, UnknownException)
-	STD_EXCEPTION(0x1400, DataTLBError, UnknownException)
-	STD_EXCEPTION(0x1500, Reserved5, UnknownException)
-	STD_EXCEPTION(0x1600, Reserved6, UnknownException)
-	STD_EXCEPTION(0x1700, Reserved7, UnknownException)
-	STD_EXCEPTION(0x1800, Reserved8, UnknownException)
-	STD_EXCEPTION(0x1900, Reserved9, UnknownException)
-	STD_EXCEPTION(0x1a00, ReservedA, UnknownException)
-	STD_EXCEPTION(0x1b00, ReservedB, UnknownException)
-	STD_EXCEPTION(0x1c00, DataBreakpoint, UnknownException)
-	STD_EXCEPTION(0x1d00, InstructionBreakpoint, UnknownException)
-	STD_EXCEPTION(0x1e00, PeripheralBreakpoint, UnknownException)
-	STD_EXCEPTION(0x1f00, DevPortBreakpoint, UnknownException)
-
-	.globl	_end_of_vectors
-_end_of_vectors:
-
-	. = 0x2000
-
-boot_cold:
-	/*
-	 * NOTE: Only Cpu 0 will ever come here.  Other cores go to an
-	 * address specified by the BPTR
-	 */
-1:
-#ifdef CONFIG_SYS_RAMBOOT
-	/* disable everything */
-	li	r0, 0
-	mtspr	HID0, r0
-	sync
-	mtmsr	0
-#endif
-
-	/* Invalidate BATs */
-	bl	invalidate_bats
-	sync
-	/* Invalidate all of TLB before MMU turn on */
-	bl      clear_tlbs
-	sync
-
-#ifdef CONFIG_SYS_L2
-	/* init the L2 cache */
-	lis	r3, L2_INIT at h
-	ori	r3, r3, L2_INIT at l
-	mtspr	l2cr, r3
-	/* invalidate the L2 cache */
-	bl	l2cache_invalidate
-	sync
-#endif
-
-	/*
-	 * Calculate absolute address in FLASH and jump there
-	 *------------------------------------------------------*/
-	lis	r3, CONFIG_SYS_MONITOR_BASE_EARLY at h
-	ori	r3, r3, CONFIG_SYS_MONITOR_BASE_EARLY at l
-	addi	r3, r3, in_flash - _start + EXC_OFF_SYS_RESET
-	mtlr	r3
-	blr
-
-in_flash:
-	/* let the C-code set up the rest			*/
-	/*							*/
-	/* Be careful to keep code relocatable !		*/
-	/*------------------------------------------------------*/
-	/* perform low-level init */
-
-	/* enable extended addressing */
-	bl	enable_ext_addr
-
-	/* setup the bats */
-	bl	early_bats
-
-	/*
-	 * Cache must be enabled here for stack-in-cache trick.
-	 * This means we need to enable the BATS.
-	 * Cache should be turned on after BATs, since by default
-	 * everything is write-through.
-	 */
-
-	/* enable address translation */
-	mfmsr	r5
-	ori	r5, r5, (MSR_IR | MSR_DR)
-	lis	r3,addr_trans_enabled at h
-	ori	r3, r3, addr_trans_enabled at l
-	mtspr	SPRN_SRR0,r3
-	mtspr	SPRN_SRR1,r5
-	rfi
-
-addr_trans_enabled:
-	/* enable and invalidate the data cache */
-/*	bl	l1dcache_enable */
-	bl	dcache_enable
-	sync
-
-#if 1
-	bl	icache_enable
-#endif
-
-#ifdef CONFIG_SYS_INIT_RAM_LOCK
-	bl	lock_ram_in_cache
-	sync
-#endif
-
-#if (CONFIG_SYS_CCSRBAR_DEFAULT != CONFIG_SYS_CCSRBAR)
-	bl      setup_ccsrbar
-#endif
-
-	/* set up the stack pointer in our newly created
-	 * cache-ram (r1) */
-	lis	r1, (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_GBL_DATA_OFFSET)@h
-	ori	r1, r1, (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_GBL_DATA_OFFSET)@l
-
-	li	r0, 0		/* Make room for stack frame header and */
-	stwu	r0, -4(r1)	/* clear final stack frame so that	*/
-	stwu	r0, -4(r1)	/* stack backtraces terminate cleanly	*/
-
-	GET_GOT			/* initialize GOT access	*/
-
-	/* run low-level CPU init code	   (from Flash) */
-	bl	cpu_init_f
-	sync
-
-#ifdef	RUN_DIAG
-
-	/* Load PX_AUX register address in r4 */
-	lis	r4, PIXIS_BASE at h
-	ori	r4, r4, 0x6
-	/* Load contents of PX_AUX in r3 bits 24 to 31*/
-	lbz	r3, 0(r4)
-
-	/* Mask and obtain the bit in r3 */
-	rlwinm. r3, r3, 0, 24, 24
-	/* If not zero, jump and continue with u-boot */
-	bne	diag_done
-
-	/* Load back contents of PX_AUX in r3 bits 24 to 31 */
-	lbz	r3, 0(r4)
-	/* Set the MSB of the register value */
-	ori	r3, r3, 0x80
-	/* Write value in r3 back to PX_AUX */
-	stb	r3, 0(r4)
-
-	/* Get the address to jump to in r3*/
-	lis	r3, CONFIG_SYS_DIAG_ADDR at h
-	ori	r3, r3, CONFIG_SYS_DIAG_ADDR at l
-
-	/* Load the LR with the branch address */
-	mtlr	r3
-
-	/* Branch to diagnostic */
-	blr
-
-diag_done:
-#endif
-
-/*	bl	l2cache_enable */
-
-	/* run 1st part of board init code (from Flash)	  */
-	li	r3, 0		/* clear boot_flag for calling board_init_f */
-	bl	board_init_f
-	sync
-
-	/* NOTREACHED - board_init_f() does not return */
-
-	.globl	invalidate_bats
-invalidate_bats:
-
-	li	r0, 0
-	/* invalidate BATs */
-	mtspr	IBAT0U, r0
-	mtspr	IBAT1U, r0
-	mtspr	IBAT2U, r0
-	mtspr	IBAT3U, r0
-	mtspr	IBAT4U, r0
-	mtspr	IBAT5U, r0
-	mtspr	IBAT6U, r0
-	mtspr	IBAT7U, r0
-
-	isync
-	mtspr	DBAT0U, r0
-	mtspr	DBAT1U, r0
-	mtspr	DBAT2U, r0
-	mtspr	DBAT3U, r0
-	mtspr	DBAT4U, r0
-	mtspr	DBAT5U, r0
-	mtspr	DBAT6U, r0
-	mtspr	DBAT7U, r0
-
-	isync
-	sync
-	blr
-
-#define CONFIG_BAT_PAIR(n) \
-	lis	r4, CONFIG_SYS_IBAT##n##L at h; 		\
-	ori	r4, r4, CONFIG_SYS_IBAT##n##L at l; 	\
-	lis	r3, CONFIG_SYS_IBAT##n##U at h; 		\
-	ori	r3, r3, CONFIG_SYS_IBAT##n##U at l; 	\
-	mtspr	IBAT##n##L, r4; 			\
-	mtspr	IBAT##n##U, r3; 			\
-	lis	r4, CONFIG_SYS_DBAT##n##L at h; 		\
-	ori	r4, r4, CONFIG_SYS_DBAT##n##L at l; 	\
-	lis	r3, CONFIG_SYS_DBAT##n##U at h; 		\
-	ori	r3, r3, CONFIG_SYS_DBAT##n##U at l; 	\
-	mtspr	DBAT##n##L, r4;				\
-	mtspr	DBAT##n##U, r3;
-
-/*
- * setup_bats:
- *
- * Set up the final BAT registers now that setup is done.
- *
- * Assumes that:
- *	1) Address translation is enabled upon entry
- *	2) The boot rom is still accessible via 1:1 translation
- */
-	.globl setup_bats
-setup_bats:
-	mflr	r5
-	sync
-
-	/*
-	 * When we disable address translation, we will get 1:1 (VA==PA)
-	 * translation.  The only place we know for sure is safe for that is
-	 * the bootrom where we originally started out.  Pop back into there.
-	 */
-	lis	r4, CONFIG_SYS_MONITOR_BASE_EARLY at h
-	ori	r4, r4, CONFIG_SYS_MONITOR_BASE_EARLY at l
-	addi	r4, r4, trans_disabled - _start + EXC_OFF_SYS_RESET
-
-	/* disable address translation */
-	mfmsr	r3
-	rlwinm	r3, r3, 0, 28, 25
-	mtspr	SRR0, r4
-	mtspr	SRR1, r3
-	rfi
-
-trans_disabled:
-#if defined(CONFIG_SYS_DBAT0U) && defined(CONFIG_SYS_DBAT0L) \
-	&& defined(CONFIG_SYS_IBAT0U) && defined(CONFIG_SYS_IBAT0L)
-	CONFIG_BAT_PAIR(0)
-#endif
-	CONFIG_BAT_PAIR(1)
-	CONFIG_BAT_PAIR(2)
-	CONFIG_BAT_PAIR(3)
-	CONFIG_BAT_PAIR(4)
-	CONFIG_BAT_PAIR(5)
-	CONFIG_BAT_PAIR(6)
-	CONFIG_BAT_PAIR(7)
-
-	sync
-	isync
-
-	/* Turn translation back on and return */
-	mfmsr	r3
-	ori	r3, r3, (MSR_IR | MSR_DR)
-	mtspr	SPRN_SRR0,r5
-	mtspr	SPRN_SRR1,r3
-	rfi
-
-/*
- * early_bats:
- *
- * Set up bats needed early on - this is usually the BAT for the
- * stack-in-cache, the Flash, and CCSR space
- */
-	.globl  early_bats
-early_bats:
-	/* IBAT 3 */
-	lis	r4, CONFIG_SYS_IBAT3L at h
-	ori     r4, r4, CONFIG_SYS_IBAT3L at l
-	lis	r3, CONFIG_SYS_IBAT3U at h
-	ori     r3, r3, CONFIG_SYS_IBAT3U at l
-	mtspr   IBAT3L, r4
-	mtspr   IBAT3U, r3
-	isync
-
-	/* DBAT 3 */
-	lis	r4, CONFIG_SYS_DBAT3L at h
-	ori     r4, r4, CONFIG_SYS_DBAT3L at l
-	lis	r3, CONFIG_SYS_DBAT3U at h
-	ori     r3, r3, CONFIG_SYS_DBAT3U at l
-	mtspr   DBAT3L, r4
-	mtspr   DBAT3U, r3
-	isync
-
-	/* IBAT 5 */
-	lis	r4, CONFIG_SYS_IBAT5L at h
-	ori     r4, r4, CONFIG_SYS_IBAT5L at l
-	lis	r3, CONFIG_SYS_IBAT5U at h
-	ori     r3, r3, CONFIG_SYS_IBAT5U at l
-	mtspr   IBAT5L, r4
-	mtspr   IBAT5U, r3
-	isync
-
-	/* DBAT 5 */
-	lis	r4, CONFIG_SYS_DBAT5L at h
-	ori     r4, r4, CONFIG_SYS_DBAT5L at l
-	lis	r3, CONFIG_SYS_DBAT5U at h
-	ori     r3, r3, CONFIG_SYS_DBAT5U at l
-	mtspr   DBAT5L, r4
-	mtspr   DBAT5U, r3
-	isync
-
-	/* IBAT 6 */
-	lis	r4, CONFIG_SYS_IBAT6L_EARLY at h
-	ori     r4, r4, CONFIG_SYS_IBAT6L_EARLY at l
-	lis	r3, CONFIG_SYS_IBAT6U_EARLY at h
-	ori     r3, r3, CONFIG_SYS_IBAT6U_EARLY at l
-	mtspr   IBAT6L, r4
-	mtspr   IBAT6U, r3
-	isync
-
-	/* DBAT 6 */
-	lis	r4, CONFIG_SYS_DBAT6L_EARLY at h
-	ori     r4, r4, CONFIG_SYS_DBAT6L_EARLY at l
-	lis	r3, CONFIG_SYS_DBAT6U_EARLY at h
-	ori     r3, r3, CONFIG_SYS_DBAT6U_EARLY at l
-	mtspr   DBAT6L, r4
-	mtspr   DBAT6U, r3
-	isync
-
-#if(CONFIG_SYS_CCSRBAR_DEFAULT != CONFIG_SYS_CCSRBAR)
-	/* IBAT 7 */
-	lis	r4, CONFIG_SYS_CCSR_DEFAULT_IBATL at h
-	ori     r4, r4, CONFIG_SYS_CCSR_DEFAULT_IBATL at l
-	lis	r3, CONFIG_SYS_CCSR_DEFAULT_IBATU at h
-	ori     r3, r3, CONFIG_SYS_CCSR_DEFAULT_IBATU at l
-	mtspr   IBAT7L, r4
-	mtspr   IBAT7U, r3
-	isync
-
-	/* DBAT 7 */
-	lis	r4, CONFIG_SYS_CCSR_DEFAULT_DBATL at h
-	ori     r4, r4, CONFIG_SYS_CCSR_DEFAULT_DBATL at l
-	lis	r3, CONFIG_SYS_CCSR_DEFAULT_DBATU at h
-	ori     r3, r3, CONFIG_SYS_CCSR_DEFAULT_DBATU at l
-	mtspr   DBAT7L, r4
-	mtspr   DBAT7U, r3
-	isync
-#endif
-	blr
-
-	.globl clear_tlbs
-clear_tlbs:
-	addis   r3, 0, 0x0000
-	addis   r5, 0, 0x4
-	isync
-tlblp:
-	tlbie   r3
-	sync
-	addi    r3, r3, 0x1000
-	cmp     0, 0, r3, r5
-	blt tlblp
-	blr
-
-	.globl disable_addr_trans
-disable_addr_trans:
-	/* disable address translation */
-	mflr	r4
-	mfmsr	r3
-	andi.	r0, r3, (MSR_IR | MSR_DR)
-	beqlr
-	andc	r3, r3, r0
-	mtspr	SRR0, r4
-	mtspr	SRR1, r3
-	rfi
-
-/*
- * This code finishes saving the registers to the exception frame
- * and jumps to the appropriate handler for the exception.
- * Register r21 is pointer into trap frame, r1 has new stack pointer.
- */
-	.globl	transfer_to_handler
-transfer_to_handler:
-	stw	r22,_NIP(r21)
-	lis	r22,MSR_POW at h
-	andc	r23,r23,r22
-	stw	r23,_MSR(r21)
-	SAVE_GPR(7, r21)
-	SAVE_4GPRS(8, r21)
-	SAVE_8GPRS(12, r21)
-	SAVE_8GPRS(24, r21)
-	mflr	r23
-	andi.	r24,r23,0x3f00		/* get vector offset */
-	stw	r24,TRAP(r21)
-	li	r22,0
-	stw	r22,RESULT(r21)
-	mtspr	SPRG2,r22		/* r1 is now kernel sp */
-	lwz	r24,0(r23)		/* virtual address of handler */
-	lwz	r23,4(r23)		/* where to go when done */
-	mtspr	SRR0,r24
-	mtspr	SRR1,r20
-	mtlr	r23
-	SYNC
-	rfi				/* jump to handler, enable MMU */
-
-int_return:
-	mfmsr	r28		/* Disable interrupts */
-	li	r4,0
-	ori	r4,r4,MSR_EE
-	andc	r28,r28,r4
-	SYNC			/* Some chip revs need this... */
-	mtmsr	r28
-	SYNC
-	lwz	r2,_CTR(r1)
-	lwz	r0,_LINK(r1)
-	mtctr	r2
-	mtlr	r0
-	lwz	r2,_XER(r1)
-	lwz	r0,_CCR(r1)
-	mtspr	XER,r2
-	mtcrf	0xFF,r0
-	REST_10GPRS(3, r1)
-	REST_10GPRS(13, r1)
-	REST_8GPRS(23, r1)
-	REST_GPR(31, r1)
-	lwz	r2,_NIP(r1)	/* Restore environment */
-	lwz	r0,_MSR(r1)
-	mtspr	SRR0,r2
-	mtspr	SRR1,r0
-	lwz	r0,GPR0(r1)
-	lwz	r2,GPR2(r1)
-	lwz	r1,GPR1(r1)
-	SYNC
-	rfi
-
-	.globl	dc_read
-dc_read:
-	blr
-
-
-/*
- * Function:	in8
- * Description:	Input 8 bits
- */
-	.globl	in8
-in8:
-	lbz	r3,0x0000(r3)
-	blr
-
-/*
- * Function:	out8
- * Description:	Output 8 bits
- */
-	.globl	out8
-out8:
-	stb	r4,0x0000(r3)
-	blr
-
-/*
- * Function:	out16
- * Description:	Output 16 bits
- */
-	.globl	out16
-out16:
-	sth	r4,0x0000(r3)
-	blr
-
-/*
- * Function:	out16r
- * Description:	Byte reverse and output 16 bits
- */
-	.globl	out16r
-out16r:
-	sthbrx	r4,r0,r3
-	blr
-
-/*
- * Function:	out32
- * Description:	Output 32 bits
- */
-	.globl	out32
-out32:
-	stw	r4,0x0000(r3)
-	blr
-
-/*
- * Function:	out32r
- * Description:	Byte reverse and output 32 bits
- */
-	.globl	out32r
-out32r:
-	stwbrx	r4,r0,r3
-	blr
-
-/*
- * Function:	in16
- * Description:	Input 16 bits
- */
-	.globl	in16
-in16:
-	lhz	r3,0x0000(r3)
-	blr
-
-/*
- * Function:	in16r
- * Description:	Input 16 bits and byte reverse
- */
-	.globl	in16r
-in16r:
-	lhbrx	r3,r0,r3
-	blr
-
-/*
- * Function:	in32
- * Description:	Input 32 bits
- */
-	.globl	in32
-in32:
-	lwz	3,0x0000(3)
-	blr
-
-/*
- * Function:	in32r
- * Description:	Input 32 bits and byte reverse
- */
-	.globl	in32r
-in32r:
-	lwbrx	r3,r0,r3
-	blr
-
-/*
- * void relocate_code(addr_sp, gd, addr_moni)
- *
- * This "function" does not return, instead it continues in RAM
- * after relocating the monitor code.
- *
- * r3 = dest
- * r4 = src
- * r5 = length in bytes
- * r6 = cachelinesize
- */
-	.globl	relocate_code
-relocate_code:
-
-	mr	r1,  r3		/* Set new stack pointer		*/
-	mr	r9,  r4		/* Save copy of Global Data pointer	*/
-	mr	r10, r5		/* Save copy of Destination Address	*/
-
-	GET_GOT
-	mr	r3,  r5				/* Destination Address	*/
-	lis	r4, CONFIG_SYS_MONITOR_BASE at h		/* Source      Address	*/
-	ori	r4, r4, CONFIG_SYS_MONITOR_BASE at l
-	lwz	r5, GOT(__init_end)
-	sub	r5, r5, r4
-	li	r6, CONFIG_SYS_CACHELINE_SIZE		/* Cache Line Size	*/
-
-	/*
-	 * Fix GOT pointer:
-	 *
-	 * New GOT-PTR = (old GOT-PTR - CONFIG_SYS_MONITOR_BASE) + Destination Address
-	 *
-	 * Offset:
-	 */
-	sub	r15, r10, r4
-
-	/* First our own GOT */
-	add	r12, r12, r15
-	/* then the one used by the C code */
-	add	r30, r30, r15
-
-	/*
-	 * Now relocate code
-	 */
-	cmplw	cr1,r3,r4
-	addi	r0,r5,3
-	srwi.	r0,r0,2
-	beq	cr1,4f		/* In place copy is not necessary	*/
-	beq	7f		/* Protect against 0 count		*/
-	mtctr	r0
-	bge	cr1,2f
-
-	la	r8,-4(r4)
-	la	r7,-4(r3)
-1:	lwzu	r0,4(r8)
-	stwu	r0,4(r7)
-	bdnz	1b
-	b	4f
-
-2:	slwi	r0,r0,2
-	add	r8,r4,r0
-	add	r7,r3,r0
-3:	lwzu	r0,-4(r8)
-	stwu	r0,-4(r7)
-	bdnz	3b
-/*
- * Now flush the cache: note that we must start from a cache aligned
- * address. Otherwise we might miss one cache line.
- */
-4:	cmpwi	r6,0
-	add	r5,r3,r5
-	beq	7f		/* Always flush prefetch queue in any case */
-	subi	r0,r6,1
-	andc	r3,r3,r0
-	mr	r4,r3
-5:	dcbst	0,r4
-	add	r4,r4,r6
-	cmplw	r4,r5
-	blt	5b
-	sync			/* Wait for all dcbst to complete on bus */
-	mr	r4,r3
-6:	icbi	0,r4
-	add	r4,r4,r6
-	cmplw	r4,r5
-	blt	6b
-7:	sync			/* Wait for all icbi to complete on bus */
-	isync
-
-/*
- * We are done. Do not return, instead branch to second part of board
- * initialization, now running from RAM.
- */
-	addi	r0, r10, in_ram - _start + EXC_OFF_SYS_RESET
-	mtlr	r0
-	blr
-
-in_ram:
-	/*
-	 * Relocation Function, r12 point to got2+0x8000
-	 *
-	 * Adjust got2 pointers, no need to check for 0, this code
-	 * already puts a few entries in the table.
-	 */
-	li	r0,__got2_entries at sectoff@l
-	la	r3,GOT(_GOT2_TABLE_)
-	lwz	r11,GOT(_GOT2_TABLE_)
-	mtctr	r0
-	sub	r11,r3,r11
-	addi	r3,r3,-4
-1:	lwzu	r0,4(r3)
-	cmpwi	r0,0
-	beq-	2f
-	add	r0,r0,r11
-	stw	r0,0(r3)
-2:	bdnz	1b
-
-	/*
-	 * Now adjust the fixups and the pointers to the fixups
-	 * in case we need to move ourselves again.
-	 */
-	li	r0,__fixup_entries at sectoff@l
-	lwz	r3,GOT(_FIXUP_TABLE_)
-	cmpwi	r0,0
-	mtctr	r0
-	addi	r3,r3,-4
-	beq	4f
-3:	lwzu	r4,4(r3)
-	lwzux	r0,r4,r11
-	cmpwi	r0,0
-	add	r0,r0,r11
-	stw	r4,0(r3)
-	beq-	5f
-	stw	r0,0(r4)
-5:	bdnz	3b
-4:
-/* clear_bss: */
-	/*
-	 * Now clear BSS segment
-	 */
-	lwz	r3,GOT(__bss_start)
-	lwz	r4,GOT(__bss_end)
-
-	cmplw	0, r3, r4
-	beq	6f
-
-	li	r0, 0
-5:
-	stw	r0, 0(r3)
-	addi	r3, r3, 4
-	cmplw	0, r3, r4
-	bne	5b
-6:
-	mr	r3, r9		/* Init Date pointer		*/
-	mr	r4, r10		/* Destination Address		*/
-	bl	board_init_r
-
-	/* not reached - end relocate_code */
-/*-----------------------------------------------------------------------*/
-
-	/*
-	 * Copy exception vector code to low memory
-	 *
-	 * r3: dest_addr
-	 * r7: source address, r8: end address, r9: target address
-	 */
-	.globl	trap_init
-trap_init:
-	mflr	r4			/* save link register		*/
-	GET_GOT
-	lwz	r7, GOT(_start)
-	lwz	r8, GOT(_end_of_vectors)
-
-	li	r9, 0x100		/* reset vector always at 0x100 */
-
-	cmplw	0, r7, r8
-	bgelr				/* return if r7>=r8 - just in case */
-1:
-	lwz	r0, 0(r7)
-	stw	r0, 0(r9)
-	addi	r7, r7, 4
-	addi	r9, r9, 4
-	cmplw	0, r7, r8
-	bne	1b
-
-	/*
-	 * relocate `hdlr' and `int_return' entries
-	 */
-	li	r7, .L_MachineCheck - _start + EXC_OFF_SYS_RESET
-	li	r8, Alignment - _start + EXC_OFF_SYS_RESET
-2:
-	bl	trap_reloc
-	addi	r7, r7, 0x100		/* next exception vector	*/
-	cmplw	0, r7, r8
-	blt	2b
-
-	li	r7, .L_Alignment - _start + EXC_OFF_SYS_RESET
-	bl	trap_reloc
-
-	li	r7, .L_ProgramCheck - _start + EXC_OFF_SYS_RESET
-	bl	trap_reloc
-
-	li	r7, .L_FPUnavailable - _start + EXC_OFF_SYS_RESET
-	li	r8, SystemCall - _start + EXC_OFF_SYS_RESET
-3:
-	bl	trap_reloc
-	addi	r7, r7, 0x100		/* next exception vector	*/
-	cmplw	0, r7, r8
-	blt	3b
-
-	li	r7, .L_SingleStep - _start + EXC_OFF_SYS_RESET
-	li	r8, _end_of_vectors - _start + EXC_OFF_SYS_RESET
-4:
-	bl	trap_reloc
-	addi	r7, r7, 0x100		/* next exception vector	*/
-	cmplw	0, r7, r8
-	blt	4b
-
-	/* enable execptions from RAM vectors */
-	mfmsr	r7
-	li	r8,MSR_IP
-	andc	r7,r7,r8
-	ori	r7,r7,MSR_ME		/* Enable Machine Check */
-	mtmsr	r7
-
-	mtlr	r4			/* restore link register	*/
-	blr
-
-.globl enable_ext_addr
-enable_ext_addr:
-	mfspr	r0, HID0
-	lis	r0, (HID0_HIGH_BAT_EN | HID0_XBSEN | HID0_XAEN)@h
-	ori	r0, r0, (HID0_HIGH_BAT_EN | HID0_XBSEN | HID0_XAEN)@l
-	mtspr	HID0, r0
-	sync
-	isync
-	blr
-
-#if (CONFIG_SYS_CCSRBAR_DEFAULT != CONFIG_SYS_CCSRBAR)
-.globl setup_ccsrbar
-setup_ccsrbar:
-	/* Special sequence needed to update CCSRBAR itself */
-	lis	r4, CONFIG_SYS_CCSRBAR_DEFAULT at h
-	ori	r4, r4, CONFIG_SYS_CCSRBAR_DEFAULT at l
-
-	lis	r5, CONFIG_SYS_CCSRBAR_PHYS_LOW at h
-	ori	r5, r5, CONFIG_SYS_CCSRBAR_PHYS_LOW at l
-	srwi	r5,r5,12
-	li	r6, CONFIG_SYS_CCSRBAR_PHYS_HIGH at l
-	rlwimi	r5,r6,20,8,11
-	stw	r5, 0(r4) /* Store physical value of CCSR */
-	isync
-
-	lis	r5, CONFIG_SYS_TEXT_BASE at h
-	ori	r5,r5,CONFIG_SYS_TEXT_BASE at l
-	lwz	r5, 0(r5)
-	isync
-
-	/* Use VA of CCSR to do read */
-	lis	r3, CONFIG_SYS_CCSRBAR at h
-	lwz	r5, CONFIG_SYS_CCSRBAR at l(r3)
-	isync
-
-	blr
-#endif
-
-#ifdef CONFIG_SYS_INIT_RAM_LOCK
-lock_ram_in_cache:
-	/* Allocate Initial RAM in data cache.
-	 */
-	lis	r3, (CONFIG_SYS_INIT_RAM_ADDR & ~31)@h
-	ori	r3, r3, (CONFIG_SYS_INIT_RAM_ADDR & ~31)@l
-	li	r4, ((CONFIG_SYS_INIT_RAM_SIZE & ~31) + \
-		     (CONFIG_SYS_INIT_RAM_ADDR & 31) + 31) / 32
-	mtctr	r4
-1:
-	dcbz	r0, r3
-	addi	r3, r3, 32
-	bdnz	1b
-#if 1
-/* Lock the data cache */
-	mfspr	r0, HID0
-	ori	r0, r0, 0x1000
-	sync
-	mtspr	HID0, r0
-	sync
-	blr
-#endif
-#if 0
-	/* Lock the first way of the data cache */
-	mfspr	r0, LDSTCR
-	ori	r0, r0, 0x0080
-#if defined(CONFIG_ALTIVEC)
-	dssall
-#endif
-	sync
-	mtspr	LDSTCR, r0
-	sync
-	isync
-	blr
-#endif
-
-.globl unlock_ram_in_cache
-unlock_ram_in_cache:
-	/* invalidate the INIT_RAM section */
-	lis	r3, (CONFIG_SYS_INIT_RAM_ADDR & ~31)@h
-	ori	r3, r3, (CONFIG_SYS_INIT_RAM_ADDR & ~31)@l
-	li	r4, ((CONFIG_SYS_INIT_RAM_SIZE & ~31) + \
-		     (CONFIG_SYS_INIT_RAM_ADDR & 31) + 31) / 32
-	mtctr	r4
-1:	icbi	r0, r3
-	addi	r3, r3, 32
-	bdnz	1b
-	sync			/* Wait for all icbi to complete on bus */
-	isync
-#if 1
-/* Unlock the data cache and invalidate it */
-	mfspr	r0, HID0
-	li	r3,0x1000
-	andc	r0,r0,r3
-	li	r3,0x0400
-	or	r0,r0,r3
-	sync
-	mtspr	HID0, r0
-	sync
-	blr
-#endif
-#if 0
-	/* Unlock the first way of the data cache */
-	mfspr	r0, LDSTCR
-	li	r3,0x0080
-	andc	r0,r0,r3
-#ifdef CONFIG_ALTIVEC
-	dssall
-#endif
-	sync
-	mtspr	LDSTCR, r0
-	sync
-	isync
-	li	r3,0x0400
-	or	r0,r0,r3
-	sync
-	mtspr	HID0, r0
-	sync
-	blr
-#endif
-#endif
arch/powerpc/cpu/mpc86xx/traps.c deleted +0 -199
deleted file mode 100644
index 46006ece4160..000000000000
@@ -1,199 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 1995-1996  Gary Thomas (gdt at linuxppc.org)
- *
- * Modified by Cort Dougan (cort at cs.nmt.edu)
- * and Paul Mackerras (paulus at cs.anu.edu.au)
- *
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- */
-
-/*
- * This file handles the architecture-dependent parts of hardware exceptions
- */
-
-#include <common.h>
-#include <asm/global_data.h>
-#include <asm/ptrace.h>
-#include <command.h>
-#include <init.h>
-#include <kgdb.h>
-#include <asm/processor.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/* Returns 0 if exception not found and fixup otherwise.  */
-extern unsigned long search_exception_table(unsigned long);
-
-/*
- * End of addressable memory.  This may be less than the actual
- * amount of memory on the system if we're unable to keep all
- * the memory mapped in.
- */
-#define END_OF_MEM	(gd->ram_base + get_effective_memsize())
-
-/*
- * Trap & Exception support
- */
-
-static void print_backtrace(unsigned long *sp)
-{
-	int cnt = 0;
-	unsigned long i;
-
-	printf("Call backtrace: ");
-	while (sp) {
-		if ((uint) sp > END_OF_MEM)
-			break;
-
-		i = sp[1];
-		if (cnt++ % 7 == 0)
-			printf("\n");
-		printf("%08lX ", i);
-		if (cnt > 32)
-			break;
-		sp = (unsigned long *)*sp;
-	}
-	printf("\n");
-}
-
-void show_regs(struct pt_regs *regs)
-{
-	int i;
-
-	printf("NIP: %08lX XER: %08lX LR: %08lX REGS:"
-	       " %p TRAP: %04lx DAR: %08lX\n",
-	       regs->nip, regs->xer, regs->link, regs, regs->trap, regs->dar);
-	printf("MSR: %08lx EE: %01x PR: %01x FP:"
-	       " %01x ME: %01x IR/DR: %01x%01x\n",
-	       regs->msr, regs->msr & MSR_EE ? 1 : 0,
-	       regs->msr & MSR_PR ? 1 : 0, regs->msr & MSR_FP ? 1 : 0,
-	       regs->msr & MSR_ME ? 1 : 0, regs->msr & MSR_IR ? 1 : 0,
-	       regs->msr & MSR_DR ? 1 : 0);
-
-	printf("\n");
-	for (i = 0; i < 32; i++) {
-		if ((i % 8) == 0) {
-			printf("GPR%02d: ", i);
-		}
-
-		printf("%08lX ", regs->gpr[i]);
-		if ((i % 8) == 7) {
-			printf("\n");
-		}
-	}
-}
-
-
-static void _exception(int signr, struct pt_regs *regs)
-{
-	show_regs(regs);
-	print_backtrace((unsigned long *)regs->gpr[1]);
-	panic("Exception in kernel pc %lx signal %d", regs->nip, signr);
-}
-
-void MachineCheckException(struct pt_regs *regs)
-{
-	unsigned long fixup;
-
-	/* Probing PCI using config cycles cause this exception
-	 * when a device is not present.  Catch it and return to
-	 * the PCI exception handler.
-	 */
-	if ((fixup = search_exception_table(regs->nip)) != 0) {
-		regs->nip = fixup;
-		return;
-	}
-
-#if defined(CONFIG_CMD_KGDB)
-	if (debugger_exception_handler && (*debugger_exception_handler) (regs))
-		return;
-#endif
-
-	printf("Machine check in kernel mode.\n");
-	printf("Caused by (from msr): ");
-	printf("regs %p ", regs);
-	switch ( regs->msr & 0x001F0000) {
-	case (0x80000000>>11):
-		printf("MSS error. MSSSR0: %08x\n", mfspr(SPRN_MSSSR0));
-		break;
-	case (0x80000000>>12):
-		printf("Machine check signal - probably due to mm fault\n"
-		       "with mmu off\n");
-		break;
-	case (0x80000000 >> 13):
-		printf("Transfer error ack signal\n");
-		break;
-	case (0x80000000 >> 14):
-		printf("Data parity signal\n");
-		break;
-	case (0x80000000 >> 15):
-		printf("Address parity signal\n");
-		break;
-	default:
-		printf("Unknown values in msr\n");
-	}
-	show_regs(regs);
-	print_backtrace((unsigned long *)regs->gpr[1]);
-	panic("machine check");
-}
-
-void AlignmentException(struct pt_regs *regs)
-{
-#if defined(CONFIG_CMD_KGDB)
-	if (debugger_exception_handler && (*debugger_exception_handler) (regs))
-		return;
-#endif
-	show_regs(regs);
-	print_backtrace((unsigned long *)regs->gpr[1]);
-	panic("Alignment Exception");
-}
-
-void ProgramCheckException(struct pt_regs *regs)
-{
-	unsigned char *p = regs ? (unsigned char *)(regs->nip) : NULL;
-	int i, j;
-
-#if defined(CONFIG_CMD_KGDB)
-	if (debugger_exception_handler && (*debugger_exception_handler) (regs))
-		return;
-#endif
-	show_regs(regs);
-
-	p = (unsigned char *)((unsigned long)p & 0xFFFFFFE0);
-	p -= 32;
-	for (i = 0; i < 256; i += 16) {
-		printf("%08x: ", (unsigned int)p + i);
-		for (j = 0; j < 16; j++) {
-			printf("%02x ", p[i + j]);
-		}
-		printf("\n");
-	}
-
-	print_backtrace((unsigned long *)regs->gpr[1]);
-	panic("Program Check Exception");
-}
-
-void SoftEmuException(struct pt_regs *regs)
-{
-#if defined(CONFIG_CMD_KGDB)
-	if (debugger_exception_handler && (*debugger_exception_handler) (regs))
-		return;
-#endif
-	show_regs(regs);
-	print_backtrace((unsigned long *)regs->gpr[1]);
-	panic("Software Emulation Exception");
-}
-
-void UnknownException(struct pt_regs *regs)
-{
-#if defined(CONFIG_CMD_KGDB)
-	if (debugger_exception_handler && (*debugger_exception_handler) (regs))
-		return;
-#endif
-	printf("UnknownException regs@%lx\n", (ulong)regs);
-	printf("Bad trap at PC: %lx, SR: %lx, vector=%lx\n",
-	       regs->nip, regs->msr, regs->trap);
-	_exception(0, regs);
-}
arch/powerpc/cpu/mpc86xx/u-boot.lds deleted +0 -77
deleted file mode 100644
index 94f07c6b7dd2..000000000000
@@ -1,77 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright 2006, 2007 Freescale Semiconductor, Inc.
- */
-
-OUTPUT_ARCH(powerpc)
-
-SECTIONS
-{
-
-  /* Read-only sections, merged into text segment: */
-  .text      :
-  {
-    arch/powerpc/cpu/mpc86xx/start.o	(.text*)
-    arch/powerpc/cpu/mpc86xx/traps.o	(.text*)
-    *(.text*)
-   }
-    _etext = .;
-    PROVIDE (etext = .);
-    .rodata    :
-   {
-    *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
-  }
-
-  /* Read-write section, merged into data segment: */
-  . = (. + 0x00FF) & 0xFFFFFF00;
-  _erotext = .;
-  PROVIDE (erotext = .);
-  .reloc   :
-  {
-    _GOT2_TABLE_ = .;
-    KEEP(*(.got2))
-    KEEP(*(.got))
-    _FIXUP_TABLE_ = .;
-    KEEP(*(.fixup))
-  }
-  __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1;
-  __fixup_entries = (. - _FIXUP_TABLE_) >> 2;
-
-  .data    :
-  {
-    *(.data*)
-    *(.sdata*)
-  }
-  _edata  =  .;
-  PROVIDE (edata = .);
-
-  . = .;
-
-  . = ALIGN(4);
-  .u_boot_list : {
-	KEEP(*(SORT(.u_boot_list*)));
-  }
-
-  . = .;
-  __start___ex_table = .;
-  __ex_table : { *(__ex_table) }
-  __stop___ex_table = .;
-
-  . = ALIGN(256);
-  __init_begin = .;
-  .text.init : { *(.text.init) }
-  .data.init : { *(.data.init) }
-  . = ALIGN(256);
-  __init_end = .;
-
-  __bss_start = .;
-  .bss (NOLOAD)       :
-  {
-   *(.bss*)
-   *(.sbss*)
-   *(COMMON)
-   . = ALIGN(4);
-  }
-  __bss_end = . ;
-  PROVIDE (end = .);
-}
arch/powerpc/include/asm/config.h +0 -4
index 99b410dc9b09..2c96378efef8 100644
@@ -10,10 +10,6 @@
 #include <asm/config_mpc85xx.h>
 #endif
 
-#ifdef CONFIG_MPC86xx
-#include <asm/config_mpc86xx.h>
-#endif
-
 #ifndef HWCONFIG_BUFFER_SIZE
   #define HWCONFIG_BUFFER_SIZE 256
 #endif
arch/powerpc/include/asm/config_mpc86xx.h deleted +0 -9
deleted file mode 100644
index f19ff7a6a128..000000000000
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright 2011 Freescale Semiconductor, Inc.
- */
-
-#ifndef _ASM_MPC86xx_CONFIG_H_
-#define _ASM_MPC86xx_CONFIG_H_
-
-#endif /* _ASM_MPC85xx_CONFIG_H_ */
arch/powerpc/include/asm/fsl_law.h +0 -7
index 77cdc80fdcd0..39fbc04e4744 100644
@@ -78,9 +78,6 @@ enum law_trgt_if {
 enum law_trgt_if {
 	LAW_TRGT_IF_PCI = 0x00,
 	LAW_TRGT_IF_PCI_2 = 0x01,
-#ifndef CONFIG_ARCH_MPC8641
-	LAW_TRGT_IF_PCIE_1 = 0x02,
-#endif
 #if defined(CONFIG_ARCH_BSC9131) || defined(CONFIG_ARCH_BSC9132)
 	LAW_TRGT_IF_OCN_DSP = 0x03,
 #else
@@ -116,10 +113,6 @@ enum law_trgt_if {
 #define LAW_TRGT_IF_RIO_1	LAW_TRGT_IF_RIO
 #define LAW_TRGT_IF_IFC		LAW_TRGT_IF_LBC
 
-#ifdef CONFIG_ARCH_MPC8641
-#define LAW_TRGT_IF_PCIE_1	LAW_TRGT_IF_PCI
-#endif
-
 #if defined(CONFIG_ARCH_P2020)
 #define LAW_TRGT_IF_PCIE_3	LAW_TRGT_IF_PCI
 #endif
arch/powerpc/include/asm/fsl_pci.h +1 -1
index 508834829b95..06f9bfb8ac73 100644
@@ -30,7 +30,7 @@ void fsl_pci_config_unlock(struct pci_controller *hose);
 void ft_fsl_pci_setup(void *blob, const char *compat, unsigned long ctrl_addr);
 
 /*
- * Common PCI/PCIE Register structure for mpc85xx and mpc86xx
+ * Common PCI/PCIE Register structure for mpc85xx
  */
 
 /*
arch/powerpc/include/asm/immap_86xx.h deleted +0 -1221
deleted file mode 100644
index 1fbc63a5ceb8..000000000000
@@ -1,1221 +0,0 @@
-/*
- * MPC86xx Internal Memory Map
- *
- * Copyright 2004, 2011 Freescale Semiconductor
- * Jeff Brown (Jeffrey at freescale.com)
- * Srikanth Srinivasan (srikanth.srinivasan at freescale.com)
- *
- */
-
-#ifndef __IMMAP_86xx__
-#define __IMMAP_86xx__
-
-#include <fsl_immap.h>
-#include <asm/types.h>
-#include <asm/fsl_dma.h>
-#include <asm/fsl_lbc.h>
-#include <asm/fsl_i2c.h>
-
-/* Local-Access Registers and MCM Registers(0x0000-0x2000) */
-typedef struct ccsr_local_mcm {
-	uint	ccsrbar;	/* 0x0 - Control Configuration Status Registers Base Address Register */
-	char	res1[4];
-	uint	altcbar;	/* 0x8 - Alternate Configuration Base Address Register */
-	char	res2[4];
-	uint	altcar;		/* 0x10 - Alternate Configuration Attribute Register */
-	char	res3[12];
-	uint	bptr;		/* 0x20 - Boot Page Translation Register */
-	char	res4[3044];
-	uint	lawbar0;	/* 0xc08 - Local Access Window 0 Base Address Register */
-	char	res5[4];
-	uint	lawar0;		/* 0xc10 - Local Access Window 0 Attributes Register */
-	char	res6[20];
-	uint	lawbar1;	/* 0xc28 - Local Access Window 1 Base Address Register */
-	char	res7[4];
-	uint	lawar1;		/* 0xc30 - Local Access Window 1 Attributes Register */
-	char	res8[20];
-	uint	lawbar2;	/* 0xc48 - Local Access Window 2 Base Address Register */
-	char	res9[4];
-	uint	lawar2;		/* 0xc50 - Local Access Window 2 Attributes Register */
-	char	res10[20];
-	uint	lawbar3;	/* 0xc68 - Local Access Window 3 Base Address Register */
-	char	res11[4];
-	uint	lawar3;		/* 0xc70 - Local Access Window 3 Attributes Register */
-	char	res12[20];
-	uint	lawbar4;	/* 0xc88 - Local Access Window 4 Base Address Register */
-	char	res13[4];
-	uint	lawar4;		/* 0xc90 - Local Access Window 4 Attributes Register */
-	char	res14[20];
-	uint	lawbar5;	/* 0xca8 - Local Access Window 5 Base Address Register */
-	char	res15[4];
-	uint	lawar5;		/* 0xcb0 - Local Access Window 5 Attributes Register */
-	char	res16[20];
-	uint	lawbar6;	/* 0xcc8 - Local Access Window 6 Base Address Register */
-	char	res17[4];
-	uint	lawar6;		/* 0xcd0 - Local Access Window 6 Attributes Register */
-	char	res18[20];
-	uint	lawbar7;	/* 0xce8 - Local Access Window 7 Base Address Register */
-	char	res19[4];
-	uint	lawar7;		/* 0xcf0 - Local Access Window 7 Attributes Register */
-	char	res20[20];
-	uint	lawbar8;	/* 0xd08 - Local Access Window 8 Base Address Register */
-	char	res21[4];
-	uint	lawar8;		/* 0xd10 - Local Access Window 8 Attributes Register */
-	char	res22[20];
-	uint	lawbar9;	/* 0xd28 - Local Access Window 9 Base Address Register */
-	char	res23[4];
-	uint	lawar9;		/* 0xd30 - Local Access Window 9 Attributes Register */
-	char	res24[716];
-	uint	abcr;		/* 0x1000 - MCM CCB Address Configuration Register */
-	char	res25[4];
-	uint    dbcr;           /* 0x1008 - MCM MPX data bus Configuration Register */
-	char	res26[4];
-	uint	pcr;		/* 0x1010 - MCM CCB Port Configuration Register */
-	char	res27[44];
-	uint	hpmr0;		/* 0x1040 - MCM HPM Threshold Count Register 0 */
-	uint	hpmr1;		/* 0x1044 - MCM HPM Threshold Count Register 1 */
-	uint	hpmr2;		/* 0x1048 - MCM HPM Threshold Count Register 2 */
-	uint	hpmr3;		/* 0x104c - MCM HPM Threshold Count Register 3 */
-	char	res28[16];
-	uint	hpmr4;		/* 0x1060 - MCM HPM Threshold Count Register 4 */
-	uint	hpmr5;		/* 0x1064 - MCM HPM Threshold Count Register 5 */
-	uint	hpmccr;		/* 0x1068 - MCM HPM Cycle Count Register */
-	char	res29[3476];
-	uint	edr;		/* 0x1e00 - MCM Error Detect Register */
-	char	res30[4];
-	uint	eer;		/* 0x1e08 - MCM Error Enable Register */
-	uint	eatr;		/* 0x1e0c - MCM Error Attributes Capture Register */
-	uint	eladr;		/* 0x1e10 - MCM Error Low Address Capture Register */
-	uint	ehadr;		/* 0x1e14 - MCM Error High Address Capture Register */
-	char	res31[488];
-} ccsr_local_mcm_t;
-
-/* Daul I2C Registers(0x3000-0x4000) */
-typedef struct ccsr_i2c {
-	struct fsl_i2c_base	i2c[2];
-	u8	res[4096 - 2 * sizeof(struct fsl_i2c_base)];
-} ccsr_i2c_t;
-
-/* DUART Registers(0x4000-0x5000) */
-typedef struct ccsr_duart {
-	char	res1[1280];
-	u_char	urbr1_uthr1_udlb1;/* 0x4500 - URBR1, UTHR1, UDLB1 with the same address offset of 0x04500 */
-	u_char	uier1_udmb1;	/* 0x4501 - UIER1, UDMB1 with the same address offset of 0x04501 */
-	u_char	uiir1_ufcr1_uafr1;/* 0x4502 - UIIR1, UFCR1, UAFR1 with the same address offset of 0x04502 */
-	u_char	ulcr1;		/* 0x4503 - UART1 Line Control Register */
-	u_char	umcr1;		/* 0x4504 - UART1 Modem Control Register */
-	u_char	ulsr1;		/* 0x4505 - UART1 Line Status Register */
-	u_char	umsr1;		/* 0x4506 - UART1 Modem Status Register */
-	u_char	uscr1;		/* 0x4507 - UART1 Scratch Register */
-	char	res2[8];
-	u_char	udsr1;		/* 0x4510 - UART1 DMA Status Register */
-	char	res3[239];
-	u_char	urbr2_uthr2_udlb2;/* 0x4600 - URBR2, UTHR2, UDLB2 with the same address offset of 0x04600 */
-	u_char	uier2_udmb2;	/* 0x4601 - UIER2, UDMB2 with the same address offset of 0x04601 */
-	u_char	uiir2_ufcr2_uafr2;/* 0x4602 - UIIR2, UFCR2, UAFR2 with the same address offset of 0x04602 */
-	u_char	ulcr2;		/* 0x4603 - UART2 Line Control Register */
-	u_char	umcr2;		/* 0x4604 - UART2 Modem Control Register */
-	u_char	ulsr2;		/* 0x4605 - UART2 Line Status Register */
-	u_char	umsr2;		/* 0x4606 - UART2 Modem Status Register */
-	u_char	uscr2;		/* 0x4607 - UART2 Scratch Register */
-	char	res4[8];
-	u_char	udsr2;		/* 0x4610 - UART2 DMA Status Register */
-	char	res5[2543];
-} ccsr_duart_t;
-
-/* PCI Express Registers(0x8000-0x9000) and (0x9000-0xA000) */
-typedef struct ccsr_pex {
-	uint	cfg_addr;	/* 0x8000 - PEX Configuration Address Register */
-	uint	cfg_data;	/* 0x8004 - PEX Configuration Data Register */
-	char	res1[4];
-	uint	out_comp_to;	/* 0x800C - PEX Outbound Completion Timeout Register */
-	char	res2[16];
-	uint	pme_msg_det;	/* 0x8020 - PEX PME & message detect register */
-	uint    pme_msg_int_en;	/* 0x8024 - PEX PME & message interrupt enable register */
-	uint    pme_msg_dis;	/* 0x8028 - PEX PME & message disable register */
-	uint    pm_command;	/* 0x802c - PEX PM Command register */
-	char	res3[3016];
-	uint    block_rev1;	/* 0x8bf8 - PEX Block Revision register 1 */
-	uint    block_rev2;	/* 0x8bfc - PEX Block Revision register 2 */
-	uint	potar0;	        /* 0x8c00 - PEX Outbound Transaction Address Register 0 */
-	uint	potear0;	/* 0x8c04 - PEX Outbound Translation Extended Address Register 0 */
-	char	res4[8];
-	uint	powar0;	        /* 0x8c10 - PEX Outbound Window Attributes Register 0 */
-	char	res5[12];
-	uint	potar1;	        /* 0x8c20 - PEX Outbound Transaction Address Register 1 */
-	uint	potear1;	/* 0x8c24 - PEX Outbound Translation Extended Address Register 1 */
-	uint	powbar1;	/* 0x8c28 - PEX Outbound Window Base Address Register 1 */
-	char	res6[4];
-	uint	powar1;	        /* 0x8c30 - PEX Outbound Window Attributes Register 1 */
-	char	res7[12];
-	uint	potar2;	        /* 0x8c40 - PEX Outbound Transaction Address Register 2 */
-	uint	potear2;	/* 0x8c44 - PEX Outbound Translation Extended Address Register 2 */
-	uint	powbar2;	/* 0x8c48 - PEX Outbound Window Base Address Register 2 */
-	char	res8[4];
-	uint	powar2;	        /* 0x8c50 - PEX Outbound Window Attributes Register 2 */
-	char	res9[12];
-	uint	potar3;	        /* 0x8c60 - PEX Outbound Transaction Address Register 3 */
-	uint	potear3;	/* 0x8c64 - PEX Outbound Translation Extended Address Register 3 */
-	uint	powbar3;	/* 0x8c68 - PEX Outbound Window Base Address Register 3 */
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

arch/powerpc/include/asm/ppc.h +0 -4
index 055364c58fd9..2923350bd7b9 100644

Lines of this file are not shown. View the raw message.

board/sbc8641d/Kconfig deleted +0 -9
deleted file mode 100644
index 8dfc90cf8bc9..000000000000

Lines of this file are not shown. View the raw message.

board/sbc8641d/MAINTAINERS deleted +0 -6
deleted file mode 100644
index a50b541ffe84..000000000000

Lines of this file are not shown. View the raw message.

board/sbc8641d/Makefile deleted +0 -8
deleted file mode 100644
index c48f82d3d931..000000000000

Lines of this file are not shown. View the raw message.

board/sbc8641d/README deleted +0 -49
deleted file mode 100644
index 4999b7763c9c..000000000000

Lines of this file are not shown. View the raw message.

board/sbc8641d/ddr.c deleted +0 -53
deleted file mode 100644
index b6c1847b141b..000000000000

Lines of this file are not shown. View the raw message.

board/sbc8641d/law.c deleted +0 -39
deleted file mode 100644
index dc4696d123f4..000000000000

Lines of this file are not shown. View the raw message.

board/sbc8641d/sbc8641d.c deleted +0 -268
deleted file mode 100644
index a67092daf47f..000000000000

Lines of this file are not shown. View the raw message.

configs/sbc8641d_defconfig deleted +0 -39
deleted file mode 100644
index ea601dea6f40..000000000000

Lines of this file are not shown. View the raw message.

doc/git-mailrc +0 -1
index f520ff89b390..b8299a1a6c30 100644

Lines of this file are not shown. View the raw message.

drivers/ddr/fsl/Kconfig +2 -10
index 890e62190b1a..e6a51f560978 100644

Lines of this file are not shown. View the raw message.

drivers/ddr/fsl/Makefile +0 -1
index c675f44ab00c..8081d0cd82f3 100644

Lines of this file are not shown. View the raw message.

drivers/ddr/fsl/mpc86xx_ddr.c deleted +0 -84
deleted file mode 100644
index 43ed1ba432de..000000000000

Lines of this file are not shown. View the raw message.

env/Kconfig +1 -1
index c06b8ba8cb7e..691f4d480cc4 100644

Lines of this file are not shown. View the raw message.

include/configs/sbc8641d.h deleted +0 -509
deleted file mode 100644
index 3d5aee0dd58a..000000000000

Lines of this file are not shown. View the raw message.

include/post.h +0 -5
index 5695e2b5334f..a07a6bc5e252 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.17.1

Part of the diff is not shown here. View the raw message.

author
#51 lore raw

Re: [PATCH 21/27] ppc: Remove sbc8641d board

In reply to Tom Rini
Quoted 8 lines · Tom Rini

This board has not been converted to CONFIG_DM_PCI by the deadline and is also missing conversion to CONFIG_DM. Remove it. This is also the last of the ARCH_MPC8641/MPC8610 platforms, so remove that support as well.

Cc Paul Gortmaker <[email protected]>
Cc Priyanka Jain <[email protected]>

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
author
#52 lore raw

PATCH 22/27 ppc: Remove MPC8315ERDB board

In reply to Tom Rini

This board has not been converted to CONFIG_DM_PCI by the deadline and is also missing conversion to CONFIG_DM. Remove it. As this is the last ARCH_MPC8315 platform, remove that support as well.

---
 arch/powerpc/cpu/mpc83xx/Kconfig             |  14 -
 arch/powerpc/cpu/mpc83xx/hrcw/Kconfig        |   3 +-
 arch/powerpc/cpu/mpc83xx/speed.c             |  41 +-
 arch/powerpc/include/asm/arch-mpc83xx/gpio.h |   3 +-
 arch/powerpc/include/asm/global_data.h       |   5 +-
 arch/powerpc/include/asm/immap_83xx.h        |  45 ---
 arch/powerpc/include/asm/mpc8xxx_spi.h       |   1 -
 board/freescale/mpc8315erdb/Kconfig          |  12 -
 board/freescale/mpc8315erdb/MAINTAINERS      |   7 -
 board/freescale/mpc8315erdb/Makefile         |   6 -
 board/freescale/mpc8315erdb/README           | 105 ------
 board/freescale/mpc8315erdb/mpc8315erdb.c    | 249 -------------
 board/freescale/mpc8315erdb/sdram.c          | 115 ------
 configs/MPC8315ERDB_defconfig                | 156 --------
 include/configs/MPC8315ERDB.h                | 370 -------------------
 include/mpc83xx.h                            |  39 +-
 16 files changed, 11 insertions(+), 1160 deletions(-)
 delete mode 100644 board/freescale/mpc8315erdb/Kconfig
 delete mode 100644 board/freescale/mpc8315erdb/MAINTAINERS
 delete mode 100644 board/freescale/mpc8315erdb/Makefile
 delete mode 100644 board/freescale/mpc8315erdb/README
 delete mode 100644 board/freescale/mpc8315erdb/mpc8315erdb.c
 delete mode 100644 board/freescale/mpc8315erdb/sdram.c
 delete mode 100644 configs/MPC8315ERDB_defconfig
 delete mode 100644 include/configs/MPC8315ERDB.h
arch/powerpc/cpu/mpc83xx/Kconfig +0 -14
index a67216a2f460..d1b774f8d55f 100644
@@ -8,11 +8,6 @@ choice
 	prompt "Target select"
 	optional
 
-config TARGET_MPC8315ERDB
-	bool "Support MPC8315ERDB"
-	select ARCH_MPC8315
-	select BOARD_EARLY_INIT_F
-
 config TARGET_MPC8323ERDB
 	bool "Support MPC8323ERDB"
 	select ARCH_MPC832X
@@ -175,14 +170,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
@@ -265,7 +252,6 @@ endmenu
 config FSL_ELBC
 	bool
 
-source "board/freescale/mpc8315erdb/Kconfig"
 source "board/freescale/mpc8323erdb/Kconfig"
 source "board/freescale/mpc832xemds/Kconfig"
 source "board/freescale/mpc8349emds/Kconfig"
arch/powerpc/cpu/mpc83xx/hrcw/Kconfig +1 -2
index c657a47b1143..75ec9c9a3464 100644
@@ -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
arch/powerpc/cpu/mpc83xx/speed.c +6 -35

95 lines not on this page · raw message

arch/powerpc/include/asm/arch-mpc83xx/gpio.h +1 -2
index 8a6896e6229c..b7406751838a 100644
@@ -6,8 +6,7 @@
 /*
  * The MCP83xx's 1-2 GPIO controllers each with 32 bits.
  */
-#if defined(CONFIG_ARCH_MPC8313) || defined(CONFIG_ARCH_MPC8308) || \
-	defined(CONFIG_ARCH_MPC8315)
+#if defined(CONFIG_ARCH_MPC8313) || defined(CONFIG_ARCH_MPC8308)
 #define MPC83XX_GPIO_CTRLRS 1
 #elif defined(CONFIG_ARCH_MPC834X) || defined(CONFIG_ARCH_MPC837X) || \
 	defined(CONFIG_ARCH_MPC8309)
arch/powerpc/include/asm/global_data.h +1 -4
index 192a02d347e7..5c3de48cc808 100644
@@ -45,9 +45,6 @@ struct arch_global_data {
 # if defined(CONFIG_ARCH_MPC834X)
 	u32 usbmph_clk;
 # endif /* CONFIG_ARCH_MPC834X */
-# if defined(CONFIG_ARCH_MPC8315)
-	u32 tdm_clk;
-# endif
 	u32 core_clk;
 	u32 enc_clk;
 	u32 lbiu_clk;
@@ -57,7 +54,7 @@ struct arch_global_data {
 	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
 # if defined(CONFIG_ARCH_MPC8360)
arch/powerpc/include/asm/immap_83xx.h +0 -45

51 lines not on this page · raw message

arch/powerpc/include/asm/mpc8xxx_spi.h +0 -1
index 470ee955f303..f2210a14aeae 100644
@@ -13,7 +13,6 @@
 #if defined(CONFIG_ARCH_MPC8308) || \
 	defined(CONFIG_ARCH_MPC8309) || \
 	defined(CONFIG_ARCH_MPC8313) || \
-	defined(CONFIG_ARCH_MPC8315) || \
 	defined(CONFIG_ARCH_MPC834X) || \
 	defined(CONFIG_ARCH_MPC837X)
 
board/freescale/mpc8315erdb/Kconfig deleted +0 -12
deleted file mode 100644
index f76b0d1d6dbc..000000000000
@@ -1,12 +0,0 @@
-if TARGET_MPC8315ERDB
-
-config SYS_BOARD
-	default "mpc8315erdb"
-
-config SYS_VENDOR
-	default "freescale"
-
-config SYS_CONFIG_NAME
-	default "MPC8315ERDB"
-
-endif
board/freescale/mpc8315erdb/MAINTAINERS deleted +0 -7
deleted file mode 100644
index cdac1ac2eed4..000000000000
@@ -1,7 +0,0 @@
-MPC8315ERDB BOARD
-#M:	Dave Liu <[email protected]>
-S:	Orphan (since 2018-05)
-F:	board/freescale/mpc8315erdb/
-F:	include/configs/MPC8315ERDB.h
-F:	configs/MPC8315ERDB_defconfig
-F:	configs/MPC8315ERDB_NANDSPL_defconfig
board/freescale/mpc8315erdb/Makefile deleted +0 -6
deleted file mode 100644
index 579181999d42..000000000000
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2006
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-
-obj-y	:= mpc8315erdb.o sdram.o
board/freescale/mpc8315erdb/README deleted +0 -105

105 lines not on this page · raw message

board/freescale/mpc8315erdb/mpc8315erdb.c deleted +0 -249

249 lines not on this page · raw message

board/freescale/mpc8315erdb/sdram.c deleted +0 -115

115 lines not on this page · raw message

configs/MPC8315ERDB_defconfig deleted +0 -156

156 lines not on this page · raw message

include/configs/MPC8315ERDB.h deleted +0 -370

370 lines not on this page · raw message

include/mpc83xx.h +2 -37
index ea67868ea012..71cffa1b0fc8 100644
@@ -243,41 +243,6 @@
 #define SICRH_TSOBI1			0x00000002
 #define SICRH_TSOBI2			0x00000001
 
-#elif defined(CONFIG_ARCH_MPC8315)
-/* SICRL bits - MPC8315 specific */
-#define SICRL_DMA_CH0			0xc0000000
-#define SICRL_DMA_SPI			0x30000000
-#define SICRL_UART			0x0c000000
-#define SICRL_IRQ4			0x02000000
-#define SICRL_IRQ5			0x01800000
-#define SICRL_IRQ6_7			0x00400000
-#define SICRL_IIC1			0x00300000
-#define SICRL_TDM			0x000c0000
-#define SICRL_TDM_SHARED		0x00030000
-#define SICRL_PCI_A			0x0000c000
-#define SICRL_ELBC_A			0x00003000
-#define SICRL_ETSEC1_A			0x000000c0
-#define SICRL_ETSEC1_B			0x00000030
-#define SICRL_ETSEC1_C			0x0000000c
-#define SICRL_TSEXPOBI			0x00000001
-
-/* SICRH bits - MPC8315 specific */
-#define SICRH_GPIO_0			0xc0000000
-#define SICRH_GPIO_1			0x30000000
-#define SICRH_GPIO_2			0x0c000000
-#define SICRH_GPIO_3			0x03000000
-#define SICRH_GPIO_4			0x00c00000
-#define SICRH_GPIO_5			0x00300000
-#define SICRH_GPIO_6			0x000c0000
-#define SICRH_GPIO_7			0x00030000
-#define SICRH_GPIO_8			0x0000c000
-#define SICRH_GPIO_9			0x00003000
-#define SICRH_GPIO_10			0x00000c00
-#define SICRH_GPIO_11			0x00000300
-#define SICRH_ETSEC2_A			0x000000c0
-#define SICRH_TSOBI1			0x00000002
-#define SICRH_TSOBI2			0x00000001
-
 #elif defined(CONFIG_ARCH_MPC837X)
 /* SICRL bits - MPC837X specific */
 #define SICRL_USB_A			0xC0000000
@@ -634,7 +599,7 @@
 #define HRCWL_CE_TO_PLL_1X30		0x0000001E
 #define HRCWL_CE_TO_PLL_1X31		0x0000001F
 
-#elif defined(CONFIG_ARCH_MPC8308) || defined(CONFIG_ARCH_MPC8315)
+#elif defined(CONFIG_ARCH_MPC8308)
 #define HRCWL_SVCOD			0x30000000
 #define HRCWL_SVCOD_SHIFT		28
 #define HRCWL_SVCOD_DIV_2		0x00000000
@@ -981,7 +946,7 @@
 #define SCCR_USBDRCM_2			0x00200000
 #define SCCR_USBDRCM_3			0x00300000
 
-#elif defined(CONFIG_ARCH_MPC8308) || defined(CONFIG_ARCH_MPC8315)
+#elif defined(CONFIG_ARCH_MPC8308)
 /* SCCR bits - MPC8315/MPC8308 specific */
 #define SCCR_TSEC1CM			0xc0000000
 #define SCCR_TSEC1CM_SHIFT		30
Signature · 1 line
2.17.1
author
#53 lore raw

Re: [PATCH 22/27] ppc: Remove MPC8315ERDB board

Quoted 5 lines · Tom Rini

This board has not been converted to CONFIG_DM_PCI by the deadline and is also missing conversion to CONFIG_DM. Remove it. As this is the last ARCH_MPC8315 platform, remove that support as well.

Applied to u-boot/master, thanks!

Signature · 1 line
Tom