This patch is for broadcom 96348GW-11 boards, to get USB and Ethernet working. Also it patches mtd map driver for bcm96xx boards to be sure that CFE1CFE1 code is detected when booting from CFE. (#4201)
SVN-Revision: 13213
This commit is contained in:
parent
cb126cd576
commit
0d4286b0b3
3 changed files with 31 additions and 3 deletions
|
@ -177,13 +177,14 @@ static int bcm963xx_detect_cfe(struct mtd_info *master)
|
|||
{
|
||||
int idoffset = 0x4e0;
|
||||
static char idstring[8] = "CFE1CFE1";
|
||||
char buf[8];
|
||||
char buf[9];
|
||||
int ret;
|
||||
size_t retlen;
|
||||
|
||||
ret = master->read(master, idoffset, 8, &retlen, (void *)buf);
|
||||
buf[retlen] = 0;
|
||||
printk("bcm963xx: Read Signature value of %s\n", buf);
|
||||
return strcmp(idstring,buf);
|
||||
return strncmp(idstring,buf,8);
|
||||
}
|
||||
|
||||
static int __init bcm963xx_mtd_init(void)
|
||||
|
|
|
@ -75,6 +75,8 @@ define Image/Build
|
|||
$(call Image/Build/CFE,$(1),96345GW2,6345)
|
||||
# Neufbox4
|
||||
$(call Image/Build/CFE,$(1),96358VW,6358)
|
||||
# Comtrend 536
|
||||
$(call Image/Build/CFE,$(1),96348GW-11,6348)
|
||||
endef
|
||||
|
||||
$(eval $(call BuildImage))
|
||||
|
|
|
@ -56,7 +56,7 @@ Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
|
|||
+obj-$(CONFIG_BOARD_BCM963XX) += board_bcm963xx.o
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -0,0 +1,328 @@
|
||||
@@ -0,0 +1,353 @@
|
||||
+/*
|
||||
+ * 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
|
||||
|
@ -109,6 +109,30 @@ Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
|
|||
+ },
|
||||
+};
|
||||
+
|
||||
+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,
|
||||
+};
|
||||
+
|
||||
+static struct board_info __initdata board_96348gw = {
|
||||
+ .name = "96348GW",
|
||||
+ .expected_cpu_id = 0x6348,
|
||||
|
@ -159,6 +183,7 @@ Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
|
|||
+#ifdef CONFIG_BCM63XX_CPU_6348
|
||||
+ &board_96348r,
|
||||
+ &board_96348gw,
|
||||
+ &board_96348gw_11,
|
||||
+#endif
|
||||
+
|
||||
+#ifdef CONFIG_BCM63XX_CPU_6358
|
||||
|
|
Loading…
Reference in a new issue