finally fix boot failures on buffalo devices, tested on WHR-HP-G54 and WRT54GS v1.1 with no side effects (#4061)
SVN-Revision: 15232
This commit is contained in:
		@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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;
 | 
			
		||||
+	}
 | 
			
		||||
+
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
		Reference in New Issue
	
	Block a user