[brcm63xx] move files to files-2.6.30, to ease newer kernel integration

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19471 3c298f89-4303-0410-b956-a3cf2f4a3e73

4 files changed, 0 insertions, 1247 deletions

diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/Kconfig b/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/Kconfig
deleted file mode 100644
index 970615e672..0000000000
--- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/Kconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-choice
-	prompt "Board support"
-	depends on BCM63XX
-	default BOARD_BCM963XX
-
-config BOARD_BCM963XX
-       bool "Generic Broadcom 963xx boards"
-       help
-
-config BOARD_LIVEBOX
-	bool "Inventel Livebox(es) boards"
-	help
-	  Boards using RedBoot.
-
-endchoice
diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/Makefile b/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/Makefile
deleted file mode 100644
index 098137b595..0000000000
--- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_BOARD_BCM963XX)		+= board_bcm963xx.o
-obj-$(CONFIG_BOARD_LIVEBOX)		+= board_livebox.o
diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c b/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c
deleted file mode 100644
index 97374f897f..0000000000
--- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ /dev/null
@@ -1,1003 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>
- * Copyright (C) 2009 Florian Fainelli <florian@openwrt.org>
- */
-
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
-#include <linux/ssb/ssb.h>
-#include <linux/gpio_buttons.h>
-#include <asm/addrspace.h>
-#include <bcm63xx_board.h>
-#include <bcm63xx_cpu.h>
-#include <bcm63xx_regs.h>
-#include <bcm63xx_io.h>
-#include <bcm63xx_board.h>
-#include <bcm63xx_dev_pci.h>
-#include <bcm63xx_dev_uart.h>
-#include <bcm63xx_dev_wdt.h>
-#include <bcm63xx_dev_enet.h>
-#include <bcm63xx_dev_dsp.h>
-#include <bcm63xx_dev_pcmcia.h>
-#include <bcm63xx_dev_usb_ohci.h>
-#include <bcm63xx_dev_usb_ehci.h>
-#include <bcm63xx_dev_usb_udc.h>
-#include <bcm63xx_dev_spi.h>
-#include <board_bcm963xx.h>
-#include <linux/input.h>
-
-#define PFX	"board_bcm963xx: "
-
-static struct bcm963xx_nvram nvram;
-static unsigned int mac_addr_used = 0;
-static struct board_info board;
-
-/*
- * known 6338 boards
- */
-
-#ifdef CONFIG_BCM63XX_CPU_6338
-static struct board_info __initdata board_96338gw = {
-	.name				= "96338GW",
-	.expected_cpu_id		= 0x6338,
-	
-	.has_enet0			= 1,
-	.enet0 = {
-		.force_speed_100	= 1,
-		.force_duplex_full	= 1,
-	},
-
-	.has_ohci0			= 1,
-
-	.leds = {
-		{
-			.name		= "adsl",
-			.gpio		= 3,
-			.active_low	= 1,
-		},
-		{
-			.name		= "ses",
-			.gpio		= 5,
-			.active_low	= 1,
-		},
-		{
-			.name		= "ppp-fail",
-			.gpio		= 4,
-			.active_low	= 1,
-		},
-		{
-			.name		= "power",
-			.gpio		= 0,
-			.active_low	= 1,
-			.default_trigger = "default-on",
-		},
-		{
-			.name		= "stop",
-			.gpio		= 1,
-			.active_low	= 1,
-		}
-	},
-};
-
-static struct board_info __initdata board_96338w = {
-	.name				= "96338W",
-	.expected_cpu_id		= 0x6338,
-	
-	.has_enet0			= 1,
-	.enet0 = {
-		.force_speed_100	= 1,
-		.force_duplex_full	= 1,
-	},
-
-	.leds = {
-		{
-			.name		= "adsl",
-			.gpio		= 3,
-			.active_low	= 1,
-		},
-		{
-			.name		= "ses",
-			.gpio		= 5,
-			.active_low	= 1,
-		},
-		{
-			.name		= "ppp-fail",
-			.gpio		= 4,
-			.active_low	= 1,
-		},
-		{
-			.name		= "power",
-			.gpio		= 0,
-			.active_low	= 1,
-			.default_trigger = "default-on",
-		},
-		{
-			.name		= "stop",
-			.gpio		= 1,
-			.active_low	= 1,
-		},
-	},
-};
-#endif
-
-/*
- * known 6345 boards
- */
-#ifdef CONFIG_BCM63XX_CPU_6345
-static struct board_info __initdata board_96345gw2 = {
-	.name				= "96345GW2",
-	.expected_cpu_id		= 0x6345,
-};
-#endif
-
-/*
- * known 6348 boards
- */
-#ifdef CONFIG_BCM63XX_CPU_6348
-static struct board_info __initdata board_96348r = {
-	.name				= "96348R",
-	.expected_cpu_id		= 0x6348,
-
-	.has_enet0			= 1,
-	.has_pci			= 1,
-
-	.enet0 = {
-		.has_phy		= 1,
-		.use_internal_phy	= 1,
-	},
-
-	.leds = {
-		{
-			.name		= "adsl-fail",
-			.gpio		= 2,
-			.active_low	= 1,
-		},
-		{
-			.name		= "ppp",
-			.gpio		= 3,
-			.active_low	= 1,
-		},
-		{
-			.name		= "ppp-fail",
-			.gpio		= 4,
-			.active_low	= 1,
-		},
-		{
-			.name		= "power",
-			.gpio		= 0,
-			.active_low	= 1,
-			.default_trigger = "default-on",
-			
-		},
-		{
-			.name		= "stop",
-			.gpio		= 1,
-			.active_low	= 1,
-		},
-	},
-};
-
-static struct board_info __initdata board_96348gw_10 = { 
-	.name				= "96348GW-10",
-	.expected_cpu_id		= 0x6348,
-	
-	.has_enet0			= 1,
-	.has_enet1			= 1,
-	.has_pci			= 1, 
-	
-	.enet0 = {
-		.has_phy		= 1,
-		.use_internal_phy	= 1,
-	},
-	.enet1 = {
-		.force_speed_100	= 1,
-		.force_duplex_full	= 1,
-	},
-	
-	.has_ohci0			= 1,
-	.has_pccard			= 1,
-	.has_ehci0			= 1,
-
-	.has_dsp			= 1,
-	.dsp = {
-		.gpio_rst		= 6,
-		.gpio_int		= 34,
-		.cs			= 2,
-		.ext_irq		= 2,
-	},
-	
-	.leds = {
-		{
-			.name		= "adsl-fail",
-			.gpio		= 2,
-			.active_low	= 1,
-		},
-		{
-			.name		= "ppp",
-			.gpio		= 3,
-			.active_low	= 1,
-		},
-		{
-			.name		= "ppp-fail",
-			.gpio		= 4,
-			.active_low	= 1,
-		},
-		{
-			.name		= "power",
-			.gpio		= 0,
-			.active_low	= 1,
-			.default_trigger = "default-on",
-		},
-		{
-			.name		= "stop",
-			.gpio		= 1,
-			.active_low	= 1,
-		},
-	},
-}; 
-
-static struct board_info __initdata board_96348gw_11 = {
-	.name				= "96348GW-11",
-	.expected_cpu_id		= 0x6348,
-
-	.has_enet0			= 1,
-	.has_enet1			= 1,
-	.has_pci			= 1,
-
-	.enet0 = {
-		.has_phy		= 1,
-		.use_internal_phy	= 1,
-	},
-
-	.enet1 = {
-		.force_speed_100	= 1,
-		.force_duplex_full	= 1,
-	},
-
-
-	.has_ohci0 = 1,
-	.has_pccard = 1,
-	.has_ehci0 = 1,
-	
-	.leds = {
-		{
-			.name		= "adsl-fail",
-			.gpio		= 2,
-			.active_low	= 1,
-		},
-		{
-			.name		= "ppp",
-			.gpio		= 3,
-			.active_low	= 1,
-		},
-		{
-			.name		= "ppp-fail",
-			.gpio		= 4,
-			.active_low	= 1,
-		},
-		{
-			.name		= "power",
-			.gpio		= 0,
-			.active_low	= 1,
-			.default_trigger = "default-on",
-		},
-		{
-			.name		= "stop",
-			.gpio		= 1,
-			.active_low	= 1,
-		},
-	},
-	.reset_buttons = {
-		{
-			.desc		= "reset",
-			.gpio		= 32,
-			.active_low	= 1,
-			.type	        = EV_KEY,
-			.code           = BTN_0,
-			.threshold      = 3,
-		},
-	},
-};
-
-static struct board_info __initdata board_96348gw = {
-	.name				= "96348GW",
-	.expected_cpu_id		= 0x6348,
-
-	.has_enet0			= 1,
-	.has_enet1			= 1,
-	.has_pci			= 1,
-
-	.enet0 = {
-		.has_phy		= 1,
-		.use_internal_phy	= 1,
-	},
-	.enet1 = {
-		.force_speed_100	= 1,
-		.force_duplex_full	= 1,
-	},
-
-	.has_ohci0			= 1,
-	.has_dsp			= 1,
-	
-	.dsp = {
-		.gpio_rst		= 6,
-		.gpio_int		= 34,
-		.ext_irq		= 2,
-		.cs			= 2,
-	},
-	
-	.leds = {
-		{
-			.name		= "adsl-fail",
-			.gpio		= 2,
-			.active_low	= 1,
-		},
-		{
-			.name		= "power",
-			.gpio		= 0,
-			.active_low	= 1,
-			.default_trigger = "default-on",
-		},
-		{
-			.name		= "stop",
-			.gpio		= 1,
-			.active_low	= 1,
-		},
-		{
-			.name		= "line1",
-			.gpio		= 4,
-			.active_low	= 1,
-		},
-		{
-			.name		= "line2",
-			.gpio		= 5,
-			.active_low	= 1,
-		},
-		{	.name		= "line3",
-			.gpio		= 6,
-			.active_low	= 1,
-		},
-		{
-			.name		= "tel",
-			.gpio		= 7,
-			.active_low	= 1,
-		},
-		{
-			.name		= "eth",
-			.gpio		= 35,
-			.active_low	= 1,
-		},
-	},
-	.reset_buttons = {
-		{
-			.desc		= "reset",
-			.gpio		= 36,
-			.active_low	= 1,
-			.type	        = EV_KEY,
-			.code           = BTN_0,
-			.threshold      = 3,
-		},
-	},	
-};
-
-static struct board_info __initdata board_FAST2404 = {
-        .name                           = "F@ST2404",
-        .expected_cpu_id                = 0x6348,
-
-        .has_enet0                      = 1,
-        .has_enet1                      = 1,
-        .has_pci                        = 1,
-
-        .enet0 = {
-                .has_phy                = 1,
-                .use_internal_phy       = 1,
-        },
-
-        .enet1 = {
-                .force_speed_100        = 1,
-                .force_duplex_full      = 1,
-        },
-
-
-        .has_ohci0 = 1,
-        .has_pccard = 1,
-        .has_ehci0 = 1,
-};
-
-static struct board_info __initdata board_DV201AMR = {
-	.name				= "DV201AMR",
-	.expected_cpu_id		= 0x6348,
-
-	.has_pci			= 1,
-	.has_ohci0			= 1,
-	.has_udc0			= 1,
-
-	.has_enet0			= 1,
-	.has_enet1			= 1,
-	.enet0 = {
-		.has_phy		= 1,
-		.use_internal_phy	= 1,
-	},
-	.enet1 = {
-		.force_speed_100	= 1,
-		.force_duplex_full	= 1,
-	},
-};
-
-static struct board_info __initdata board_96348gw_a = {
-	.name				= "96348GW-A",
-	.expected_cpu_id		= 0x6348,
-
-	.has_enet0			= 1,
-	.has_enet1			= 1,
-	.has_pci			= 1,
-
-	.enet0 = {
-		.has_phy		= 1,
-		.use_internal_phy	= 1,
-	},
-	.enet1 = {
-		.force_speed_100	= 1,
-		.force_duplex_full	= 1,
-	},
-
-	.has_ohci0 = 1,
-};
-
-static struct board_info __initdata board_rta1025w_16 = {
-	.name				= "RTA1025W_16",
-	.expected_cpu_id		= 0x6348,
-	
-	.has_enet0			= 1,
-	.has_enet1			= 1,
-	.has_pci			= 1,
-
-	.enet0 = {
-		.has_phy		= 1,
-		.use_internal_phy	= 1,
-	},
-	.enet1 = {
-		.force_speed_100	= 1,
-		.force_duplex_full	= 1,
-	},
-};
-#endif
-
-/*
- * known 6358 boards
- */
-#ifdef CONFIG_BCM63XX_CPU_6358
-static struct board_info __initdata board_96358vw = {
-	.name				= "96358VW",
-	.expected_cpu_id		= 0x6358,
-
-	.has_enet0			= 1,
-	.has_enet1			= 1,
-	.has_pci			= 1,
-
-	.enet0 = {
-		.has_phy		= 1,
-		.use_internal_phy	= 1,
-	},
-
-	.enet1 = {
-		.force_speed_100	= 1,
-		.force_duplex_full	= 1,
-	},
-
-
-	.has_ohci0 = 1,
-	.has_pccard = 1,
-	.has_ehci0 = 1,
-	
-	.leds = {
-		{
-			.name		= "adsl-fail",
-			.gpio		= 15,
-			.active_low	= 1,
-		},
-		{
-			.name		= "ppp",
-			.gpio		= 22,
-			.active_low	= 1,
-		},
-		{
-			.name		= "ppp-fail",
-			.gpio		= 23,
-			.active_low	= 1,
-		},
-		{
-			.name		= "power",
-			.gpio		= 4,
-			.default_trigger = "default-on",
-		},
-		{
-			.name		= "stop",
-			.gpio		= 5,
-		},
-	},
-};
-
-static struct board_info __initdata board_96358vw2 = {
-	.name				= "96358VW2",
-	.expected_cpu_id		= 0x6358,
-
-	.has_enet0			= 1,
-	.has_enet1			= 1,
-	.has_pci			= 1,
-
-	.enet0 = {
-		.has_phy		= 1,
-		.use_internal_phy	= 1,
-	},
-
-	.enet1 = {
-		.force_speed_100	= 1,
-		.force_duplex_full	= 1,
-	},
-
-
-	.has_ohci0 = 1,
-	.has_pccard = 1,
-	.has_ehci0 = 1,
-
-	.leds = {
-		{
-			.name		= "adsl",
-			.gpio		= 22,
-			.active_low	= 1,
-		},
-		{
-			.name		= "ppp-fail",
-			.gpio		= 23,
-		},
-		{
-			.name		= "power",
-			.gpio		= 5,
-			.active_low	= 1,
-			.default_trigger = "default-on",
-		},
-		{
-			.name		= "stop",
-			.gpio		= 4,
-			.active_low	= 1,
-		},
-	},
-};
-
-static struct board_info __initdata board_AGPFS0 = {
-	.name                           = "AGPF-S0",
-	.expected_cpu_id                = 0x6358,
-
-	.has_enet0                      = 1,
-	.has_enet1                      = 1,
-	.has_pci                        = 1,
-
-	.enet0 = {
-		.has_phy                = 1,
-		.use_internal_phy       = 1,
-	},
-
-	.enet1 = {
-		.force_speed_100        = 1,
-		.force_duplex_full      = 1,
-	},
-
-	.has_ohci0 = 1,
-	.has_ehci0 = 1,
-
-	.leds = {
-		/*Each led on alice gate is bi-color so final char */
-		/* is r for red and g for green leds */
-		{
-			.name		= "pwrr",
-			.gpio		= 5,
-			.active_low	= 1,
-		},
-		{
-			.name		= "pwrg",
-			.gpio		= 4,
-			.active_low	= 1,
-			.default_trigger = "default-on",
-		},
-		{
-			.name		= "wifir",
-			.gpio		= 23,
-			.active_low	= 1,
-		},
-		{
-			.name		= "wifig",
-			.gpio		= 22,
-			.active_low	= 1,
-		},
-		{
-			.name		= "usr1r",
-			.gpio		= 27,
-			.active_low	= 1,
-		},
-		{
-			.name		= "usr1g",
-			.gpio		= 26,
-			.active_low	= 1,
-		},
-		{
-			.name		= "usr2r",
-			.gpio		= 30,
-			.active_low	= 1,
-		},
-		{
-			.name		= "usr2g",
-			.gpio		= 29,
-			.active_low	= 1,
-		},
-	},
-
-	.reset_buttons = {
-		{
-			.desc		= "sw2",
-			.gpio		= 37,
-			.active_low	= 1,
-			.type	        = EV_KEY,
-			.code           = BTN_0,
-			.threshold      = 3,
-		},
-	},
-	/* sw1 is connected to gpio34*/
-};
-
-static struct board_info __initdata board_DWVS0 = {
-	.name                           = "DWV-S0",
-	.expected_cpu_id                = 0x6358,
-
-	.has_enet0                      = 1,
-	.has_enet1                      = 1,
-	.has_pci                        = 1,
-
-	.enet0 = {
-		.has_phy                = 1,
-		.use_internal_phy       = 1,
-	},
-
-	.enet1 = {
-		.force_speed_100        = 1,
-		.force_duplex_full      = 1,
-	},
-
-	.has_ohci0 = 1,
-};
-#endif
-
-/*
- * all boards
- */
-static const struct board_info __initdata *bcm963xx_boards[] = {
-#ifdef CONFIG_BCM63XX_CPU_6338
-	&board_96338gw,
-	&board_96338w,
-#endif
-#ifdef CONFIG_BCM63XX_CPU_6345
-	&board_96345gw2,
-#endif
-#ifdef CONFIG_BCM63XX_CPU_6348
-	&board_96348r,
-	&board_96348gw,
-	&board_96348gw_10,
-	&board_96348gw_11,
-	&board_FAST2404,
-	&board_DV201AMR,
-	&board_96348gw_a,
-	&board_rta1025w_16,
-#endif
-
-#ifdef CONFIG_BCM63XX_CPU_6358
-	&board_96358vw,
-	&board_96358vw2,
-	&board_AGPFS0,
-	&board_DWVS0,
-#endif
-};
-
-/*
- * early init callback, read nvram data from flash and checksum it
- */
-void __init board_prom_init(void)
-{
-	unsigned int check_len, i;
-	u8 *boot_addr, *cfe, *p;
-	char cfe_version[32];
-	u32 val;
-
-	/* read base address of boot chip select (0) 
-	 * 6345 does not have MPI but boots from standard
-	 * MIPS Flash address */
-	if (BCMCPU_IS_6345())
-		val = 0x1fc00000;
-	else {
-		val = bcm_mpi_readl(MPI_CSBASE_REG(0));
-		val &= MPI_CSBASE_BASE_MASK;
-	}
-	boot_addr = (u8 *)KSEG1ADDR(val);
-
-	/* dump cfe version */
-	cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
-	if (!memcmp(cfe, "cfe-v", 5))
-		snprintf(cfe_version, sizeof(cfe_version), "%u.%u.%u-%u.%u",
-			 cfe[5], cfe[6], cfe[7], cfe[8], cfe[9]);
-	else
-		strcpy(cfe_version, "unknown");
-	printk(KERN_INFO PFX "CFE version: %s\n", cfe_version);
-
-	/* extract nvram data */
-	memcpy(&nvram, boot_addr + BCM963XX_NVRAM_OFFSET, sizeof(nvram));
-
-	/* check checksum before using data */
-	if (nvram.version <= 4)
-		check_len = offsetof(struct bcm963xx_nvram, checksum_old);
-	else
-		check_len = sizeof(nvram);
-	val = 0;
-	p = (u8 *)&nvram;
-	while (check_len--)
-		val += *p;
-	if (val) {
-		printk(KERN_ERR PFX "invalid nvram checksum\n");
-		return;
-	}
-
-	/* find board by name */
-	for (i = 0; i < ARRAY_SIZE(bcm963xx_boards); i++) {
-		if (strncmp(nvram.name, bcm963xx_boards[i]->name,
-			    sizeof(nvram.name)))
-			continue;
-		/* copy, board desc array is marked initdata */
-		memcpy(&board, bcm963xx_boards[i], sizeof(board));
-		break;
-	}
-
-	/* bail out if board is not found, will complain later */
-	if (!board.name[0]) {
-		char name[17];
-		memcpy(name, nvram.name, 16);
-		name[16] = 0;
-		printk(KERN_ERR PFX "unknown bcm963xx board: %s\n",
-		       name);
-		return;
-	}
-
-	/* setup pin multiplexing depending on board enabled device,
-	 * this has to be done this early since PCI init is done
-	 * inside arch_initcall */
-	val = 0;
-#ifdef CONFIG_PCI
-	if (board.has_pci) {
-		bcm63xx_pci_enabled = 1;
-		if (BCMCPU_IS_6348())
-			val |= GPIO_MODE_6348_G2_PCI;
-	}
-#endif
-	if (board.has_pccard) {
-		if (BCMCPU_IS_6348())
-			val |= GPIO_MODE_6348_G1_MII_PCCARD;
-	}
-
-	if (board.has_enet0 && !board.enet0.use_internal_phy) {
-		if (BCMCPU_IS_6348())
-			val |= GPIO_MODE_6348_G3_EXT_MII |
-				GPIO_MODE_6348_G0_EXT_MII;
-	}
-
-	if (board.has_enet1 && !board.enet1.use_internal_phy) {
-		if (BCMCPU_IS_6348())
-			val |= GPIO_MODE_6348_G3_EXT_MII |
-				GPIO_MODE_6348_G0_EXT_MII;
-	}
-
-	bcm_gpio_writel(val, GPIO_MODE_REG);
-}
-
-/*
- * second stage init callback, good time to panic if we couldn't
- * identify on which board we're running since early printk is working
- */
-void __init board_setup(void)
-{
-	if (!board.name[0])
-		panic("unable to detect bcm963xx board");
-	printk(KERN_INFO PFX "board name: %s\n", board.name);
-
-	/* make sure we're running on expected cpu */
-	if (bcm63xx_get_cpu_id() != board.expected_cpu_id)
-		panic("unexpected CPU for bcm963xx board");
-}
-
-/*
- * return board name for /proc/cpuinfo
- */
-const char *board_get_name(void)
-{
-	return board.name;
-}
-
-/*
- * register & return a new board mac address
- */
-static int board_get_mac_address(u8 *mac)
-{
-	u8 *p;
-	int count;
-
-	if (mac_addr_used >= nvram.mac_addr_count) {
-		printk(KERN_ERR PFX "not enough mac address\n");
-		return -ENODEV;
-	}
-
-	memcpy(mac, nvram.mac_addr_base, ETH_ALEN);
-	p = mac + ETH_ALEN - 1;
-	count = mac_addr_used;
-
-	while (count--) {
-		do {
-			(*p)++;
-			if (*p != 0)
-				break;
-			p--;
-		} while (p != mac);
-	}
-
-	if (p == mac) {
-		printk(KERN_ERR PFX "unable to fetch mac address\n");
-		return -ENODEV;
-	}
-
-	mac_addr_used++;
-	return 0;
-}
-
-static struct resource mtd_resources[] = {
-	{
-		.start		= 0,	/* filled at runtime */
-		.end		= 0,	/* filled at runtime */
-		.flags		= IORESOURCE_MEM,
-	}
-};
-
-static struct platform_device mtd_dev = {
-	.name			= "bcm963xx-flash",
-	.resource		= mtd_resources,
-	.num_resources		= ARRAY_SIZE(mtd_resources),
-};
-
-/*
- * Register a sane SPROMv2 to make the on-board
- * bcm4318 WLAN work
- */
-static struct ssb_sprom bcm63xx_sprom = {
-	.revision		= 0x02,
-	.board_rev		= 0x17,
-	.country_code		= 0x0,
-	.ant_available_bg 	= 0x3,
-	.pa0b0			= 0x15ae,
-	.pa0b1			= 0xfa85,
-	.pa0b2			= 0xfe8d,
-	.pa1b0			= 0xffff,
-	.pa1b1			= 0xffff,
-	.pa1b2			= 0xffff,
-	.gpio0			= 0xff,
-	.gpio1			= 0xff,
-	.gpio2			= 0xff,
-	.gpio3			= 0xff,
-	.maxpwr_bg		= 0x004c,
-	.itssi_bg		= 0x00,
-	.boardflags_lo		= 0x2848,
-	.boardflags_hi		= 0x0000,
-};
-
-static struct resource gpiodev_resource = {
-	.start			= 0xFFFFFFFF,
-};
-
-static struct gpio_led_platform_data bcm63xx_led_data;
-
-static struct platform_device bcm63xx_gpio_leds = {
-	.name			= "leds-gpio",
-	.id			= 0,
-	.dev.platform_data	= &bcm63xx_led_data,
-};
-
-static struct gpio_buttons_platform_data bcm63xx_gpio_buttons_data = {
-	.poll_interval  = 20,
-};
-
-static struct platform_device bcm63xx_gpio_buttons_device = {
-        .name           = "gpio-buttons",
-        .id             = 0,
-        .dev.platform_data = &bcm63xx_gpio_buttons_data,
-};
-
-
-/*
- * third stage init callback, register all board devices.
- */
-int __init board_register_devices(void)
-{
-	u32 val;
-
-	bcm63xx_uart_register();
-	bcm63xx_wdt_register();
-
-	if (!BCMCPU_IS_6345())
-		bcm63xx_spi_register();
-
-	if (board.has_pccard)
-		bcm63xx_pcmcia_register();
-
-	if (board.has_enet0 &&
-	    !board_get_mac_address(board.enet0.mac_addr))
-		bcm63xx_enet_register(0, &board.enet0);
-
-	if (board.has_enet1 &&
-	    !board_get_mac_address(board.enet1.mac_addr))
-		bcm63xx_enet_register(1, &board.enet1);
-
-	if (board.has_ohci0)
-		bcm63xx_ohci_register();
-
-	if (board.has_ehci0)
-		bcm63xx_ehci_register();
-
-	if (board.has_udc0)
-		bcm63xx_udc_register();
-
-	if (board.has_dsp)
-		bcm63xx_dsp_register(&board.dsp);
-	
-	/* Generate MAC address for WLAN and
-	 * register our SPROM */
-#ifdef CONFIG_PCI
-	if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
-		memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
-		memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
-		if (ssb_arch_set_fallback_sprom(&bcm63xx_sprom) < 0)
-			printk(KERN_ERR "failed to register fallback SPROM\n");
-	}
-#endif
-
-	/* read base address of boot chip select (0) */
-	if (BCMCPU_IS_6345())
-		val = 0x1fc00000;
-	else {
-		val = bcm_mpi_readl(MPI_CSBASE_REG(0));
-		val &= MPI_CSBASE_BASE_MASK;
-	}
-	mtd_resources[0].start = val;
-	mtd_resources[0].end = 0x1FFFFFFF;
-
-	platform_device_register(&mtd_dev);
-
-	/* Register GPIODEV */
-	platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1);
-
-	bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
-	bcm63xx_led_data.leds = board.leds;
-
-	platform_device_register(&bcm63xx_gpio_leds);
-
-	if (board.reset_buttons) {
-		bcm63xx_gpio_buttons_data.nbuttons = ARRAY_SIZE(board.reset_buttons);
-		bcm63xx_gpio_buttons_data.buttons = board.reset_buttons;
-
-		platform_device_register(&bcm63xx_gpio_buttons_device);
-	}
-
-	return 0;
-}
-
diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_livebox.c b/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_livebox.c
deleted file mode 100644
index 06ca83b591..0000000000
--- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_livebox.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2008 Florian Fainelli <florian@openwrt.org>
- */
-
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
-#include <asm/addrspace.h>
-#include <bcm63xx_board.h>
-#include <bcm63xx_cpu.h>
-#include <bcm63xx_regs.h>
-#include <bcm63xx_io.h>
-#include <bcm63xx_board.h>
-#include <bcm63xx_dev_pci.h>
-#include <bcm63xx_dev_uart.h>
-#include <bcm63xx_dev_wdt.h>
-#include <bcm63xx_dev_enet.h>
-#include <bcm63xx_dev_pcmcia.h>
-#include <bcm63xx_dev_usb_ohci.h>
-#include <bcm63xx_dev_usb_ehci.h>
-#include <board_bcm963xx.h>
-
-#define PFX	"board_livebox: "
-
-static unsigned int mac_addr_used = 0;
-static struct board_info board;
-
-/*
- * known 6348 boards
- */
-#ifdef CONFIG_BCM63XX_CPU_6348
-static struct board_info __initdata board_livebox = {
-	.name				= "Livebox",
-	.expected_cpu_id		= 0x6348,
-
-	.has_enet0			= 1,
-	.has_enet1			= 1,
-	.has_pci			= 1,
-
-	.enet0 = {
-		.has_phy		= 1,
-		.use_internal_phy	= 1,
-	},
-
-	.enet1 = {
-		.force_speed_100	= 1,
-		.force_duplex_full	= 1,
-	},
-
-	.has_ohci0			= 1,
-	.has_pccard			= 1,
-	.has_ehci0			= 1,
-};
-#endif
-
-/*
- * all boards
- */
-static const struct board_info __initdata *bcm963xx_boards[] = {
-#ifdef CONFIG_BCM63XX_CPU_6348
-	&board_livebox
-#endif
-};
-
-/*
- * early init callback
- */
-void __init board_prom_init(void)
-{
-	u32 val;
-
-	/* read base address of boot chip select (0) */
-	val = bcm_mpi_readl(MPI_CSBASE_REG(0));
-	val &= MPI_CSBASE_BASE_MASK;
-
-	/* assume board is a Livebox */
-	memcpy(&board, bcm963xx_boards[0], sizeof(board));
-
-	/* setup pin multiplexing depending on board enabled device,
-	 * this has to be done this early since PCI init is done
-	 * inside arch_initcall */
-	val = 0;
-
-	if (board.has_pci) {
-		bcm63xx_pci_enabled = 1;
-		if (BCMCPU_IS_6348())
-			val |= GPIO_MODE_6348_G2_PCI;
-	}
-
-	if (board.has_pccard) {
-		if (BCMCPU_IS_6348())
-			val |= GPIO_MODE_6348_G1_MII_PCCARD;
-	}
-
-	if (board.has_enet0 && !board.enet0.use_internal_phy) {
-		if (BCMCPU_IS_6348())
-			val |= GPIO_MODE_6348_G3_EXT_MII |
-				GPIO_MODE_6348_G0_EXT_MII;
-	}
-
-	if (board.has_enet1 && !board.enet1.use_internal_phy) {
-		if (BCMCPU_IS_6348())
-			val |= GPIO_MODE_6348_G3_EXT_MII |
-				GPIO_MODE_6348_G0_EXT_MII;
-	}
-
-	bcm_gpio_writel(val, GPIO_MODE_REG);
-}
-
-/*
- * second stage init callback, good time to panic if we couldn't
- * identify on which board we're running since early printk is working
- */
-void __init board_setup(void)
-{
-	if (!board.name[0])
-		panic("unable to detect bcm963xx board");
-	printk(KERN_INFO PFX "board name: %s\n", board.name);
-
-	/* make sure we're running on expected cpu */
-	if (bcm63xx_get_cpu_id() != board.expected_cpu_id)
-		panic("unexpected CPU for bcm963xx board");
-}
-
-/*
- * return board name for /proc/cpuinfo
- */
-const char *board_get_name(void)
-{
-	return board.name;
-}
-
-/*
- * register & return a new board mac address
- */
-
-static int board_get_mac_address(u8 *mac)
-{
-	u8 default_mac[ETH_ALEN] = {0x00, 0x07, 0x3A, 0x00, 0x00, 0x00};
-	u8 *p;
-	int count;
-
-	memcpy(mac, default_mac, ETH_ALEN);
-
-	p = mac + ETH_ALEN - 1;
-	count = mac_addr_used;
-
-	while (count--) {
-		do {
-			(*p)++;
-			if (*p != 0)
-				break;
-			p--;
-		} while (p != mac);
-	}
-
-	if (p == mac) {
-		printk(KERN_ERR PFX "unable to fetch mac address\n");
-		return -ENODEV;
-	}
-        mac_addr_used++;
-
-	return 0;
-}
-
-static struct resource mtd_resources[] = {
-	{
-		.start          = 0,    /* filled at runtime */
-		.end            = 0,    /* filled at runtime */
-		.flags          = IORESOURCE_MEM,
-	}
-};
-
-static struct platform_device mtd_dev = {
-	.name                   = "bcm963xx-flash",
-	.resource               = mtd_resources,
-	.num_resources          = ARRAY_SIZE(mtd_resources),
-};
-
-
-/*
- * third stage init callback, register all board devices.
- */
-int __init board_register_devices(void)
-{
-	u32 val;
-
-	bcm63xx_uart_register();
-	bcm63xx_wdt_register();
-
-	if (board.has_pccard)
-		bcm63xx_pcmcia_register();
-
-	if (board.has_enet0 &&
-	    !board_get_mac_address(board.enet0.mac_addr))
-		bcm63xx_enet_register(0, &board.enet0);
-
-	if (board.has_enet1 &&
-	    !board_get_mac_address(board.enet1.mac_addr))
-		bcm63xx_enet_register(1, &board.enet1);
-
-	if (board.has_ohci0)
-		bcm63xx_ohci_register();
-
-	if (board.has_ehci0)
-		bcm63xx_ehci_register();
-
-
-	/* read base address of boot chip select (0) */
-	val = bcm_mpi_readl(MPI_CSBASE_REG(0));
-	val &= MPI_CSBASE_BASE_MASK;
-	mtd_resources[0].start = val;
-	mtd_resources[0].end = 0x1FFFFFFF;
-	
-	platform_device_register(&mtd_dev);
-
-	return 0;
-}
-