m68k: Remove M5485 boards

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 <Tsi-Chung.Liew@nxp.com>
Signed-off-by: Tom Rini <trini@konsulko.com>

12 files changed, 1 insertions, 265 deletions

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index fef108105b..f7f6d08be3 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -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"
 
diff --git a/arch/m68k/dts/M5485AFE.dts b/arch/m68k/dts/M5485AFE.dts
deleted file mode 100644
index b1f5bf0f56..0000000000
--- a/arch/m68k/dts/M5485AFE.dts
+++ /dev/null
@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Angelo Dureghello <angelo@sysam.it>
- */
-
-/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>;
-};
diff --git a/arch/m68k/dts/M5485BFE.dts b/arch/m68k/dts/M5485BFE.dts
deleted file mode 100644
index 10b8f5b201..0000000000
--- a/arch/m68k/dts/M5485BFE.dts
+++ /dev/null
@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Angelo Dureghello <angelo@sysam.it>
- */
-
-/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>;
-};
diff --git a/arch/m68k/dts/M5485CFE.dts b/arch/m68k/dts/M5485CFE.dts
deleted file mode 100644
index a1ae64f65c..0000000000
--- a/arch/m68k/dts/M5485CFE.dts
+++ /dev/null
@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Angelo Dureghello <angelo@sysam.it>
- */
-
-/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>;
-};
diff --git a/arch/m68k/dts/M5485DFE.dts b/arch/m68k/dts/M5485DFE.dts
deleted file mode 100644
index 9b38d451fc..0000000000
--- a/arch/m68k/dts/M5485DFE.dts
+++ /dev/null
@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Angelo Dureghello <angelo@sysam.it>
- */
-
-/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>;
-};
diff --git a/arch/m68k/dts/M5485EFE.dts b/arch/m68k/dts/M5485EFE.dts
deleted file mode 100644
index a1ac3f5a48..0000000000
--- a/arch/m68k/dts/M5485EFE.dts
+++ /dev/null
@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Angelo Dureghello <angelo@sysam.it>
- */
-
-/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>;
-};
diff --git a/arch/m68k/dts/M5485FFE.dts b/arch/m68k/dts/M5485FFE.dts
deleted file mode 100644
index 7f22de49f4..0000000000
--- a/arch/m68k/dts/M5485FFE.dts
+++ /dev/null
@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Angelo Dureghello <angelo@sysam.it>
- */
-
-/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>;
-};
diff --git a/arch/m68k/dts/M5485GFE.dts b/arch/m68k/dts/M5485GFE.dts
deleted file mode 100644
index 3430aa7279..0000000000
--- a/arch/m68k/dts/M5485GFE.dts
+++ /dev/null
@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Angelo Dureghello <angelo@sysam.it>
- */
-
-/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>;
-};
diff --git a/arch/m68k/dts/M5485HFE.dts b/arch/m68k/dts/M5485HFE.dts
deleted file mode 100644
index 57c98f1ef7..0000000000
--- a/arch/m68k/dts/M5485HFE.dts
+++ /dev/null
@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Angelo Dureghello <angelo@sysam.it>
- */
-
-/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>;
-};
diff --git a/arch/m68k/dts/Makefile b/arch/m68k/dts/Makefile
index e059f23ccd..0a356b8e37 100644
--- a/arch/m68k/dts/Makefile
+++ b/arch/m68k/dts/Makefile
@@ -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)
 
diff --git a/arch/m68k/include/asm/coldfire/intctrl.h b/arch/m68k/include/asm/coldfire/intctrl.h
index 7b42e65bc8..f7f0f07d30 100644
--- a/arch/m68k/include/asm/coldfire/intctrl.h
+++ b/arch/m68k/include/asm/coldfire/intctrl.h
@@ -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
 
diff --git a/arch/m68k/include/asm/immap.h b/arch/m68k/include/asm/immap.h
index 9e84fb9d26..cabdb0f1a5 100644
--- a/arch/m68k/include/asm/immap.h
+++ b/arch/m68k/include/asm/immap.h
@@ -412,51 +412,4 @@
 #endif
 #endif				/* CONFIG_M547x */
 
-#ifdef CONFIG_M548x
-#include <asm/immap_547x_8x.h>
-#include <asm/m547x_8x.h>
-
-#ifdef CONFIG_FSLDMAFEC
-#define CONFIG_SYS_FEC0_IOBASE		(MMAP_FEC0)
-#define CONFIG_SYS_FEC1_IOBASE		(MMAP_FEC1)
-
-#define FEC0_RX_TASK		0
-#define FEC0_TX_TASK		1
-#define FEC0_RX_PRIORITY	6
-#define FEC0_TX_PRIORITY	7
-#define FEC0_RX_INIT		16
-#define FEC0_TX_INIT		17
-#define FEC1_RX_TASK		2
-#define FEC1_TX_TASK		3
-#define FEC1_RX_PRIORITY	6
-#define FEC1_TX_PRIORITY	7
-#define FEC1_RX_INIT		30
-#define FEC1_TX_INIT		31
-#endif
-
-#define CONFIG_SYS_UART_BASE		(MMAP_UART0 + (CONFIG_SYS_UART_PORT * 0x100))
-
-/* Timer */
-#ifdef CONFIG_SLTTMR
-#define CONFIG_SYS_UDELAY_BASE		(MMAP_SLT1)
-#define CONFIG_SYS_TMR_BASE		(MMAP_SLT0)
-#define CONFIG_SYS_TMRPND_REG		(((volatile int0_t *)(CONFIG_SYS_INTR_BASE))->iprh0)
-#define CONFIG_SYS_TMRINTR_NO		(INT0_HI_SLT0)
-#define CONFIG_SYS_TMRINTR_MASK	(INTC_IPRH_INT54)
-#define CONFIG_SYS_TMRINTR_PEND	(CONFIG_SYS_TMRINTR_MASK)
-#define CONFIG_SYS_TMRINTR_PRI		(0x1E)
-#define CONFIG_SYS_TIMER_PRESCALER	(gd->bus_clk / 1000000)
-#endif
-
-#define CONFIG_SYS_INTR_BASE		(MMAP_INTC0)
-#define CONFIG_SYS_NUM_IRQS		(128)
-
-#ifdef CONFIG_PCI
-#define CONFIG_SYS_PCI_BAR0		(CONFIG_SYS_MBAR)
-#define CONFIG_SYS_PCI_BAR1		(CONFIG_SYS_SDRAM_BASE)
-#define CONFIG_SYS_PCI_TBATR0		(CONFIG_SYS_MBAR)
-#define CONFIG_SYS_PCI_TBATR1		(CONFIG_SYS_SDRAM_BASE)
-#endif
-#endif				/* CONFIG_M548x */
-
 #endif				/* __IMMAP_H */