diff mbox

[U-Boot,02/22] ppc: xilinx-ppc405: Remove support for fx12mm

Message ID 1453803865-2623-3-git-send-email-ricardo.ribalda@gmail.com
State Accepted
Commit 70c29dcdbc2df17a27c9879bcfdf4f098734545c
Delegated to: Michal Simek
Headers show

Commit Message

Ricardo Ribalda Delgado Jan. 26, 2016, 10:24 a.m. UTC 
It is just a specialized version of the xilinx-ppc405

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
 arch/powerpc/cpu/ppc4xx/Kconfig  |  4 ----
 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 ----------------------------
 configs/fx12mm_defconfig         | 10 --------
 configs/fx12mm_flash_defconfig   |  9 --------
 include/configs/fx12mm.h         | 50 ----------------------------------------
 9 files changed, 172 deletions(-)
 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 configs/fx12mm_defconfig
 delete mode 100644 configs/fx12mm_flash_defconfig
 delete mode 100644 include/configs/fx12mm.h

Comments

Bin Meng Jan. 26, 2016, 12:20 p.m. UTC | #1 
On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgado
<ricardo.ribalda@gmail.com> wrote:
> It is just a specialized version of the xilinx-ppc405
>
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> ---
>  arch/powerpc/cpu/ppc4xx/Kconfig  |  4 ----
>  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 ----------------------------
>  configs/fx12mm_defconfig         | 10 --------
>  configs/fx12mm_flash_defconfig   |  9 --------
>  include/configs/fx12mm.h         | 50 ----------------------------------------
>  9 files changed, 172 deletions(-)
>  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 configs/fx12mm_defconfig
>  delete mode 100644 configs/fx12mm_flash_defconfig
>  delete mode 100644 include/configs/fx12mm.h
>

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tom Rini Jan. 26, 2016, 2:43 p.m. UTC | #2 
On Tue, Jan 26, 2016 at 11:24:05AM +0100, Ricardo Ribalda Delgado wrote:

> It is just a specialized version of the xilinx-ppc405
> 
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>

Reviewed-by: Tom Rini <trini@konsulko.com>
Stefan Roese Jan. 26, 2016, 2:54 p.m. UTC | #3 
On 26.01.2016 11:24, Ricardo Ribalda Delgado wrote:
> It is just a specialized version of the xilinx-ppc405
>
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> ---
>   arch/powerpc/cpu/ppc4xx/Kconfig  |  4 ----
>   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 ----------------------------
>   configs/fx12mm_defconfig         | 10 --------
>   configs/fx12mm_flash_defconfig   |  9 --------
>   include/configs/fx12mm.h         | 50 ----------------------------------------
>   9 files changed, 172 deletions(-)
>   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 configs/fx12mm_defconfig
>   delete mode 100644 configs/fx12mm_flash_defconfig
>   delete mode 100644 include/configs/fx12mm.h

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

Thanks,
Stefan
diff mbox

Patch

diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig
index ba09b57fca50..120d5cfb3f39 100644
--- a/arch/powerpc/cpu/ppc4xx/Kconfig
+++ b/arch/powerpc/cpu/ppc4xx/Kconfig
@@ -55,9 +55,6 @@  config TARGET_YOSEMITE
 config TARGET_YUCCA
 	bool "Support yucca"
 
-config TARGET_FX12MM
-	bool "Support fx12mm"
-
 config TARGET_V5FX30TEVAL
 	bool "Support v5fx30teval"
 
@@ -136,7 +133,6 @@  source "board/amcc/sequoia/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/esd/cpci2dp/Kconfig"
 source "board/esd/cpci405/Kconfig"
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/configs/fx12mm_defconfig b/configs/fx12mm_defconfig
deleted file mode 100644
index c714d0d35e4e..000000000000
--- a/configs/fx12mm_defconfig
+++ /dev/null
@@ -1,10 +0,0 @@ 
-CONFIG_PPC=y
-CONFIG_4xx=y
-CONFIG_TARGET_FX12MM=y
-CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,INIT_TLB=board/xilinx/ppc405-generic/init.o"
-CONFIG_SYS_PROMPT="FX12MM:/# "
-# CONFIG_CMD_IMLS is not set
-# CONFIG_CMD_SETEXPR is not set
-# CONFIG_CMD_NET is not set
-# CONFIG_CMD_NFS is not set
-CONFIG_SYS_NS16550=y
diff --git a/configs/fx12mm_flash_defconfig b/configs/fx12mm_flash_defconfig
deleted file mode 100644
index ac3841260d65..000000000000
--- a/configs/fx12mm_flash_defconfig
+++ /dev/null
@@ -1,9 +0,0 @@ 
-CONFIG_PPC=y
-CONFIG_4xx=y
-CONFIG_TARGET_FX12MM=y
-CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC,INIT_TLB=board/xilinx/ppc405-generic/init.o"
-# CONFIG_CMD_IMLS is not set
-# CONFIG_CMD_SETEXPR is not set
-# CONFIG_CMD_NET is not set
-# CONFIG_CMD_NFS is not set
-CONFIG_SYS_NS16550=y
diff --git a/include/configs/fx12mm.h b/include/configs/fx12mm.h
deleted file mode 100644
index fa32a2e8cf37..000000000000
--- a/include/configs/fx12mm.h
+++ /dev/null
@@ -1,50 +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
-
-/* 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_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 */