aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2008-10-22 09:20:51 +0000
committerFlorian Fainelli <florian@openwrt.org>2008-10-22 09:20:51 +0000
commit28baca91fec1fa736a408009f43fa8f2720f571e (patch)
tree0461acd96ac9c3971a27d296d55ad420f2a94e81
parent5065bb589aa83aa1a64001cc33b8dd511c1b444a (diff)
downloadupstream-28baca91fec1fa736a408009f43fa8f2720f571e.tar.gz
upstream-28baca91fec1fa736a408009f43fa8f2720f571e.tar.bz2
upstream-28baca91fec1fa736a408009f43fa8f2720f571e.zip
Update patches and rename board 9 stands for development board
SVN-Revision: 13024
-rw-r--r--target/linux/brcm63xx/Makefile3
-rw-r--r--target/linux/brcm63xx/patches-2.6.27/011-add_preliminary_board_support.patch20
-rw-r--r--target/linux/brcm63xx/patches-2.6.27/012-add_defconfig.patch2
3 files changed, 16 insertions, 9 deletions
diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile
index d3a63b1741..9e35957a2b 100644
--- a/target/linux/brcm63xx/Makefile
+++ b/target/linux/brcm63xx/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
ARCH:=mips
BOARD:=brcm63xx
-BOARDNAME:=Broadcom BCM963xx
+BOARDNAME:=Broadcom BCM63xx
FEATURES:=squashfs jffs2 broken usb atm
LINUX_VERSION:=2.6.27
@@ -16,6 +16,7 @@ include $(INCLUDE_DIR)/target.mk
define Target/Description
Build firmware images for Broadcom based xDSL/routers
+ currently supports BCM6348 and BCM6358 based devices.
(e.g. Inventel Livebox, Siemens SE515)
endef
diff --git a/target/linux/brcm63xx/patches-2.6.27/011-add_preliminary_board_support.patch b/target/linux/brcm63xx/patches-2.6.27/011-add_preliminary_board_support.patch
index a738bcc7ce..cc1f27f292 100644
--- a/target/linux/brcm63xx/patches-2.6.27/011-add_preliminary_board_support.patch
+++ b/target/linux/brcm63xx/patches-2.6.27/011-add_preliminary_board_support.patch
@@ -1,4 +1,4 @@
-From b95a2bbbcae5423e5404a7b3c8dd1685e1786f13 Mon Sep 17 00:00:00 2001
+From 16dc080062a37c21642bc77fde5391a3416729a4 Mon Sep 17 00:00:00 2001
From: Maxime Bizon <mbizon@freebox.fr>
Date: Wed, 17 Sep 2008 15:55:36 +0200
Subject: [PATCH] [MIPS] BCM63XX: Add preliminary board support.
@@ -9,12 +9,12 @@ Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
arch/mips/bcm63xx/Makefile | 2 +
arch/mips/bcm63xx/boards/Kconfig | 10 +
arch/mips/bcm63xx/boards/Makefile | 1 +
- arch/mips/bcm63xx/boards/board_bcm963xx.c | 322 ++++++++++++++++++++++++
+ arch/mips/bcm63xx/boards/board_bcm963xx.c | 328 ++++++++++++++++++++++++
arch/mips/bcm63xx/prom.c | 4 +
arch/mips/bcm63xx/setup.c | 16 +-
include/asm-mips/mach-bcm63xx/bcm63xx_board.h | 12 +
include/asm-mips/mach-bcm63xx/board_bcm963xx.h | 50 ++++
- 9 files changed, 417 insertions(+), 2 deletions(-)
+ 9 files changed, 423 insertions(+), 2 deletions(-)
create mode 100644 arch/mips/bcm63xx/boards/Kconfig
create mode 100644 arch/mips/bcm63xx/boards/Makefile
create mode 100644 arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -66,10 +66,10 @@ index 0000000..af07c1a
+obj-$(CONFIG_BOARD_BCM963XX) += board_bcm963xx.o
diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c
new file mode 100644
-index 0000000..de52a2a
+index 0000000..6e2b4ae
--- /dev/null
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -0,0 +1,322 @@
+@@ -0,0 +1,328 @@
+/*
+ * 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
@@ -231,8 +231,14 @@ index 0000000..de52a2a
+ }
+
+ /* bail out if board is not found, will complain later */
-+ if (!board.name)
++ 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
@@ -271,7 +277,7 @@ index 0000000..de52a2a
+ */
+void __init board_setup(void)
+{
-+ if (!board.name)
++ if (!board.name[0])
+ panic("unable to detect bcm963xx board");
+ printk(KERN_INFO PFX "board name: %s\n", board.name);
+
diff --git a/target/linux/brcm63xx/patches-2.6.27/012-add_defconfig.patch b/target/linux/brcm63xx/patches-2.6.27/012-add_defconfig.patch
index 5fc88471b8..388d3a205c 100644
--- a/target/linux/brcm63xx/patches-2.6.27/012-add_defconfig.patch
+++ b/target/linux/brcm63xx/patches-2.6.27/012-add_defconfig.patch
@@ -1,4 +1,4 @@
-From 81ee4742b6f77589aa3b3d03b1878de1b9bf0855 Mon Sep 17 00:00:00 2001
+From d78e52f95969ff3ae7b7bfdfabcdd4de3b41e08f Mon Sep 17 00:00:00 2001
From: Maxime Bizon <mbizon@freebox.fr>
Date: Mon, 22 Sep 2008 10:41:15 +0200
Subject: [PATCH] [MIPS] BCM63XX: Add defconfig.