diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2011-01-24 12:33:25 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2011-01-24 12:33:25 +0000 |
| commit | 2262fa9f1527ecf966e9ceeded77389d57345803 (patch) | |
| tree | 1d4805099c4ac12e789906d39137a35bc60c6017 | |
| parent | 979b095c40dab788960628595804530b23b7bf5f (diff) | |
| download | upstream-2262fa9f1527ecf966e9ceeded77389d57345803.tar.gz upstream-2262fa9f1527ecf966e9ceeded77389d57345803.tar.bz2 upstream-2262fa9f1527ecf966e9ceeded77389d57345803.zip | |
replace the mips_boot patch with one that makes BOOT_RAW selectable, and enable it in the generic config
SVN-Revision: 25088
| -rw-r--r-- | target/linux/generic/config-2.6.38 | 1 | ||||
| -rw-r--r-- | target/linux/generic/patches-2.6.38/011-mips_boot.patch | 11 | ||||
| -rw-r--r-- | target/linux/generic/patches-2.6.38/011-mips_expose_boot_raw.patch | 39 |
3 files changed, 40 insertions, 11 deletions
diff --git a/target/linux/generic/config-2.6.38 b/target/linux/generic/config-2.6.38 index 4d7733398b..a19be42894 100644 --- a/target/linux/generic/config-2.6.38 +++ b/target/linux/generic/config-2.6.38 @@ -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 index c2a043acde..0000000000 --- a/target/linux/generic/patches-2.6.38/011-mips_boot.patch +++ /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 index 0000000000..41b3784daa --- /dev/null +++ b/target/linux/generic/patches-2.6.38/011-mips_expose_boot_raw.patch @@ -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 |