powerpc: remove support for kmtergr1 and MPC8309
The kmtegr1 board is out of maintenance and can be removed. As it is the
only board in the tree using MPC8309 the support for this CPU is dropped
completely.
Signed-off-by: Holger Brunck <holger.brunck@hitachienergy.com>
diff --git a/arch/powerpc/include/asm/arch-mpc83xx/gpio.h b/arch/powerpc/include/asm/arch-mpc83xx/gpio.h
index b740675..19c2506 100644
--- a/arch/powerpc/include/asm/arch-mpc83xx/gpio.h
+++ b/arch/powerpc/include/asm/arch-mpc83xx/gpio.h
@@ -8,8 +8,7 @@
*/
#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)
+#elif defined(CONFIG_ARCH_MPC834X) || defined(CONFIG_ARCH_MPC837X)
#define MPC83XX_GPIO_CTRLRS 2
#else
#define MPC83XX_GPIO_CTRLRS 0
diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h
index 770adcd..6709e69 100644
--- a/arch/powerpc/include/asm/global_data.h
+++ b/arch/powerpc/include/asm/global_data.h
@@ -32,8 +32,6 @@
u32 tsec1_clk;
u32 tsec2_clk;
u32 usbdr_clk;
-# elif defined(CONFIG_ARCH_MPC8309)
- u32 usbdr_clk;
# endif
# if defined(CONFIG_ARCH_MPC834X)
u32 usbmph_clk;
diff --git a/arch/powerpc/include/asm/immap_83xx.h b/arch/powerpc/include/asm/immap_83xx.h
index 6d1ddbc..c731347 100644
--- a/arch/powerpc/include/asm/immap_83xx.h
+++ b/arch/powerpc/include/asm/immap_83xx.h
@@ -64,14 +64,7 @@
#else
u32 pecr2; /* PCI Express control register 2 */
#endif
-#if defined(CONFIG_ARCH_MPC8309)
- u32 can_dbg_ctrl;
- u32 res9a;
- u32 gpr1;
- u8 res9b[0xAC];
-#else
u8 res9[0xB8];
-#endif
} sysconf83xx_t;
/*
@@ -604,11 +597,7 @@
* On Chip ROM
*/
typedef struct rom83xx {
-#if defined(CONFIG_ARCH_MPC8309)
- u8 mem[0x8000];
-#else
u8 mem[0x10000];
-#endif
} rom83xx_t;
/*
@@ -856,55 +845,6 @@
security83xx_t security;
u8 res8[0xC0000];
u8 qe[0x100000]; /* QE block */
-} immap_t;
-#elif defined(CONFIG_ARCH_MPC8309)
-typedef struct immap {
- sysconf83xx_t sysconf; /* System configuration */
- wdt83xx_t wdt; /* Watch Dog Timer (WDT) Registers */
- rtclk83xx_t rtc; /* Real Time Clock Module Registers */
- rtclk83xx_t pit; /* Periodic Interval Timer */
- gtm83xx_t gtm[2]; /* Global Timers Module */
- ipic83xx_t ipic; /* Integrated Programmable Interrupt Controller */
- arbiter83xx_t arbiter; /* System Arbiter Registers */
- reset83xx_t reset; /* Reset Module */
- clk83xx_t clk; /* System Clock Module */
- pmc83xx_t pmc; /* Power Management Control Module */
- gpio83xx_t gpio[2]; /* General purpose I/O module */
- u8 res0[0x500]; /* res0 1.25 KBytes added for 8309 */
- qepi83xx_t qepi; /* QE Ports Interrupts Registers */
- qepio83xx_t qepio; /* QE Parallel I/O ports */
- u8 res1[0x800];
- ddr83xx_t ddr; /* DDR Memory Controller Memory */
- fsl_i2c_t i2c[2]; /* I2C Controllers */
- u8 res2[0x1300];
- duart83xx_t duart[2]; /* DUART */
- u8 res3[0x200];
- duart83xx_t duart1[2]; /* DUART */
- u8 res4[0x500];
- fsl_lbc_t im_lbc; /* Local Bus Controller Regs */
- u8 res5[0x1000];
- spi8xxx_t spi; /* Serial Peripheral Interface */
- dma83xx_t dma; /* DMA */
- pciconf83xx_t pci_conf[1]; /* PCI Configuration Registers */
- u8 res7[0x80];
- ios83xx_t ios; /* Sequencer (IOS) */
- pcictrl83xx_t pci_ctrl[1]; /* PCI Control & Status Registers */
- u8 res8[0x13A00];
- u8 can1[0x1000]; /* Flexcan 1 */
- u8 can2[0x1000]; /* Flexcan 2 */
- u8 res9[0x5000];
- usb83xx_t usb;
- u8 res10[0x5000];
- u8 can3[0x1000]; /* Flexcan 3 */
- u8 can4[0x1000]; /* Flexcan 4 */
- u8 res11[0x1000];
- u8 dma1[0x2000]; /* DMA */
- sdhc83xx_t sdhc; /* SDHC Controller */
- u8 res12[0xC1000];
- rom83xx_t rom; /* On Chip ROM */
- u8 res13[0x8000];
- u8 qe[0x100000]; /* QE block */
- u8 res14[0xE00000];/* Added for 8309 */
} immap_t;
#endif
diff --git a/arch/powerpc/include/asm/mpc8xxx_spi.h b/arch/powerpc/include/asm/mpc8xxx_spi.h
index f2210a1..83cfe23 100644
--- a/arch/powerpc/include/asm/mpc8xxx_spi.h
+++ b/arch/powerpc/include/asm/mpc8xxx_spi.h
@@ -11,7 +11,6 @@
#include <asm/types.h>
#if defined(CONFIG_ARCH_MPC8308) || \
- defined(CONFIG_ARCH_MPC8309) || \
defined(CONFIG_ARCH_MPC8313) || \
defined(CONFIG_ARCH_MPC834X) || \
defined(CONFIG_ARCH_MPC837X)