replace the mips_boot patch with one that makes BOOT_RAW selectable, and enable it...
authorImre Kaloz <kaloz@openwrt.org>
Mon, 24 Jan 2011 12:33:25 +0000 (12:33 +0000)
committerImre Kaloz <kaloz@openwrt.org>
Mon, 24 Jan 2011 12:33:25 +0000 (12:33 +0000)
SVN-Revision: 25088

target/linux/generic/config-2.6.38
target/linux/generic/patches-2.6.38/011-mips_boot.patch [deleted file]
target/linux/generic/patches-2.6.38/011-mips_expose_boot_raw.patch [new file with mode: 0644]

index 4d7733398b65ece1bafb694454d1afae16caba5c..a19be4289460f1730bec26e3c475dbf21236d532 100644 (file)
@@ -250,6 +250,7 @@ CONFIG_BLOCK=y
 # CONFIG_BNX2 is not set
 # CONFIG_BONDING is not set
 # CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_BOOT_RAW=y
 # CONFIG_BPQETHER is not set
 # CONFIG_BRCM80211 is not set
 # CONFIG_BRIDGE_EBT_802_3 is not set
diff --git a/target/linux/generic/patches-2.6.38/011-mips_boot.patch b/target/linux/generic/patches-2.6.38/011-mips_boot.patch
deleted file mode 100644 (file)
index c2a043a..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/kernel/head.S
-+++ b/arch/mips/kernel/head.S
-@@ -121,6 +121,8 @@
- #endif
-       .endm
-+      j kernel_entry
-+      nop
- #ifndef CONFIG_NO_EXCEPT_FILL
-       /*
-        * Reserved space for exception handlers.
diff --git a/target/linux/generic/patches-2.6.38/011-mips_expose_boot_raw.patch b/target/linux/generic/patches-2.6.38/011-mips_expose_boot_raw.patch
new file mode 100644 (file)
index 0000000..41b3784
--- /dev/null
@@ -0,0 +1,39 @@
+From: Mark Miller <mark@mirell.org>
+
+This exposes the CONFIG_BOOT_RAW symbol in Kconfig. This is needed on
+certain Broadcom chipsets running CFE in order to load the kernel.
+
+Signed-off-by: Mark Miller <mark@mirell.org>
+Acked-by: Rob Landley <rob@landley.net>
+---
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -802,9 +802,6 @@ config ARC
+ config ARCH_MAY_HAVE_PC_FDC
+       bool
+-config BOOT_RAW
+-      bool
+-
+ config CEVT_BCM1480
+       bool
+@@ -2240,6 +2237,18 @@ config USE_OF
+       help
+         Include support for flattened device tree machine descriptions.
++config BOOT_RAW
++      bool "Enable the kernel to be executed from the load address"
++      default n
++      help
++       Allow the kernel to be executed from the load address for
++       bootloaders which cannot read the ELF format. This places
++       a jump to start_kernel at the load address.
++
++       If unsure, say N.
++
++
++
+ endmenu
+ config LOCKDEP_SUPPORT