diff mbox

[U-Boot] ppc: xilinx: Remove ancient ppc405 and ppc440 platforms

Message ID 2b34df2883c671beb211ee0ea8de7914188ea71c.1431002081.git.michal.simek@xilinx.com
State Rejected
Delegated to: Tom Rini
Headers show

Commit Message

Michal Simek May 7, 2015, 12:34 p.m. UTC
Remove ancient Xilinx platforms.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 arch/powerpc/cpu/ppc4xx/Kconfig                    |  20 ----
 arch/powerpc/cpu/ppc4xx/Makefile                   |   3 -
 arch/powerpc/cpu/ppc4xx/cpu.c                      |   4 -
 arch/powerpc/cpu/ppc4xx/speed.c                    |   9 +-
 arch/powerpc/cpu/ppc4xx/start.S                    |   3 +-
 arch/powerpc/cpu/ppc4xx/xilinx_irq.c               |  89 ---------------
 arch/powerpc/include/asm/interrupt.h               |   4 -
 arch/powerpc/include/asm/ppc4xx.h                  |   2 -
 arch/powerpc/include/asm/xilinx_irq.h              |  25 ----
 arch/powerpc/lib/board.c                           |   2 -
 board/avnet/fx12mm/Kconfig                         |  12 --
 board/avnet/fx12mm/MAINTAINERS                     |   7 --
 board/avnet/fx12mm/Makefile                        |  11 --
 board/avnet/fx12mm/fx12mm.c                        |  34 ------
 board/avnet/fx12mm/xparameters.h                   |  35 ------
 board/avnet/v5fx30teval/Kconfig                    |  12 --
 board/avnet/v5fx30teval/MAINTAINERS                |   7 --
 board/avnet/v5fx30teval/Makefile                   |  11 --
 board/avnet/v5fx30teval/v5fx30teval.c              |  17 ---
 board/avnet/v5fx30teval/xparameters.h              |  22 ----
 board/xilinx/ml507/Kconfig                         |  12 --
 board/xilinx/ml507/MAINTAINERS                     |   7 --
 board/xilinx/ml507/Makefile                        |  11 --
 board/xilinx/ml507/ml507.c                         |  17 ---
 board/xilinx/ml507/xparameters.h                   |  23 ----
 board/xilinx/ppc405-generic/Kconfig                |  12 --
 board/xilinx/ppc405-generic/MAINTAINERS            |   7 --
 board/xilinx/ppc405-generic/Makefile               |  12 --
 .../xilinx/ppc405-generic/xilinx_ppc405_generic.c  |  48 --------
 board/xilinx/ppc405-generic/xparameters.h          |  25 ----
 board/xilinx/ppc440-generic/Kconfig                |  12 --
 board/xilinx/ppc440-generic/MAINTAINERS            |   7 --
 board/xilinx/ppc440-generic/Makefile               |  13 ---
 board/xilinx/ppc440-generic/init.S                 |  34 ------
 .../xilinx/ppc440-generic/xilinx_ppc440_generic.c  |  41 -------
 board/xilinx/ppc440-generic/xparameters.h          |  23 ----
 common/board_f.c                                   |   2 -
 common/cmd_bdinfo.c                                |   9 +-
 configs/fx12mm_defconfig                           |   4 -
 configs/fx12mm_flash_defconfig                     |   4 -
 configs/ml507_defconfig                            |   4 -
 configs/ml507_flash_defconfig                      |   4 -
 configs/v5fx30teval_defconfig                      |   4 -
 configs/v5fx30teval_flash_defconfig                |   4 -
 configs/xilinx-ppc405-generic_defconfig            |   4 -
 configs/xilinx-ppc405-generic_flash_defconfig      |   4 -
 configs/xilinx-ppc440-generic_defconfig            |   4 -
 configs/xilinx-ppc440-generic_flash_defconfig      |   4 -
 drivers/net/xilinx_ll_temac.c                      |  15 +--
 drivers/net/xilinx_ll_temac_sdma.c                 |  59 ----------
 drivers/net/xilinx_ll_temac_sdma.h                 |  11 --
 include/configs/fx12mm.h                           |  52 ---------
 include/configs/ml507.h                            |  39 -------
 include/configs/v5fx30teval.h                      |  39 -------
 include/configs/xilinx-ppc.h                       | 126 ---------------------
 include/configs/xilinx-ppc405-generic.h            |  42 -------
 include/configs/xilinx-ppc405.h                    |  22 ----
 include/configs/xilinx-ppc440-generic.h            |  39 -------
 include/configs/xilinx-ppc440.h                    |  17 ---
 59 files changed, 9 insertions(+), 1136 deletions(-)
 delete mode 100644 arch/powerpc/cpu/ppc4xx/xilinx_irq.c
 delete mode 100644 arch/powerpc/include/asm/xilinx_irq.h
 delete mode 100644 board/avnet/fx12mm/Kconfig
 delete mode 100644 board/avnet/fx12mm/MAINTAINERS
 delete mode 100644 board/avnet/fx12mm/Makefile
 delete mode 100644 board/avnet/fx12mm/fx12mm.c
 delete mode 100644 board/avnet/fx12mm/xparameters.h
 delete mode 100644 board/avnet/v5fx30teval/Kconfig
 delete mode 100644 board/avnet/v5fx30teval/MAINTAINERS
 delete mode 100644 board/avnet/v5fx30teval/Makefile
 delete mode 100644 board/avnet/v5fx30teval/v5fx30teval.c
 delete mode 100644 board/avnet/v5fx30teval/xparameters.h
 delete mode 100644 board/xilinx/ml507/Kconfig
 delete mode 100644 board/xilinx/ml507/MAINTAINERS
 delete mode 100644 board/xilinx/ml507/Makefile
 delete mode 100644 board/xilinx/ml507/ml507.c
 delete mode 100644 board/xilinx/ml507/xparameters.h
 delete mode 100644 board/xilinx/ppc405-generic/Kconfig
 delete mode 100644 board/xilinx/ppc405-generic/MAINTAINERS
 delete mode 100644 board/xilinx/ppc405-generic/Makefile
 delete mode 100644 board/xilinx/ppc405-generic/xilinx_ppc405_generic.c
 delete mode 100644 board/xilinx/ppc405-generic/xparameters.h
 delete mode 100644 board/xilinx/ppc440-generic/Kconfig
 delete mode 100644 board/xilinx/ppc440-generic/MAINTAINERS
 delete mode 100644 board/xilinx/ppc440-generic/Makefile
 delete mode 100644 board/xilinx/ppc440-generic/init.S
 delete mode 100644 board/xilinx/ppc440-generic/xilinx_ppc440_generic.c
 delete mode 100644 board/xilinx/ppc440-generic/xparameters.h
 delete mode 100644 configs/fx12mm_defconfig
 delete mode 100644 configs/fx12mm_flash_defconfig
 delete mode 100644 configs/ml507_defconfig
 delete mode 100644 configs/ml507_flash_defconfig
 delete mode 100644 configs/v5fx30teval_defconfig
 delete mode 100644 configs/v5fx30teval_flash_defconfig
 delete mode 100644 configs/xilinx-ppc405-generic_defconfig
 delete mode 100644 configs/xilinx-ppc405-generic_flash_defconfig
 delete mode 100644 configs/xilinx-ppc440-generic_defconfig
 delete mode 100644 configs/xilinx-ppc440-generic_flash_defconfig
 delete mode 100644 include/configs/fx12mm.h
 delete mode 100644 include/configs/ml507.h
 delete mode 100644 include/configs/v5fx30teval.h
 delete mode 100644 include/configs/xilinx-ppc.h
 delete mode 100644 include/configs/xilinx-ppc405-generic.h
 delete mode 100644 include/configs/xilinx-ppc405.h
 delete mode 100644 include/configs/xilinx-ppc440-generic.h
 delete mode 100644 include/configs/xilinx-ppc440.h

Comments

Stefan Roese May 7, 2015, 12:39 p.m. UTC | #1
Hi Michal,

On 07.05.2015 14:34, Michal Simek wrote:
> Remove ancient Xilinx platforms.
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
>
>   arch/powerpc/cpu/ppc4xx/Kconfig                    |  20 ----
>   arch/powerpc/cpu/ppc4xx/Makefile                   |   3 -
>   arch/powerpc/cpu/ppc4xx/cpu.c                      |   4 -
>   arch/powerpc/cpu/ppc4xx/speed.c                    |   9 +-
>   arch/powerpc/cpu/ppc4xx/start.S                    |   3 +-
>   arch/powerpc/cpu/ppc4xx/xilinx_irq.c               |  89 ---------------
>   arch/powerpc/include/asm/interrupt.h               |   4 -
>   arch/powerpc/include/asm/ppc4xx.h                  |   2 -
>   arch/powerpc/include/asm/xilinx_irq.h              |  25 ----
>   arch/powerpc/lib/board.c                           |   2 -
>   board/avnet/fx12mm/Kconfig                         |  12 --
>   board/avnet/fx12mm/MAINTAINERS                     |   7 --
>   board/avnet/fx12mm/Makefile                        |  11 --
>   board/avnet/fx12mm/fx12mm.c                        |  34 ------
>   board/avnet/fx12mm/xparameters.h                   |  35 ------
>   board/avnet/v5fx30teval/Kconfig                    |  12 --
>   board/avnet/v5fx30teval/MAINTAINERS                |   7 --
>   board/avnet/v5fx30teval/Makefile                   |  11 --
>   board/avnet/v5fx30teval/v5fx30teval.c              |  17 ---
>   board/avnet/v5fx30teval/xparameters.h              |  22 ----
>   board/xilinx/ml507/Kconfig                         |  12 --
>   board/xilinx/ml507/MAINTAINERS                     |   7 --
>   board/xilinx/ml507/Makefile                        |  11 --
>   board/xilinx/ml507/ml507.c                         |  17 ---
>   board/xilinx/ml507/xparameters.h                   |  23 ----
>   board/xilinx/ppc405-generic/Kconfig                |  12 --
>   board/xilinx/ppc405-generic/MAINTAINERS            |   7 --
>   board/xilinx/ppc405-generic/Makefile               |  12 --
>   .../xilinx/ppc405-generic/xilinx_ppc405_generic.c  |  48 --------
>   board/xilinx/ppc405-generic/xparameters.h          |  25 ----
>   board/xilinx/ppc440-generic/Kconfig                |  12 --
>   board/xilinx/ppc440-generic/MAINTAINERS            |   7 --
>   board/xilinx/ppc440-generic/Makefile               |  13 ---
>   board/xilinx/ppc440-generic/init.S                 |  34 ------
>   .../xilinx/ppc440-generic/xilinx_ppc440_generic.c  |  41 -------
>   board/xilinx/ppc440-generic/xparameters.h          |  23 ----
>   common/board_f.c                                   |   2 -
>   common/cmd_bdinfo.c                                |   9 +-
>   configs/fx12mm_defconfig                           |   4 -
>   configs/fx12mm_flash_defconfig                     |   4 -
>   configs/ml507_defconfig                            |   4 -
>   configs/ml507_flash_defconfig                      |   4 -
>   configs/v5fx30teval_defconfig                      |   4 -
>   configs/v5fx30teval_flash_defconfig                |   4 -
>   configs/xilinx-ppc405-generic_defconfig            |   4 -
>   configs/xilinx-ppc405-generic_flash_defconfig      |   4 -
>   configs/xilinx-ppc440-generic_defconfig            |   4 -
>   configs/xilinx-ppc440-generic_flash_defconfig      |   4 -
>   drivers/net/xilinx_ll_temac.c                      |  15 +--
>   drivers/net/xilinx_ll_temac_sdma.c                 |  59 ----------
>   drivers/net/xilinx_ll_temac_sdma.h                 |  11 --
>   include/configs/fx12mm.h                           |  52 ---------
>   include/configs/ml507.h                            |  39 -------
>   include/configs/v5fx30teval.h                      |  39 -------
>   include/configs/xilinx-ppc.h                       | 126 ---------------------
>   include/configs/xilinx-ppc405-generic.h            |  42 -------
>   include/configs/xilinx-ppc405.h                    |  22 ----
>   include/configs/xilinx-ppc440-generic.h            |  39 -------
>   include/configs/xilinx-ppc440.h                    |  17 ---
>   59 files changed, 9 insertions(+), 1136 deletions(-)

Nice diffstat! ;)

Looks good, so:

Acked-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan
Michal Simek May 7, 2015, 12:58 p.m. UTC | #2
Hi Stefan

On 05/07/2015 02:39 PM, Stefan Roese wrote:
> Hi Michal,
> 
> On 07.05.2015 14:34, Michal Simek wrote:
>> Remove ancient Xilinx platforms.
>>
>> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
>> ---
>>
>>   arch/powerpc/cpu/ppc4xx/Kconfig                    |  20 ----
>>   arch/powerpc/cpu/ppc4xx/Makefile                   |   3 -
>>   arch/powerpc/cpu/ppc4xx/cpu.c                      |   4 -
>>   arch/powerpc/cpu/ppc4xx/speed.c                    |   9 +-
>>   arch/powerpc/cpu/ppc4xx/start.S                    |   3 +-
>>   arch/powerpc/cpu/ppc4xx/xilinx_irq.c               |  89
>> ---------------
>>   arch/powerpc/include/asm/interrupt.h               |   4 -
>>   arch/powerpc/include/asm/ppc4xx.h                  |   2 -
>>   arch/powerpc/include/asm/xilinx_irq.h              |  25 ----
>>   arch/powerpc/lib/board.c                           |   2 -
>>   board/avnet/fx12mm/Kconfig                         |  12 --
>>   board/avnet/fx12mm/MAINTAINERS                     |   7 --
>>   board/avnet/fx12mm/Makefile                        |  11 --
>>   board/avnet/fx12mm/fx12mm.c                        |  34 ------
>>   board/avnet/fx12mm/xparameters.h                   |  35 ------
>>   board/avnet/v5fx30teval/Kconfig                    |  12 --
>>   board/avnet/v5fx30teval/MAINTAINERS                |   7 --
>>   board/avnet/v5fx30teval/Makefile                   |  11 --
>>   board/avnet/v5fx30teval/v5fx30teval.c              |  17 ---
>>   board/avnet/v5fx30teval/xparameters.h              |  22 ----
>>   board/xilinx/ml507/Kconfig                         |  12 --
>>   board/xilinx/ml507/MAINTAINERS                     |   7 --
>>   board/xilinx/ml507/Makefile                        |  11 --
>>   board/xilinx/ml507/ml507.c                         |  17 ---
>>   board/xilinx/ml507/xparameters.h                   |  23 ----
>>   board/xilinx/ppc405-generic/Kconfig                |  12 --
>>   board/xilinx/ppc405-generic/MAINTAINERS            |   7 --
>>   board/xilinx/ppc405-generic/Makefile               |  12 --
>>   .../xilinx/ppc405-generic/xilinx_ppc405_generic.c  |  48 --------
>>   board/xilinx/ppc405-generic/xparameters.h          |  25 ----
>>   board/xilinx/ppc440-generic/Kconfig                |  12 --
>>   board/xilinx/ppc440-generic/MAINTAINERS            |   7 --
>>   board/xilinx/ppc440-generic/Makefile               |  13 ---
>>   board/xilinx/ppc440-generic/init.S                 |  34 ------
>>   .../xilinx/ppc440-generic/xilinx_ppc440_generic.c  |  41 -------
>>   board/xilinx/ppc440-generic/xparameters.h          |  23 ----
>>   common/board_f.c                                   |   2 -
>>   common/cmd_bdinfo.c                                |   9 +-
>>   configs/fx12mm_defconfig                           |   4 -
>>   configs/fx12mm_flash_defconfig                     |   4 -
>>   configs/ml507_defconfig                            |   4 -
>>   configs/ml507_flash_defconfig                      |   4 -
>>   configs/v5fx30teval_defconfig                      |   4 -
>>   configs/v5fx30teval_flash_defconfig                |   4 -
>>   configs/xilinx-ppc405-generic_defconfig            |   4 -
>>   configs/xilinx-ppc405-generic_flash_defconfig      |   4 -
>>   configs/xilinx-ppc440-generic_defconfig            |   4 -
>>   configs/xilinx-ppc440-generic_flash_defconfig      |   4 -
>>   drivers/net/xilinx_ll_temac.c                      |  15 +--
>>   drivers/net/xilinx_ll_temac_sdma.c                 |  59 ----------
>>   drivers/net/xilinx_ll_temac_sdma.h                 |  11 --
>>   include/configs/fx12mm.h                           |  52 ---------
>>   include/configs/ml507.h                            |  39 -------
>>   include/configs/v5fx30teval.h                      |  39 -------
>>   include/configs/xilinx-ppc.h                       | 126
>> ---------------------
>>   include/configs/xilinx-ppc405-generic.h            |  42 -------
>>   include/configs/xilinx-ppc405.h                    |  22 ----
>>   include/configs/xilinx-ppc440-generic.h            |  39 -------
>>   include/configs/xilinx-ppc440.h                    |  17 ---
>>   59 files changed, 9 insertions(+), 1136 deletions(-)
> 
> Nice diffstat! ;)
> 
> Looks good, so:
> 
> Acked-by: Stefan Roese <sr@denx.de>

Hopefully I didn't forget anything.

Thanks,
Michal
diff mbox

Patch

diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig
index 89cb3e9c4eea..6c086491411f 100644
--- a/arch/powerpc/cpu/ppc4xx/Kconfig
+++ b/arch/powerpc/cpu/ppc4xx/Kconfig
@@ -85,12 +85,6 @@  config TARGET_YOSEMITE
 config TARGET_YUCCA
 	bool "Support yucca"
 
-config TARGET_FX12MM
-	bool "Support fx12mm"
-
-config TARGET_V5FX30TEVAL
-	bool "Support v5fx30teval"
-
 config TARGET_CPCI2DP
 	bool "Support CPCI2DP"
 
@@ -151,15 +145,6 @@  config TARGET_P3P440
 config TARGET_XPEDITE1000
 	bool "Support xpedite1000"
 
-config TARGET_ML507
-	bool "Support ml507"
-
-config TARGET_XILINX_PPC405_GENERIC
-	bool "Support xilinx-ppc405-generic"
-
-config TARGET_XILINX_PPC440_GENERIC
-	bool "Support xilinx-ppc440-generic"
-
 endchoice
 
 source "board/amcc/acadia/Kconfig"
@@ -179,8 +164,6 @@  source "board/amcc/taishan/Kconfig"
 source "board/amcc/walnut/Kconfig"
 source "board/amcc/yosemite/Kconfig"
 source "board/amcc/yucca/Kconfig"
-source "board/avnet/fx12mm/Kconfig"
-source "board/avnet/v5fx30teval/Kconfig"
 source "board/csb272/Kconfig"
 source "board/csb472/Kconfig"
 source "board/esd/cpci2dp/Kconfig"
@@ -205,9 +188,6 @@  source "board/sbc405/Kconfig"
 source "board/sc3/Kconfig"
 source "board/t3corp/Kconfig"
 source "board/xes/xpedite1000/Kconfig"
-source "board/xilinx/ml507/Kconfig"
-source "board/xilinx/ppc405-generic/Kconfig"
-source "board/xilinx/ppc440-generic/Kconfig"
 source "board/zeus/Kconfig"
 
 endmenu
diff --git a/arch/powerpc/cpu/ppc4xx/Makefile b/arch/powerpc/cpu/ppc4xx/Makefile
index 4b792ae2d24f..0a7d54f9376b 100644
--- a/arch/powerpc/cpu/ppc4xx/Makefile
+++ b/arch/powerpc/cpu/ppc4xx/Makefile
@@ -36,13 +36,10 @@  obj-y	+= tlb.o
 obj-y	+= traps.o
 obj-y	+= usb.o
 obj-y	+= usb_ohci.o
-obj-$(CONFIG_XILINX_440) += xilinx_irq.o
-ifndef CONFIG_XILINX_440
 obj-y	+= 4xx_uart.o
 obj-y	+= gpio.o
 obj-y	+= miiphy.o
 obj-y	+= uic.o
-endif
 
 ifdef CONFIG_SPL_BUILD
 obj-y += spl_boot.o
diff --git a/arch/powerpc/cpu/ppc4xx/cpu.c b/arch/powerpc/cpu/ppc4xx/cpu.c
index aab65d405c59..5c9126629276 100644
--- a/arch/powerpc/cpu/ppc4xx/cpu.c
+++ b/arch/powerpc/cpu/ppc4xx/cpu.c
@@ -285,11 +285,7 @@  int checkcpu (void)
 
 	get_sys_info(&sys_info);
 
-#if defined(CONFIG_XILINX_440)
-	puts("IBM PowerPC ");
-#else
 	puts("AMCC PowerPC ");
-#endif
 
 	switch (pvr) {
 
diff --git a/arch/powerpc/cpu/ppc4xx/speed.c b/arch/powerpc/cpu/ppc4xx/speed.c
index 3e1a7016d949..02fbd1c7ae8b 100644
--- a/arch/powerpc/cpu/ppc4xx/speed.c
+++ b/arch/powerpc/cpu/ppc4xx/speed.c
@@ -382,8 +382,7 @@  ulong get_PCI_freq (void)
 	return sys_info.freqPCI;
 }
 
-#elif !defined(CONFIG_440GX) && !defined(CONFIG_440SP) && !defined(CONFIG_440SPE) \
-	&& !defined(CONFIG_XILINX_440)
+#elif !defined(CONFIG_440GX) && !defined(CONFIG_440SP) && !defined(CONFIG_440SPE)
 void get_sys_info (sys_info_t * sysInfo)
 {
 	unsigned long strp0;
@@ -417,7 +416,6 @@  void get_sys_info (sys_info_t * sysInfo)
 }
 #else
 
-#if !defined(CONFIG_XILINX_440)
 void get_sys_info (sys_info_t * sysInfo)
 {
 	unsigned long strp0;
@@ -504,7 +502,6 @@  void get_sys_info (sys_info_t * sysInfo)
 }
 
 #endif
-#endif /* CONFIG_XILINX_440 */
 
 #if defined(CONFIG_YUCCA)
 unsigned long determine_sysper(void)
@@ -717,10 +714,6 @@  unsigned long determine_pci_clock_per(void)
 }
 #endif
 
-#elif defined(CONFIG_XILINX_405)
-extern void get_sys_info (sys_info_t * sysInfo);
-extern ulong get_PCI_freq (void);
-
 #elif defined(CONFIG_405)
 
 void get_sys_info (sys_info_t * sysInfo)
diff --git a/arch/powerpc/cpu/ppc4xx/start.S b/arch/powerpc/cpu/ppc4xx/start.S
index 7a0f0d25d14d..8830160d3d0d 100644
--- a/arch/powerpc/cpu/ppc4xx/start.S
+++ b/arch/powerpc/cpu/ppc4xx/start.S
@@ -818,8 +818,7 @@  _start:
 	ori	r4, r4, CONFIG_SYS_DCACHE_SACR_VALUE@l
 	mtdccr	r4
 
-#if !(defined(CONFIG_SYS_EBC_PB0AP) && defined(CONFIG_SYS_EBC_PB0CR))\
-				&& !defined (CONFIG_XILINX_405)
+#if !(defined(CONFIG_SYS_EBC_PB0AP) && defined(CONFIG_SYS_EBC_PB0CR))
 	/*----------------------------------------------------------------------- */
 	/* Tune the speed and size for flash CS0  */
 	/*----------------------------------------------------------------------- */
diff --git a/arch/powerpc/cpu/ppc4xx/xilinx_irq.c b/arch/powerpc/cpu/ppc4xx/xilinx_irq.c
deleted file mode 100644
index 71e1be02a678..000000000000
--- a/arch/powerpc/cpu/ppc4xx/xilinx_irq.c
+++ /dev/null
@@ -1,89 +0,0 @@ 
-/*
- * (C) Copyright 2008
- * Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es
- * This work has been supported by: QTechnology  http://qtec.com/
- * Based on interrupts.c Wolfgang Denk-DENX Software Engineering-wd@denx.de
- * SPDX-License-Identifier:	GPL-2.0+
-*/
-#include <common.h>
-#include <watchdog.h>
-#include <command.h>
-#include <asm/processor.h>
-#include <asm/interrupt.h>
-#include <asm/ppc4xx.h>
-#include <ppc_asm.tmpl>
-#include <commproc.h>
-#include <asm/io.h>
-#include <asm/xilinx_irq.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-void pic_enable(void)
-{
-	debug("Xilinx PIC at 0x%8x\n", intc);
-
-	/*
-	 * Disable all external interrupts until they are
-	 * explicitly requested.
-	 */
-	out_be32((u32 *) IER, 0);
-
-	/* Acknowledge any pending interrupts just in case. */
-	out_be32((u32 *) IAR, 0xffffffff);
-
-	/* Turn on the Master Enable. */
-	out_be32((u32 *) MER, 0x3UL);
-
-	return;
-}
-
-int xilinx_pic_irq_get(void)
-{
-	u32 irq;
-	irq = in_be32((u32 *) IVR);
-
-	/* If no interrupt is pending then all bits of the IVR are set to 1. As
-	 * the IVR is as many bits wide as numbers of inputs are available.
-	 * Therefore, if all bits of the IVR are set to one, its content will
-	 * be bigger than XPAR_INTC_MAX_NUM_INTR_INPUTS.
-	 */
-	if (irq >= XPAR_INTC_MAX_NUM_INTR_INPUTS)
-		irq = -1;	/* report no pending interrupt. */
-
-	debug("get_irq: %d\n", irq);
-	return (irq);
-}
-
-void pic_irq_enable(unsigned int irq)
-{
-	u32 mask = IRQ_MASK(irq);
-	debug("enable: %d\n", irq);
-	out_be32((u32 *) SIE, mask);
-}
-
-void pic_irq_disable(unsigned int irq)
-{
-	u32 mask = IRQ_MASK(irq);
-	debug("disable: %d\n", irq);
-	out_be32((u32 *) CIE, mask);
-}
-
-void pic_irq_ack(unsigned int irq)
-{
-	u32 mask = IRQ_MASK(irq);
-	debug("ack: %d\n", irq);
-	out_be32((u32 *) IAR, mask);
-}
-
-void external_interrupt(struct pt_regs *regs)
-{
-	int irq;
-
-	irq = xilinx_pic_irq_get();
-	if (irq < 0)
-		return;
-
-	interrupt_run_handler(irq);
-
-	return;
-}
diff --git a/arch/powerpc/include/asm/interrupt.h b/arch/powerpc/include/asm/interrupt.h
index 1a6a93384e76..93a2148d3203 100644
--- a/arch/powerpc/include/asm/interrupt.h
+++ b/arch/powerpc/include/asm/interrupt.h
@@ -9,11 +9,7 @@ 
 #ifndef INTERRUPT_H
 #define INTERRUPT_H
 
-#if defined(CONFIG_XILINX_440)
-#include <asm/xilinx_irq.h>
-#else
 #include <asm/ppc4xx-uic.h>
-#endif
 
 void pic_enable(void);
 void pic_irq_enable(unsigned int irq);
diff --git a/arch/powerpc/include/asm/ppc4xx.h b/arch/powerpc/include/asm/ppc4xx.h
index b8b0ff9f25bb..177f60f35925 100644
--- a/arch/powerpc/include/asm/ppc4xx.h
+++ b/arch/powerpc/include/asm/ppc4xx.h
@@ -179,9 +179,7 @@ 
 
 #include <asm/ppc4xx-sdram.h>
 #include <asm/ppc4xx-ebc.h>
-#if !defined(CONFIG_XILINX_440)
 #include <asm/ppc4xx-uic.h>
-#endif
 
 /*
  * Macro for generating register field mnemonics
diff --git a/arch/powerpc/include/asm/xilinx_irq.h b/arch/powerpc/include/asm/xilinx_irq.h
deleted file mode 100644
index 333a0372b788..000000000000
--- a/arch/powerpc/include/asm/xilinx_irq.h
+++ /dev/null
@@ -1,25 +0,0 @@ 
-/*
- * (C) Copyright 2008
- * Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es
- * This work has been supported by: QTechnology  http://qtec.com/
- * Based on interrupts.c Wolfgang Denk-DENX Software Engineering-wd@denx.de
- * SPDX-License-Identifier:	GPL-2.0+
-*/
-#ifndef XILINX_IRQ_H
-#define XILINX_IRQ_H
-
-#define intc	XPAR_INTC_0_BASEADDR
-#define ISR	(intc + (0 * 4))	/* Interrupt Status Register */
-#define IPR	(intc + (1 * 4))	/* Interrupt Pending Register */
-#define IER	(intc + (2 * 4))	/* Interrupt Enable Register */
-#define IAR	(intc + (3 * 4))	/* Interrupt Acknowledge Register */
-#define SIE	(intc + (4 * 4))	/* Set Interrupt Enable bits */
-#define CIE	(intc + (5 * 4))	/* Clear Interrupt Enable bits */
-#define IVR	(intc + (6 * 4))	/* Interrupt Vector Register */
-#define MER	(intc + (7 * 4))	/* Master Enable Register */
-
-#define IRQ_MASK(irq)	(1 << (irq & 0x1f))
-
-#define IRQ_MAX		XPAR_INTC_MAX_NUM_INTR_INPUTS
-
-#endif
diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c
index 5ea29cc97467..c156a59b5757 100644
--- a/arch/powerpc/lib/board.c
+++ b/arch/powerpc/lib/board.c
@@ -549,8 +549,6 @@  void board_init_f(ulong bootflag)
     defined(CONFIG_440EPX) || defined(CONFIG_440GRX)
 	bd->bi_pci_busfreq = get_PCI_freq();
 	bd->bi_opbfreq = get_OPB_freq();
-#elif defined(CONFIG_XILINX_405)
-	bd->bi_pci_busfreq = get_PCI_freq();
 #endif
 #endif
 
diff --git a/board/avnet/fx12mm/Kconfig b/board/avnet/fx12mm/Kconfig
deleted file mode 100644
index 0b67ebde93b8..000000000000
--- a/board/avnet/fx12mm/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@ 
-if TARGET_FX12MM
-
-config SYS_BOARD
-	default "fx12mm"
-
-config SYS_VENDOR
-	default "avnet"
-
-config SYS_CONFIG_NAME
-	default "fx12mm"
-
-endif
diff --git a/board/avnet/fx12mm/MAINTAINERS b/board/avnet/fx12mm/MAINTAINERS
deleted file mode 100644
index c92e258df95c..000000000000
--- a/board/avnet/fx12mm/MAINTAINERS
+++ /dev/null
@@ -1,7 +0,0 @@ 
-FX12MM BOARD
-M:	Georg Schardt <schardt@team-ctech.de>
-S:	Maintained
-F:	board/avnet/fx12mm/
-F:	include/configs/fx12mm.h
-F:	configs/fx12mm_defconfig
-F:	configs/fx12mm_flash_defconfig
diff --git a/board/avnet/fx12mm/Makefile b/board/avnet/fx12mm/Makefile
deleted file mode 100644
index 618b42f8917c..000000000000
--- a/board/avnet/fx12mm/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@ 
-#
-# (C) Copyright 2008
-# Ricardo Ribalda,Universidad Autonoma de Madrid, ricardo.ribalda@uam.es
-# This work has been supported by: Qtechnology http://qtec.com/
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-obj-y	+= fx12mm.o
-
-include $(srctree)/board/xilinx/ppc405-generic/Makefile
diff --git a/board/avnet/fx12mm/fx12mm.c b/board/avnet/fx12mm/fx12mm.c
deleted file mode 100644
index 92e1cfb75f3c..000000000000
--- a/board/avnet/fx12mm/fx12mm.c
+++ /dev/null
@@ -1,34 +0,0 @@ 
-/*
- * (C) Copyright 2008
- *
- * Author: Xilinx Inc.
- *
- * Modified by:
- *  Georg Schardt <schardt@team-ctech.de>
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#include <config.h>
-#include <common.h>
-#include <asm/processor.h>
-
-int checkboard(void)
-{
-	char buf[64];
-	int i;
-	int l = getenv_f("serial#", buf, sizeof(buf));
-
-	if (l < 0) {
-		printf("Avnet Virtex4 FX12 with no serial #");
-	} else {
-		printf("Avnet Virtex4 FX12 Minimodul # ");
-		for (i = 0; i < l; ++i) {
-			if (buf[i] == ' ')
-				break;
-			putc(buf[i]);
-		}
-	}
-	putc('\n');
-	return 0;
-}
diff --git a/board/avnet/fx12mm/xparameters.h b/board/avnet/fx12mm/xparameters.h
deleted file mode 100644
index 94f682f8ecce..000000000000
--- a/board/avnet/fx12mm/xparameters.h
+++ /dev/null
@@ -1,35 +0,0 @@ 
-/*
- * (C) Copyright 2008
- *
- * Georg Schardt <schardt@team-ctech.de>
- *
- * SPDX-License-Identifier:	GPL-2.0+
- *
- * CAUTION: This file is based on the xparameters.h automatically
- * generated by libgen. Version: Xilinx EDK 10.1.02 Build EDK_K_SP2.5
- */
-
-#ifndef __XPARAMETER_H__
-#define __XPARAMETER_H__
-
-/* RS232 */
-#define XPAR_UARTNS550_0_CLOCK_FREQ_HZ 100000000
-#define XPAR_UARTNS550_0_BASEADDR 0x83E00000
-
-
-/* INT_C */
-#define XPAR_XPS_INTC_0_DEVICE_ID 0
-#define XPAR_XPS_INTC_0_BASEADDR 0x81800000
-#define XPAR_INTC_MAX_NUM_INTR_INPUTS 2
-
-/* CPU core clock */
-#define XPAR_CORE_CLOCK_FREQ_HZ 300000000
-#define XPAR_PLB_CLOCK_FREQ_HZ  100000000
-
-/* RAM */
-#define XPAR_DDR2_SDRAM_MEM_BASEADDR 0x00000000
-
-/* FLASH */
-#define XPAR_FLASH_MEM0_BASEADDR 0xFFC00000
-
-#endif
diff --git a/board/avnet/v5fx30teval/Kconfig b/board/avnet/v5fx30teval/Kconfig
deleted file mode 100644
index 079387b707a7..000000000000
--- a/board/avnet/v5fx30teval/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@ 
-if TARGET_V5FX30TEVAL
-
-config SYS_BOARD
-	default "v5fx30teval"
-
-config SYS_VENDOR
-	default "avnet"
-
-config SYS_CONFIG_NAME
-	default "v5fx30teval"
-
-endif
diff --git a/board/avnet/v5fx30teval/MAINTAINERS b/board/avnet/v5fx30teval/MAINTAINERS
deleted file mode 100644
index 91dde7a5c8f9..000000000000
--- a/board/avnet/v5fx30teval/MAINTAINERS
+++ /dev/null
@@ -1,7 +0,0 @@ 
-V5FX30TEVAL BOARD
-M:	Ricardo Ribalda <ricardo.ribalda@uam.es>
-S:	Maintained
-F:	board/avnet/v5fx30teval/
-F:	include/configs/v5fx30teval.h
-F:	configs/v5fx30teval_defconfig
-F:	configs/v5fx30teval_flash_defconfig
diff --git a/board/avnet/v5fx30teval/Makefile b/board/avnet/v5fx30teval/Makefile
deleted file mode 100644
index 8c41af02d4f2..000000000000
--- a/board/avnet/v5fx30teval/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@ 
-#
-# (C) Copyright 2008
-# Ricardo Ribalda,Universidad Autonoma de Madrid, ricardo.ribalda@uam.es
-# This work has been supported by: Qtechnology http://qtec.com/
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-obj-y	+= v5fx30teval.o
-
-include $(srctree)/board/xilinx/ppc440-generic/Makefile
diff --git a/board/avnet/v5fx30teval/v5fx30teval.c b/board/avnet/v5fx30teval/v5fx30teval.c
deleted file mode 100644
index 68b0eb959dea..000000000000
--- a/board/avnet/v5fx30teval/v5fx30teval.c
+++ /dev/null
@@ -1,17 +0,0 @@ 
-/*
- * (C) Copyright 2008
- * Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es
- * This work has been supported by: QTechnology  http://qtec.com/
- * SPDX-License-Identifier:	GPL-2.0+
-*/
-
-#include <config.h>
-#include <common.h>
-#include <asm/processor.h>
-
-
-int checkboard(void)
-{
-	puts("Avnet Virtex 5 FX30 Evaluation Board\n");
-	return 0;
-}
diff --git a/board/avnet/v5fx30teval/xparameters.h b/board/avnet/v5fx30teval/xparameters.h
deleted file mode 100644
index 95b8c285ad1a..000000000000
--- a/board/avnet/v5fx30teval/xparameters.h
+++ /dev/null
@@ -1,22 +0,0 @@ 
-/*
- * (C) Copyright 2008
- * Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es
- * This work has been supported by: QTechnology  http://qtec.com/
- * based on xparameters.h by Xilinx
- *
- * SPDX-License-Identifier:	GPL-2.0+
-*/
-
-#ifndef XPARAMETER_H
-#define XPARAMETER_H
-
-#define XPAR_DDR2_SDRAM_MEM_BASEADDR	0x00000000
-#define XPAR_INTC_0_BASEADDR		0x81800000
-#define XPAR_UARTLITE_0_BASEADDR	0x84000000
-#define XPAR_FLASH_MEM0_BASEADDR	0xFF000000
-#define XPAR_PLB_CLOCK_FREQ_HZ		100000000
-#define XPAR_CORE_CLOCK_FREQ_HZ		400000000
-#define XPAR_INTC_MAX_NUM_INTR_INPUTS	13
-#define XPAR_UARTLITE_0_BAUDRATE	9600
-
-#endif
diff --git a/board/xilinx/ml507/Kconfig b/board/xilinx/ml507/Kconfig
deleted file mode 100644
index d580a7beafef..000000000000
--- a/board/xilinx/ml507/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@ 
-if TARGET_ML507
-
-config SYS_BOARD
-	default "ml507"
-
-config SYS_VENDOR
-	default "xilinx"
-
-config SYS_CONFIG_NAME
-	default "ml507"
-
-endif
diff --git a/board/xilinx/ml507/MAINTAINERS b/board/xilinx/ml507/MAINTAINERS
deleted file mode 100644
index 8b40f4450085..000000000000
--- a/board/xilinx/ml507/MAINTAINERS
+++ /dev/null
@@ -1,7 +0,0 @@ 
-ML507 BOARD
-M:	Ricardo Ribalda <ricardo.ribalda@uam.es>
-S:	Maintained
-F:	board/xilinx/ml507/
-F:	include/configs/ml507.h
-F:	configs/ml507_defconfig
-F:	configs/ml507_flash_defconfig
diff --git a/board/xilinx/ml507/Makefile b/board/xilinx/ml507/Makefile
deleted file mode 100644
index 9a3809f3c065..000000000000
--- a/board/xilinx/ml507/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@ 
-#
-# (C) Copyright 2008
-# Ricardo Ribalda,Universidad Autonoma de Madrid, ricardo.ribalda@uam.es
-# This work has been supported by: Qtechnology http://qtec.com/
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-obj-y	+= ml507.o
-
-include $(srctree)/board/xilinx/ppc440-generic/Makefile
diff --git a/board/xilinx/ml507/ml507.c b/board/xilinx/ml507/ml507.c
deleted file mode 100644
index 83b764b7337b..000000000000
--- a/board/xilinx/ml507/ml507.c
+++ /dev/null
@@ -1,17 +0,0 @@ 
-/*
- * (C) Copyright 2008
- * Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es
- * This work has been supported by: QTechnology  http://qtec.com/
- * SPDX-License-Identifier:	GPL-2.0+
-*/
-
-#include <config.h>
-#include <common.h>
-#include <asm/processor.h>
-
-
-int checkboard(void)
-{
-	puts("Xilinx ML507 Board\n");
-	return 0;
-}
diff --git a/board/xilinx/ml507/xparameters.h b/board/xilinx/ml507/xparameters.h
deleted file mode 100644
index e30e592bbe12..000000000000
--- a/board/xilinx/ml507/xparameters.h
+++ /dev/null
@@ -1,23 +0,0 @@ 
-/*
- * (C) Copyright 2008
- * Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es
- * This work has been supported by: QTechnology  http://qtec.com/
- * based on xparameters-ml507.h by Xilinx
- *
- * SPDX-License-Identifier:	GPL-2.0+
-*/
-
-#ifndef XPARAMETER_H
-#define XPARAMETER_H
-
-#define XPAR_DDR2_SDRAM_MEM_BASEADDR	0x00000000
-#define XPAR_IIC_EEPROM_BASEADDR	0x81600000
-#define XPAR_INTC_0_BASEADDR		0x81800000
-#define XPAR_UARTLITE_0_BASEADDR	0x84000000
-#define XPAR_FLASH_MEM0_BASEADDR	0xFE000000
-#define XPAR_PLB_CLOCK_FREQ_HZ		100000000
-#define XPAR_CORE_CLOCK_FREQ_HZ		400000000
-#define XPAR_INTC_MAX_NUM_INTR_INPUTS	13
-#define XPAR_UARTLITE_0_BAUDRATE	9600
-
-#endif
diff --git a/board/xilinx/ppc405-generic/Kconfig b/board/xilinx/ppc405-generic/Kconfig
deleted file mode 100644
index dfbc07b4250a..000000000000
--- a/board/xilinx/ppc405-generic/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@ 
-if TARGET_XILINX_PPC405_GENERIC
-
-config SYS_BOARD
-	default "ppc405-generic"
-
-config SYS_VENDOR
-	default "xilinx"
-
-config SYS_CONFIG_NAME
-	default "xilinx-ppc405-generic"
-
-endif
diff --git a/board/xilinx/ppc405-generic/MAINTAINERS b/board/xilinx/ppc405-generic/MAINTAINERS
deleted file mode 100644
index 2b0c98dc8b73..000000000000
--- a/board/xilinx/ppc405-generic/MAINTAINERS
+++ /dev/null
@@ -1,7 +0,0 @@ 
-PPC405-GENERIC BOARD
-M:	Ricardo Ribalda <ricardo.ribalda@uam.es>
-S:	Maintained
-F:	board/xilinx/ppc405-generic/
-F:	include/configs/xilinx-ppc405-generic.h
-F:	configs/xilinx-ppc405-generic_defconfig
-F:	configs/xilinx-ppc405-generic_flash_defconfig
diff --git a/board/xilinx/ppc405-generic/Makefile b/board/xilinx/ppc405-generic/Makefile
deleted file mode 100644
index c9da87065747..000000000000
--- a/board/xilinx/ppc405-generic/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@ 
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# (C) Copyright 2008
-# Ricardo Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es
-# Work supported by Qtechnology http://www.qtec.com
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-obj-y	+= ../../xilinx/ppc405-generic/xilinx_ppc405_generic.o
diff --git a/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c b/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c
deleted file mode 100644
index e3dd468f1eb3..000000000000
--- a/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c
+++ /dev/null
@@ -1,48 +0,0 @@ 
-/*
- * (C) Copyright 2008
- * Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es
- * This work has been supported by: QTechnology  http://qtec.com/
- *
- * SPDX-License-Identifier:	GPL-2.0+
-*/
-
-#include <config.h>
-#include <common.h>
-#include <asm/processor.h>
-
-ulong __get_PCI_freq(void)
-{
-	return 0;
-}
-
-ulong get_PCI_freq(void) __attribute__((weak, alias("__get_PCI_freq")));
-
-int __board_pre_init(void)
-{
-	return 0;
-}
-int board_pre_init(void) __attribute__((weak, alias("__board_pre_init")));
-
-int __checkboard(void)
-{
-	puts("Xilinx PPC405 Generic Board\n");
-	return 0;
-}
-int checkboard(void) __attribute__((weak, alias("__checkboard")));
-
-phys_size_t __initdram(int board_type)
-{
-	return get_ram_size(XPAR_DDR2_SDRAM_MEM_BASEADDR,
-			    CONFIG_SYS_SDRAM_SIZE_MB * 1024 * 1024);
-}
-phys_size_t initdram(int) __attribute__((weak, alias("__initdram")));
-
-void __get_sys_info(sys_info_t *sysInfo)
-{
-	sysInfo->freqProcessor = XPAR_CORE_CLOCK_FREQ_HZ;
-	sysInfo->freqPLB = XPAR_PLB_CLOCK_FREQ_HZ;
-	sysInfo->freqPCI = 0;
-
-	return;
-}
-void get_sys_info(sys_info_t *) __attribute__((weak, alias("__get_sys_info")));
diff --git a/board/xilinx/ppc405-generic/xparameters.h b/board/xilinx/ppc405-generic/xparameters.h
deleted file mode 100644
index f0ff78fca565..000000000000
--- a/board/xilinx/ppc405-generic/xparameters.h
+++ /dev/null
@@ -1,25 +0,0 @@ 
-/*
- * (C) Copyright 2008
- * Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es
- * This work has been supported by: QTechnology  http://qtec.com/
- * based on xparameters-ml507.h by Xilinx
- *
- * SPDX-License-Identifier:	GPL-2.0+
-*/
-
-#ifndef XPARAMETER_H
-#define XPARAMETER_H
-
-#define XPAR_DDR2_SDRAM_MEM_BASEADDR	0x00000000
-#define XPAR_IIC_EEPROM_BASEADDR	0x81600000
-#define XPAR_INTC_0_BASEADDR		0x81800000
-#define XPAR_SPI_0_BASEADDR             0x83400000
-#define XPAR_UARTLITE_0_BASEADDR	0x84000000
-#define XPAR_FLASH_MEM0_BASEADDR	0xFE000000
-#define XPAR_PLB_CLOCK_FREQ_HZ		100000000
-#define XPAR_CORE_CLOCK_FREQ_HZ		400000000
-#define XPAR_INTC_MAX_NUM_INTR_INPUTS	13
-#define XPAR_UARTLITE_0_BAUDRATE	9600
-#define XPAR_SPI_0_NUM_TRANSFER_BITS	8
-
-#endif
diff --git a/board/xilinx/ppc440-generic/Kconfig b/board/xilinx/ppc440-generic/Kconfig
deleted file mode 100644
index d40783a28f84..000000000000
--- a/board/xilinx/ppc440-generic/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@ 
-if TARGET_XILINX_PPC440_GENERIC
-
-config SYS_BOARD
-	default "ppc440-generic"
-
-config SYS_VENDOR
-	default "xilinx"
-
-config SYS_CONFIG_NAME
-	default "xilinx-ppc440-generic"
-
-endif
diff --git a/board/xilinx/ppc440-generic/MAINTAINERS b/board/xilinx/ppc440-generic/MAINTAINERS
deleted file mode 100644
index 2d0b11af914b..000000000000
--- a/board/xilinx/ppc440-generic/MAINTAINERS
+++ /dev/null
@@ -1,7 +0,0 @@ 
-PPC440-GENERIC BOARD
-M:	Ricardo Ribalda <ricardo.ribalda@uam.es>
-S:	Maintained
-F:	board/xilinx/ppc440-generic/
-F:	include/configs/xilinx-ppc440-generic.h
-F:	configs/xilinx-ppc440-generic_defconfig
-F:	configs/xilinx-ppc440-generic_flash_defconfig
diff --git a/board/xilinx/ppc440-generic/Makefile b/board/xilinx/ppc440-generic/Makefile
deleted file mode 100644
index 0acd95d6e4e2..000000000000
--- a/board/xilinx/ppc440-generic/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@ 
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# (C) Copyright 2008
-# Ricardo Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es
-# Work supported by Qtechnology http://www.qtec.com
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-obj-y	+= ../../xilinx/ppc440-generic/xilinx_ppc440_generic.o
-extra-y 	+= ../../xilinx/ppc440-generic/init.o
diff --git a/board/xilinx/ppc440-generic/init.S b/board/xilinx/ppc440-generic/init.S
deleted file mode 100644
index 4598a376843a..000000000000
--- a/board/xilinx/ppc440-generic/init.S
+++ /dev/null
@@ -1,34 +0,0 @@ 
-/*
- *  (C) Copyright 2008
- *  Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es
- *  This work has been supported by: QTechnology  http://qtec.com/
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#include <ppc_asm.tmpl>
-#include <config.h>
-#include <asm/mmu.h>
-
-.section .bootpg,"ax"
-.globl tlbtab
-
-tlbtab:
-tlbtab_start
-tlbentry(0x00000000, SZ_256M, 0x00000000, 0, AC_R | AC_W | AC_X | SA_G | SA_I)
-tlbentry(0x10000000, SZ_256M, 0x10000000, 0, AC_R | AC_W | AC_X | SA_G | SA_I)
-tlbentry(0x20000000, SZ_256M, 0x20000000, 0, AC_R | AC_W | AC_X | SA_G | SA_I)
-tlbentry(0x30000000, SZ_256M, 0x30000000, 0, AC_R | AC_W | AC_X | SA_G | SA_I)
-tlbentry(0x40000000, SZ_256M, 0x40000000, 0, AC_R | AC_W | AC_X | SA_G | SA_I)
-tlbentry(0x50000000, SZ_256M, 0x50000000, 0, AC_R | AC_W | AC_X | SA_G | SA_I)
-tlbentry(0x60000000, SZ_256M, 0x60000000, 0, AC_R | AC_W | AC_X | SA_G | SA_I)
-tlbentry(0x70000000, SZ_256M, 0x70000000, 0, AC_R | AC_W | AC_X | SA_G | SA_I)
-tlbentry(0x80000000, SZ_256M, 0x80000000, 0, AC_R | AC_W | AC_X | SA_G | SA_I)
-tlbentry(0x90000000, SZ_256M, 0x90000000, 0, AC_R | AC_W | AC_X | SA_G | SA_I)
-tlbentry(0xa0000000, SZ_256M, 0xa0000000, 0, AC_R | AC_W | AC_X | SA_G | SA_I)
-tlbentry(0xb0000000, SZ_256M, 0xb0000000, 0, AC_R | AC_W | AC_X | SA_G | SA_I)
-tlbentry(0xc0000000, SZ_256M, 0xc0000000, 0, AC_R | AC_W | AC_X | SA_G | SA_I)
-tlbentry(0xd0000000, SZ_256M, 0xd0000000, 0, AC_R | AC_W | AC_X | SA_G | SA_I)
-tlbentry(0xe0000000, SZ_256M, 0xe0000000, 0, AC_R | AC_W | AC_X | SA_G | SA_I)
-tlbentry(0xf0000000, SZ_256M, 0xf0000000, 0, AC_R | AC_W | AC_X | SA_G | SA_I)
-tlbtab_end
diff --git a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c
deleted file mode 100644
index 74df2f4ff785..000000000000
--- a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c
+++ /dev/null
@@ -1,41 +0,0 @@ 
-/*
- * (C) Copyright 2008
- * Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es
- * This work has been supported by: QTechnology  http://qtec.com/
- *
- * SPDX-License-Identifier:	GPL-2.0+
-*/
-
-#include <config.h>
-#include <common.h>
-#include <asm/processor.h>
-
-int __board_pre_init(void)
-{
-	return 0;
-}
-int board_pre_init(void) __attribute__((weak, alias("__board_pre_init")));
-
-int __checkboard(void)
-{
-	puts("Xilinx PPC440 Generic Board\n");
-	return 0;
-}
-int checkboard(void) __attribute__((weak, alias("__checkboard")));
-
-phys_size_t __initdram(int board_type)
-{
-	return get_ram_size(XPAR_DDR2_SDRAM_MEM_BASEADDR,
-			    CONFIG_SYS_SDRAM_SIZE_MB * 1024 * 1024);
-}
-phys_size_t initdram(int) __attribute__((weak, alias("__initdram")));
-
-void __get_sys_info(sys_info_t *sysInfo)
-{
-	sysInfo->freqProcessor = XPAR_CORE_CLOCK_FREQ_HZ;
-	sysInfo->freqPLB = XPAR_PLB_CLOCK_FREQ_HZ;
-	sysInfo->freqPCI = 0;
-
-	return;
-}
-void get_sys_info(sys_info_t *) __attribute__((weak, alias("__get_sys_info")));
diff --git a/board/xilinx/ppc440-generic/xparameters.h b/board/xilinx/ppc440-generic/xparameters.h
deleted file mode 100644
index e30e592bbe12..000000000000
--- a/board/xilinx/ppc440-generic/xparameters.h
+++ /dev/null
@@ -1,23 +0,0 @@ 
-/*
- * (C) Copyright 2008
- * Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es
- * This work has been supported by: QTechnology  http://qtec.com/
- * based on xparameters-ml507.h by Xilinx
- *
- * SPDX-License-Identifier:	GPL-2.0+
-*/
-
-#ifndef XPARAMETER_H
-#define XPARAMETER_H
-
-#define XPAR_DDR2_SDRAM_MEM_BASEADDR	0x00000000
-#define XPAR_IIC_EEPROM_BASEADDR	0x81600000
-#define XPAR_INTC_0_BASEADDR		0x81800000
-#define XPAR_UARTLITE_0_BASEADDR	0x84000000
-#define XPAR_FLASH_MEM0_BASEADDR	0xFE000000
-#define XPAR_PLB_CLOCK_FREQ_HZ		100000000
-#define XPAR_CORE_CLOCK_FREQ_HZ		400000000
-#define XPAR_INTC_MAX_NUM_INTR_INPUTS	13
-#define XPAR_UARTLITE_0_BAUDRATE	9600
-
-#endif
diff --git a/common/board_f.c b/common/board_f.c
index 322e0700d738..29bcac4749d8 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -627,8 +627,6 @@  static int setup_board_extra(void)
 		defined(CONFIG_440EPX) || defined(CONFIG_440GRX)
 	bd->bi_pci_busfreq = get_PCI_freq();
 	bd->bi_opbfreq = get_OPB_freq();
-#elif defined(CONFIG_XILINX_405)
-	bd->bi_pci_busfreq = get_PCI_freq();
 #endif
 
 	return 0;
diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c
index f16d5c719f8e..2e94cdc0c84d 100644
--- a/common/cmd_bdinfo.c
+++ b/common/cmd_bdinfo.c
@@ -98,17 +98,16 @@  int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	defined(CONFIG_405GP) || \
 	defined(CONFIG_440EP) || defined(CONFIG_440EPX) || \
 	defined(CONFIG_440GR) || defined(CONFIG_440GRX) || \
-	defined(CONFIG_440SP) || defined(CONFIG_440SPE) || \
-	defined(CONFIG_XILINX_405)
+	defined(CONFIG_440SP) || defined(CONFIG_440SPE)
 	print_mhz("procfreq",		bd->bi_procfreq);
 	print_mhz("plb_busfreq",	bd->bi_plb_busfreq);
 #if	defined(CONFIG_405EP) || defined(CONFIG_405GP) || \
 	defined(CONFIG_440EP) || defined(CONFIG_440EPX) || \
 	defined(CONFIG_440GR) || defined(CONFIG_440GRX) || \
-	defined(CONFIG_440SPE) || defined(CONFIG_XILINX_405)
+	defined(CONFIG_440SPE)
 	print_mhz("pci_busfreq",	bd->bi_pci_busfreq);
 #endif
-#else	/* ! CONFIG_405GP, CONFIG_405EP, CONFIG_XILINX_405, CONFIG_440EP CONFIG_440GR */
+#else	/* ! CONFIG_405GP, CONFIG_405EP, CONFIG_440EP CONFIG_440GR */
 #if defined(CONFIG_CPM2)
 	print_mhz("vco",		bd->bi_vco);
 	print_mhz("sccfreq",		bd->bi_sccfreq);
@@ -119,7 +118,7 @@  int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	print_mhz("cpmfreq",		bd->bi_cpmfreq);
 #endif
 	print_mhz("busfreq",		bd->bi_busfreq);
-#endif /* CONFIG_405GP, CONFIG_405EP, CONFIG_XILINX_405, CONFIG_440EP CONFIG_440GR */
+#endif /* CONFIG_405GP, CONFIG_405EP, CONFIG_440EP CONFIG_440GR */
 
 #ifdef CONFIG_ENABLE_36BIT_PHYS
 #ifdef CONFIG_PHYS_64BIT
diff --git a/configs/fx12mm_defconfig b/configs/fx12mm_defconfig
deleted file mode 100644
index 9900a5486928..000000000000
--- a/configs/fx12mm_defconfig
+++ /dev/null
@@ -1,4 +0,0 @@ 
-CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,INIT_TLB=board/xilinx/ppc405-generic/init.o"
-CONFIG_PPC=y
-CONFIG_4xx=y
-CONFIG_TARGET_FX12MM=y
diff --git a/configs/fx12mm_flash_defconfig b/configs/fx12mm_flash_defconfig
deleted file mode 100644
index 5a0587ffec35..000000000000
--- a/configs/fx12mm_flash_defconfig
+++ /dev/null
@@ -1,4 +0,0 @@ 
-CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC,INIT_TLB=board/xilinx/ppc405-generic/init.o"
-CONFIG_PPC=y
-CONFIG_4xx=y
-CONFIG_TARGET_FX12MM=y
diff --git a/configs/ml507_defconfig b/configs/ml507_defconfig
deleted file mode 100644
index 009972a1e19c..000000000000
--- a/configs/ml507_defconfig
+++ /dev/null
@@ -1,4 +0,0 @@ 
-CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,BOOT_FROM_XMD=1,INIT_TLB=board/xilinx/ppc440-generic/init.o"
-CONFIG_PPC=y
-CONFIG_4xx=y
-CONFIG_TARGET_ML507=y
diff --git a/configs/ml507_flash_defconfig b/configs/ml507_flash_defconfig
deleted file mode 100644
index a9658b608d23..000000000000
--- a/configs/ml507_flash_defconfig
+++ /dev/null
@@ -1,4 +0,0 @@ 
-CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC,INIT_TLB=board/xilinx/ppc440-generic/init.o"
-CONFIG_PPC=y
-CONFIG_4xx=y
-CONFIG_TARGET_ML507=y
diff --git a/configs/v5fx30teval_defconfig b/configs/v5fx30teval_defconfig
deleted file mode 100644
index bb58153c1f7d..000000000000
--- a/configs/v5fx30teval_defconfig
+++ /dev/null
@@ -1,4 +0,0 @@ 
-CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,BOOT_FROM_XMD=1,INIT_TLB=board/xilinx/ppc440-generic/init.o"
-CONFIG_PPC=y
-CONFIG_4xx=y
-CONFIG_TARGET_V5FX30TEVAL=y
diff --git a/configs/v5fx30teval_flash_defconfig b/configs/v5fx30teval_flash_defconfig
deleted file mode 100644
index 1c6ec89cd618..000000000000
--- a/configs/v5fx30teval_flash_defconfig
+++ /dev/null
@@ -1,4 +0,0 @@ 
-CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC,INIT_TLB=board/xilinx/ppc440-generic/init.o"
-CONFIG_PPC=y
-CONFIG_4xx=y
-CONFIG_TARGET_V5FX30TEVAL=y
diff --git a/configs/xilinx-ppc405-generic_defconfig b/configs/xilinx-ppc405-generic_defconfig
deleted file mode 100644
index 691412cb6e51..000000000000
--- a/configs/xilinx-ppc405-generic_defconfig
+++ /dev/null
@@ -1,4 +0,0 @@ 
-CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000"
-CONFIG_PPC=y
-CONFIG_4xx=y
-CONFIG_TARGET_XILINX_PPC405_GENERIC=y
diff --git a/configs/xilinx-ppc405-generic_flash_defconfig b/configs/xilinx-ppc405-generic_flash_defconfig
deleted file mode 100644
index 317b63d4a795..000000000000
--- a/configs/xilinx-ppc405-generic_flash_defconfig
+++ /dev/null
@@ -1,4 +0,0 @@ 
-CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC"
-CONFIG_PPC=y
-CONFIG_4xx=y
-CONFIG_TARGET_XILINX_PPC405_GENERIC=y
diff --git a/configs/xilinx-ppc440-generic_defconfig b/configs/xilinx-ppc440-generic_defconfig
deleted file mode 100644
index 31ce75b8728d..000000000000
--- a/configs/xilinx-ppc440-generic_defconfig
+++ /dev/null
@@ -1,4 +0,0 @@ 
-CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,BOOT_FROM_XMD=1"
-CONFIG_PPC=y
-CONFIG_4xx=y
-CONFIG_TARGET_XILINX_PPC440_GENERIC=y
diff --git a/configs/xilinx-ppc440-generic_flash_defconfig b/configs/xilinx-ppc440-generic_flash_defconfig
deleted file mode 100644
index 635926ffbace..000000000000
--- a/configs/xilinx-ppc440-generic_flash_defconfig
+++ /dev/null
@@ -1,4 +0,0 @@ 
-CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC"
-CONFIG_PPC=y
-CONFIG_4xx=y
-CONFIG_TARGET_XILINX_PPC440_GENERIC=y
diff --git a/drivers/net/xilinx_ll_temac.c b/drivers/net/xilinx_ll_temac.c
index 7cc86571e495..3c244816b835 100644
--- a/drivers/net/xilinx_ll_temac.c
+++ b/drivers/net/xilinx_ll_temac.c
@@ -316,18 +316,9 @@  int xilinx_ll_temac_initialize(bd_t *bis, struct ll_temac_info *devinf)
 
 	ll_temac->ctrladdr = devinf->ctrl_addr;
 	if (devinf->flags & XILINX_LL_TEMAC_M_SDMA_PLB) {
-#if defined(CONFIG_XILINX_440) || defined(CONFIG_XILINX_405)
-		if (devinf->flags & XILINX_LL_TEMAC_M_SDMA_DCR) {
-			ll_temac_collect_xldcr_sdma_reg_addr(dev);
-			ll_temac->in32 = ll_temac_xldcr_in32;
-			ll_temac->out32 = ll_temac_xldcr_out32;
-		} else
-#endif
-		{
-			ll_temac_collect_xlplb_sdma_reg_addr(dev);
-			ll_temac->in32 = ll_temac_xlplb_in32;
-			ll_temac->out32 = ll_temac_xlplb_out32;
-		}
+		ll_temac_collect_xlplb_sdma_reg_addr(dev);
+		ll_temac->in32 = ll_temac_xlplb_in32;
+		ll_temac->out32 = ll_temac_xlplb_out32;
 		ll_temac->ctrlinit = ll_temac_init_sdma;
 		ll_temac->ctrlhalt = ll_temac_halt_sdma;
 		ll_temac->ctrlreset = ll_temac_reset_sdma;
diff --git a/drivers/net/xilinx_ll_temac_sdma.c b/drivers/net/xilinx_ll_temac_sdma.c
index 07c5f6bf10c5..8176f7b4bc34 100644
--- a/drivers/net/xilinx_ll_temac_sdma.c
+++ b/drivers/net/xilinx_ll_temac_sdma.c
@@ -55,65 +55,6 @@  struct rtx_cdmac_bd {
  */
 static struct rtx_cdmac_bd cdmac_bd __aligned(32);
 
-#if defined(CONFIG_XILINX_440) || defined(CONFIG_XILINX_405)
-
-/*
- * Indirect DCR access operations mi{ft}dcr_xilinx() espacialy
- * for Xilinx PowerPC implementations on FPGA.
- *
- * FIXME: This part should go up to arch/powerpc -- but where?
- */
-#include <asm/processor.h>
-#define XILINX_INDIRECT_DCR_ADDRESS_REG	0
-#define XILINX_INDIRECT_DCR_ACCESS_REG	1
-inline unsigned mifdcr_xilinx(const unsigned dcrn)
-{
-	mtdcr(XILINX_INDIRECT_DCR_ADDRESS_REG, dcrn);
-	return mfdcr(XILINX_INDIRECT_DCR_ACCESS_REG);
-}
-inline void mitdcr_xilinx(const unsigned dcrn, int val)
-{
-	mtdcr(XILINX_INDIRECT_DCR_ADDRESS_REG, dcrn);
-	mtdcr(XILINX_INDIRECT_DCR_ACCESS_REG, val);
-}
-
-/* Xilinx Device Control Register (DCR) in/out accessors */
-inline unsigned ll_temac_xldcr_in32(phys_addr_t addr)
-{
-	return mifdcr_xilinx((const unsigned)addr);
-}
-inline void ll_temac_xldcr_out32(phys_addr_t addr, unsigned value)
-{
-	mitdcr_xilinx((const unsigned)addr, value);
-}
-
-void ll_temac_collect_xldcr_sdma_reg_addr(struct eth_device *dev)
-{
-	struct ll_temac *ll_temac = dev->priv;
-	phys_addr_t dmac_ctrl = ll_temac->ctrladdr;
-	phys_addr_t *ra = ll_temac->sdma_reg_addr;
-
-	ra[TX_NXTDESC_PTR]   = dmac_ctrl + TX_NXTDESC_PTR;
-	ra[TX_CURBUF_ADDR]   = dmac_ctrl + TX_CURBUF_ADDR;
-	ra[TX_CURBUF_LENGTH] = dmac_ctrl + TX_CURBUF_LENGTH;
-	ra[TX_CURDESC_PTR]   = dmac_ctrl + TX_CURDESC_PTR;
-	ra[TX_TAILDESC_PTR]  = dmac_ctrl + TX_TAILDESC_PTR;
-	ra[TX_CHNL_CTRL]     = dmac_ctrl + TX_CHNL_CTRL;
-	ra[TX_IRQ_REG]       = dmac_ctrl + TX_IRQ_REG;
-	ra[TX_CHNL_STS]      = dmac_ctrl + TX_CHNL_STS;
-	ra[RX_NXTDESC_PTR]   = dmac_ctrl + RX_NXTDESC_PTR;
-	ra[RX_CURBUF_ADDR]   = dmac_ctrl + RX_CURBUF_ADDR;
-	ra[RX_CURBUF_LENGTH] = dmac_ctrl + RX_CURBUF_LENGTH;
-	ra[RX_CURDESC_PTR]   = dmac_ctrl + RX_CURDESC_PTR;
-	ra[RX_TAILDESC_PTR]  = dmac_ctrl + RX_TAILDESC_PTR;
-	ra[RX_CHNL_CTRL]     = dmac_ctrl + RX_CHNL_CTRL;
-	ra[RX_IRQ_REG]       = dmac_ctrl + RX_IRQ_REG;
-	ra[RX_CHNL_STS]      = dmac_ctrl + RX_CHNL_STS;
-	ra[DMA_CONTROL_REG]  = dmac_ctrl + DMA_CONTROL_REG;
-}
-
-#endif /* CONFIG_XILINX_440 || ONFIG_XILINX_405 */
-
 /* Xilinx Processor Local Bus (PLB) in/out accessors */
 inline unsigned ll_temac_xlplb_in32(phys_addr_t addr)
 {
diff --git a/drivers/net/xilinx_ll_temac_sdma.h b/drivers/net/xilinx_ll_temac_sdma.h
index 41659c0eeba6..67a8b0f2ef04 100644
--- a/drivers/net/xilinx_ll_temac_sdma.h
+++ b/drivers/net/xilinx_ll_temac_sdma.h
@@ -241,17 +241,6 @@  enum dmac_ctrl {
 #define DMA_CONTROL_TPE		(1 << 2)
 #define DMA_CONTROL_RESET	(1 << 0)
 
-#if defined(CONFIG_XILINX_440) || defined(CONFIG_XILINX_405)
-
-/* Xilinx Device Control Register (DCR) in/out accessors */
-unsigned ll_temac_xldcr_in32(phys_addr_t addr);
-void ll_temac_xldcr_out32(phys_addr_t addr, unsigned value);
-
-/* collect all register addresses for Xilinx DCR in/out accessors */
-void ll_temac_collect_xldcr_sdma_reg_addr(struct eth_device *dev);
-
-#endif /* CONFIG_XILINX_440 || CONFIG_XILINX_405 */
-
 /* Xilinx Processor Local Bus (PLB) in/out accessors */
 unsigned ll_temac_xlplb_in32(phys_addr_t base);
 void ll_temac_xlplb_out32(phys_addr_t base, unsigned value);
diff --git a/include/configs/fx12mm.h b/include/configs/fx12mm.h
deleted file mode 100644
index d0083fd6f65c..000000000000
--- a/include/configs/fx12mm.h
+++ /dev/null
@@ -1,52 +0,0 @@ 
-/*
- * (C) Copyright 2008
- *
- * Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es
- * This work has been supported by: QTechnology  http://qtec.com
- *
- * Georg Schardt <schardt@team-ctech.de>
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-/*
- * Configuration file for the Virtex4FX12 Minimodul by Avnet/Memec,
- * see http://www.em.avnet.com
- */
-
-#ifndef __CONFIG_FX12_H
-#define __CONFIG_FX12_H
-
-#include "../board/avnet/fx12mm/xparameters.h"
-
-/* cmd config */
-#define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_MTDPARTS
-#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */
-#define CONFIG_FLASH_CFI_MTD
-#undef CONFIG_CMD_NET
-
-/* sdram */
-#define CONFIG_SYS_SDRAM_SIZE_MB       64
-
-/* environment */
-#define CONFIG_ENV_IS_IN_FLASH  1
-#define CONFIG_ENV_SIZE         0x10000
-#define CONFIG_ENV_SECT_SIZE    0x10000
-#define CONFIG_SYS_ENV_OFFSET   0xA0000
-#define CONFIG_ENV_ADDR         (CONFIG_SYS_FLASH_BASE+CONFIG_SYS_ENV_OFFSET)
-#define CONFIG_ENV_OVERWRITE 	1
-
-/*Misc*/
-#define CONFIG_SYS_PROMPT	"FX12MM:/# " /* Monitor Command Prompt */
-#define CONFIG_PREBOOT      	"echo U-Boot is up and running;"
-
-/*Flash*/
-#define CONFIG_SYS_FLASH_SIZE          (4*1024*1024)
-#define CONFIG_SYS_MAX_FLASH_SECT      71
-#define MTDIDS_DEFAULT		"nor0=fx12mm-flash"
-#define MTDPARTS_DEFAULT	"mtdparts=fx12mm-flash:-(user)"
-
-#include "configs/xilinx-ppc405.h"
-
-#endif	/* __CONFIG_H */
diff --git a/include/configs/ml507.h b/include/configs/ml507.h
deleted file mode 100644
index b9ecb091b61d..000000000000
--- a/include/configs/ml507.h
+++ /dev/null
@@ -1,39 +0,0 @@ 
-/*
- * (C) Copyright 2008
- *  Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es
- *  This work has been supported by: QTechnology  http://qtec.com/
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-/*CPU*/
-#define CONFIG_440		1
-#define CONFIG_XILINX_ML507	1
-#include "../board/xilinx/ml507/xparameters.h"
-
-/*Mem Map*/
-#define CONFIG_SYS_SDRAM_SIZE_MB	256
-
-/*Env*/
-#define	CONFIG_ENV_IS_IN_FLASH	1
-#define	CONFIG_ENV_SIZE		0x20000
-#define	CONFIG_ENV_SECT_SIZE	0x20000
-#define CONFIG_ENV_OFFSET	0x340000
-#define CONFIG_ENV_ADDR		(XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET)
-
-/*Misc*/
-#define CONFIG_SYS_PROMPT	"ml507:/# "	/* Monitor Command Prompt    */
-#define CONFIG_PREBOOT		"echo U-Boot is up and runnining;"
-
-/*Flash*/
-#define	CONFIG_SYS_FLASH_SIZE	(32*1024*1024)
-#define	CONFIG_SYS_MAX_FLASH_SECT	259
-#define MTDIDS_DEFAULT		"nor0=ml507-flash"
-#define MTDPARTS_DEFAULT	"mtdparts=ml507-flash:-(user)"
-
-/*Generic Configs*/
-#include <configs/xilinx-ppc440.h>
-
-#endif						/* __CONFIG_H */
diff --git a/include/configs/v5fx30teval.h b/include/configs/v5fx30teval.h
deleted file mode 100644
index f30a0904a3fa..000000000000
--- a/include/configs/v5fx30teval.h
+++ /dev/null
@@ -1,39 +0,0 @@ 
-/*
- * (C) Copyright 2008
- *  Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es
- *  This work has been supported by: QTechnology  http://qtec.com/
- * SPDX-License-Identifier:	GPL-2.0+
-*/
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-/*CPU*/
-#define CONFIG_440		1
-#define CONFIG_XILINX_ML507	1
-#include "../board/avnet/v5fx30teval/xparameters.h"
-
-/*Mem Map*/
-#define CONFIG_SYS_SDRAM_SIZE_MB	64
-
-/*Env*/
-#define	CONFIG_ENV_IS_IN_FLASH	1
-#define	CONFIG_ENV_SIZE		0x20000
-#define	CONFIG_ENV_SECT_SIZE	0x20000
-#define CONFIG_ENV_OFFSET		0x1A0000
-#define CONFIG_ENV_ADDR		(XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET)
-
-/*Misc*/
-#define CONFIG_SYS_PROMPT		"v5fx30t:/# "	/* Monitor Command Prompt    */
-#define CONFIG_PREBOOT		"echo U-Boot is up and runnining;"
-
-/*Flash*/
-#define	CONFIG_SYS_FLASH_SIZE		(16*1024*1024)
-#define	CONFIG_SYS_MAX_FLASH_SECT	131
-#define MTDIDS_DEFAULT		"nor0=v5fx30t-flash"
-#define MTDPARTS_DEFAULT	"mtdparts=v5fx30t-flash:-(user)"
-
-/*Generic Configs*/
-#include <configs/xilinx-ppc440.h>
-
-#endif						/* __CONFIG_H */
diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h
deleted file mode 100644
index 0ccd73a8681e..000000000000
--- a/include/configs/xilinx-ppc.h
+++ /dev/null
@@ -1,126 +0,0 @@ 
-/*
- * (C) Copyright 2008
- *  Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es
- *  This work has been supported by: QTechnology  http://qtec.com/
- *
- *  (C) Copyright 2008
- *  Georg Schardt <schardt@team-ctech.de>
- *
- * SPDX-License-Identifier:	GPL-2.0+
-*/
-
-#ifndef __CONFIG_XLX_H
-#define __CONFIG_XLX_H
-/*
-#define DEBUG
-#define ET_DEBUG
-*/
-
-/*Mem Map*/
-#define CONFIG_SYS_SDRAM_BASE		0x0
-#define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_MONITOR_LEN		(192 * 1024)
-#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 128 * 1024)
-
-/*Cmd*/
-#include <config_cmd_default.h>
-#define CONFIG_CMD_ASKENV
-#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_DIAG
-#define CONFIG_CMD_ELF
-#define CONFIG_CMD_IRQ
-#define CONFIG_CMD_REGINFO
-#undef CONFIG_CMD_JFFS2
-#undef CONFIG_CMD_MTDPARTS
-#undef CONFIG_CMD_SPI
-#undef CONFIG_CMD_I2C
-#undef CONFIG_CMD_DTT
-#undef CONFIG_CMD_NET
-#undef CONFIG_CMD_PING
-#undef CONFIG_CMD_DHCP
-#undef CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_NFS
-
-/*Misc*/
-#define CONFIG_BOOTDELAY		5/* autoboot after 5 seconds     */
-#define CONFIG_SYS_LONGHELP		/* undef to save memory         */
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE		1024/* Console I/O Buffer Size      */
-#else
-#define CONFIG_SYS_CBSIZE		256/* Console I/O Buffer Size      */
-#endif
-#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE +\
-					sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_MAXARGS		16
-					/* max number of command args   */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-					/* Boot Argument Buffer Size */
-#define CONFIG_SYS_MEMTEST_START	0x00400000
-					/* memtest works on           */
-#define CONFIG_SYS_MEMTEST_END		0x00C00000
-					/* 4 ... 12 MB in DRAM        */
-#define CONFIG_SYS_LOAD_ADDR		0x00400000
-					/* default load address       */
-#define CONFIG_SYS_EXTBDINFO		1
-					/* Extended board_into (bd_t) */
-					/* decrementer freq: 1 ms ticks */
-#define CONFIG_CMDLINE_EDITING		/* add command line history     */
-#define CONFIG_AUTO_COMPLETE		/* add autocompletion support   */
-#define CONFIG_LOOPW			/* enable loopw command         */
-#define CONFIG_MX_CYCLIC		/* enable mdc/mwc commands      */
-#define CONFIG_ZERO_BOOTDELAY_CHECK	/* check for keypress on bootdelay==0 */
-#define CONFIG_VERSION_VARIABLE		/* include version env variable */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET	/* don't print console @ startup */
-#define CONFIG_SYS_HUSH_PARSER		/* Use the HUSH parser          */
-#define CONFIG_LOADS_ECHO		/* echo on for serial download  */
-#define CONFIG_SYS_LOADS_BAUD_CHANGE	/* allow baudrate change        */
-#define CONFIG_SYS_BOOTMAPSZ		(8 << 20)
-				/* Initial Memory map for Linux */
-
-/*Stack*/
-#define CONFIG_SYS_INIT_RAM_ADDR	0x800000/* Initial RAM address    */
-#define CONFIG_SYS_INIT_RAM_SIZE		0x2000	/* Size of used area in RAM  */
-#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
-/*Speed*/
-#define CONFIG_SYS_CLK_FREQ	XPAR_CORE_CLOCK_FREQ_HZ
-
-/*Flash*/
-#ifdef XPAR_FLASH_MEM0_BASEADDR
-#define	CONFIG_SYS_FLASH_BASE		XPAR_FLASH_MEM0_BASEADDR
-#define	CONFIG_SYS_FLASH_CFI		1
-#define	CONFIG_FLASH_CFI_DRIVER	1
-#define	CONFIG_SYS_FLASH_EMPTY_INFO	1
-#define	CONFIG_SYS_MAX_FLASH_BANKS	1
-#define	CONFIG_SYS_FLASH_PROTECTION
-#define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_MTDPARTS
-#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */
-#define CONFIG_FLASH_CFI_MTD
-#else
-#define CONFIG_ENV_IS_NOWHERE
-#define CONFIG_SYS_NO_FLASH
-#endif
-
-/* serial communication */
-#ifdef XPAR_UARTLITE_0_BASEADDR
-#define CONFIG_XILINX_UARTLITE
-#define XILINX_UARTLITE_BASEADDR	XPAR_UARTLITE_0_BASEADDR
-#define CONFIG_BAUDRATE			XPAR_UARTLITE_0_BAUDRATE
-#define CONFIG_SYS_BAUDRATE_TABLE	{ CONFIG_BAUDRATE }
-#else
-#ifdef XPAR_UARTNS550_0_BASEADDR
-#define CONFIG_SYS_NS16550
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	4
-#define CONFIG_CONS_INDEX		1
-#define CONFIG_SYS_NS16550_COM1		XPAR_UARTNS550_0_BASEADDR
-#define CONFIG_SYS_NS16550_CLK		XPAR_UARTNS550_0_CLOCK_FREQ_HZ
-#define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 115200 }
-#endif
-#endif
-
-#endif						/* __CONFIG_H */
diff --git a/include/configs/xilinx-ppc405-generic.h b/include/configs/xilinx-ppc405-generic.h
deleted file mode 100644
index 75b119f8556d..000000000000
--- a/include/configs/xilinx-ppc405-generic.h
+++ /dev/null
@@ -1,42 +0,0 @@ 
-/*
- *
- * (C) Copyright 2008
- * Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es
- * This work has been supported by: QTechnology http://qtec.com/
- *
- * (C) Copyright 2008
- * Georg Schardt <schardt@team-ctech.de>
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-#ifndef __CONFIG_GEN_H
-#define __CONFIG_GEN_H
-
-#include "../board/xilinx/ppc405-generic/xparameters.h"
-
-/* sdram */
-#define CONFIG_SYS_SDRAM_SIZE_MB	256
-
-/* environment */
-#define CONFIG_ENV_IS_IN_FLASH		1
-#define CONFIG_ENV_SIZE			0x10000
-#define CONFIG_ENV_SECT_SIZE		0x10000
-#define CONFIG_SYS_ENV_OFFSET		0x3F0000
-#define CONFIG_ENV_ADDR		(CONFIG_SYS_FLASH_BASE+CONFIG_SYS_ENV_OFFSET)
-#define CONFIG_ENV_OVERWRITE		1
-
-/*Misc*/
-#define CONFIG_SYS_PROMPT	"xlx-ppc405:/# " /* Monitor Command Prompt */
-#define CONFIG_PREBOOT		"echo U-Boot is up and runnining;"
-
-/*Flash*/
-#define CONFIG_SYS_FLASH_BASE			XPAR_FLASH_MEM0_BASEADDR
-#define CONFIG_SYS_FLASH_SIZE		(32*1024*1024)
-#define CONFIG_SYS_MAX_FLASH_SECT	71
-#define CONFIG_SYS_FLASH_CFI		1
-#define CONFIG_FLASH_CFI_DRIVER		1
-#define MTDIDS_DEFAULT			"nor0=ppc405-flash"
-#define MTDPARTS_DEFAULT		"mtdpartsa=ppc405-flash:-(user)"
-
-#include <configs/xilinx-ppc405.h>
-#endif			/* __CONFIG_H */
diff --git a/include/configs/xilinx-ppc405.h b/include/configs/xilinx-ppc405.h
deleted file mode 100644
index a0151fe8f4cb..000000000000
--- a/include/configs/xilinx-ppc405.h
+++ /dev/null
@@ -1,22 +0,0 @@ 
-/*
- *
- * (C) Copyright 2008
- * Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es
- * This work has been supported by: QTechnology http://qtec.com/
- *
- * (C) Copyright 2008
- * Georg Schardt <schardt@team-ctech.de>
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-/* cpu parameter */
-#define CONFIG_405		1
-#define CONFIG_XILINX_405	1
-
-#include <configs/xilinx-ppc.h>
-
-#endif
diff --git a/include/configs/xilinx-ppc440-generic.h b/include/configs/xilinx-ppc440-generic.h
deleted file mode 100644
index 8e684151efe5..000000000000
--- a/include/configs/xilinx-ppc440-generic.h
+++ /dev/null
@@ -1,39 +0,0 @@ 
-/*
- * (C) Copyright 2008
- *  Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es
- *  This work has been supported by: QTechnology  http://qtec.com/
- * SPDX-License-Identifier:	GPL-2.0+
-*/
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-/*CPU*/
-#define CONFIG_440			1
-#define CONFIG_XILINX_PPC440_GENERIC	1
-#include "../board/xilinx/ppc440-generic/xparameters.h"
-
-/*Mem Map*/
-#define CONFIG_SYS_SDRAM_SIZE_MB	256
-
-/*Env*/
-#define	CONFIG_ENV_IS_IN_FLASH	1
-#define	CONFIG_ENV_SIZE		0x20000
-#define	CONFIG_ENV_SECT_SIZE	0x20000
-#define CONFIG_ENV_OFFSET		0x340000
-#define CONFIG_ENV_ADDR		(XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET)
-
-/*Misc*/
-#define CONFIG_SYS_PROMPT		"board:/# "	/* Monitor Command Prompt    */
-#define CONFIG_PREBOOT		"echo U-Boot is up and runnining;"
-
-/*Flash*/
-#define	CONFIG_SYS_FLASH_SIZE		(32*1024*1024)
-#define	CONFIG_SYS_MAX_FLASH_SECT	259
-#define MTDIDS_DEFAULT		"nor0=ml507-flash"
-#define MTDPARTS_DEFAULT	"mtdparts=ml507-flash:-(user)"
-
-/*Generic Configs*/
-#include <configs/xilinx-ppc440.h>
-
-#endif						/* __CONFIG_H */
diff --git a/include/configs/xilinx-ppc440.h b/include/configs/xilinx-ppc440.h
deleted file mode 100644
index f45700878ecd..000000000000
--- a/include/configs/xilinx-ppc440.h
+++ /dev/null
@@ -1,17 +0,0 @@ 
-/*
- * (C) Copyright 2008
- *  Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es
- *  This work has been supported by: QTechnology  http://qtec.com/
- * SPDX-License-Identifier:	GPL-2.0+
-*/
-
-#ifndef __CONFIG_GEN_H
-#define __CONFIG_GEN_H
-
-/*CPU*/
-#define CONFIG_440		1
-#define CONFIG_XILINX_440	1
-
-#include <configs/xilinx-ppc.h>
-
-#endif						/* __CONFIG_H */