aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-04-17 09:22:02 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-04-17 09:22:02 +0000
commit1923df90a42ec6284efa2d228700b2fd8720c644 (patch)
treea6bc92ecd9affa58ef7a89aabb8d1e833d53b3d5
parent8510a7c275290f755930355f2ba764be8218e89e (diff)
downloadupstream-1923df90a42ec6284efa2d228700b2fd8720c644.tar.gz
upstream-1923df90a42ec6284efa2d228700b2fd8720c644.tar.bz2
upstream-1923df90a42ec6284efa2d228700b2fd8720c644.zip
[brcm47xx] finally fix boot failures on buffalo devices, tested on WHR-HP-G54 and WRT54GS v1.1 with no side effects (#4061)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15232 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/brcm47xx/config-2.6.282
-rw-r--r--target/linux/brcm47xx/patches-2.6.28/800-fix_cfe_detection.patch4
-rw-r--r--target/linux/brcm47xx/patches-2.6.28/900-disable_early_printk.patch10
3 files changed, 12 insertions, 4 deletions
diff --git a/target/linux/brcm47xx/config-2.6.28 b/target/linux/brcm47xx/config-2.6.28
index 79a6d725b1..71ff7df9f2 100644
--- a/target/linux/brcm47xx/config-2.6.28
+++ b/target/linux/brcm47xx/config-2.6.28
@@ -56,7 +56,6 @@ CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
CONFIG_DMA_NEED_PCI_MAP_STATE=y
CONFIG_DMA_NONCOHERENT=y
-CONFIG_EARLY_PRINTK=y
# CONFIG_FIXED_PHY is not set
# CONFIG_FREEZER is not set
CONFIG_GENERIC_CLOCKEVENTS=y
@@ -220,7 +219,6 @@ CONFIG_SSB_SERIAL=y
CONFIG_SSB_SPROM=y
CONFIG_SYSVIPC_SYSCTL=y
CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_SYS_HAS_EARLY_PRINTK=y
CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
diff --git a/target/linux/brcm47xx/patches-2.6.28/800-fix_cfe_detection.patch b/target/linux/brcm47xx/patches-2.6.28/800-fix_cfe_detection.patch
index 63a71f05f4..6cba540530 100644
--- a/target/linux/brcm47xx/patches-2.6.28/800-fix_cfe_detection.patch
+++ b/target/linux/brcm47xx/patches-2.6.28/800-fix_cfe_detection.patch
@@ -98,8 +98,8 @@
- prom_init_console();
- prom_init_cmdline();
+ if (prom_init_cfe() == 0) {
-+ prom_init_console_cfe();
-+ prom_init_cmdline_cfe();
++ //prom_init_console_cfe();
++ //prom_init_cmdline_cfe();
+ __prom_putchar = prom_putchar_cfe;
+ }
+
diff --git a/target/linux/brcm47xx/patches-2.6.28/900-disable_early_printk.patch b/target/linux/brcm47xx/patches-2.6.28/900-disable_early_printk.patch
new file mode 100644
index 0000000000..32b57764b2
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.28/900-disable_early_printk.patch
@@ -0,0 +1,10 @@
+--- linux-2.6.28.9/arch/mips/Kconfig 2009-04-17 10:43:28.000000000 +0200
++++ linux-2.6.28.9.new/arch/mips/Kconfig 2009-04-17 10:43:51.000000000 +0200
+@@ -56,7 +56,6 @@
+ select SSB_B43_PCI_BRIDGE if PCI
+ select SSB_PCICORE_HOSTMODE if PCI
+ select GENERIC_GPIO
+- select SYS_HAS_EARLY_PRINTK
+ select CFE
+ help
+ Support for BCM47XX based boards