merge r15232 to 8.09

SVN-Revision: 15233

diff --git a/target/linux/brcm47xx/config-2.6.25 b/target/linux/brcm47xx/config-2.6.25
index 544e7b5213dd1ccb5bd564d9dd830e8696f0d897..497d322cf36d48689c8325ecc5de535cf3e1be00 100644 (file)
--- a/target/linux/brcm47xx/config-2.6.25
+++ b/target/linux/brcm47xx/config-2.6.25
@@ -68,7 +68,6 @@ CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DMA_NONCOHERENT=y
 # CONFIG_E100 is not set
 # CONFIG_E1000E_ENABLED is not set
-CONFIG_EARLY_PRINTK=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -244,7 +243,6 @@ CONFIG_SSB_SERIAL=y
 # CONFIG_SSB_SILENT is not set
 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.25/800-fix_cfe_detection.patch b/target/linux/brcm47xx/patches-2.6.25/800-fix_cfe_detection.patch
index e72f99e8038ac0ecdb4fd5315f34a2d997dfede0..03aafeb31aaee71ac9eb54d73c85fc0b446542b4 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.25/800-fix_cfe_detection.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/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.25/900-disable_early_printk.patch b/target/linux/brcm47xx/patches-2.6.25/900-disable_early_printk.patch
new file mode 100644 (file)
index 0000000..32b5776
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.25/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