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 | 9ebc3c57549b66d32bbc207172bc5d5f45924b51 (patch) | |
| tree | a23faf346408c6de00a1a5d052d555768845ba63 /target/linux/generic/patches-2.6.38 | |
| parent | 4f862cc31b53c9431ef4de1e0a35519eb6a7af37 (diff) | |
| download | upstream-9ebc3c57549b66d32bbc207172bc5d5f45924b51.tar.gz upstream-9ebc3c57549b66d32bbc207172bc5d5f45924b51.tar.bz2 upstream-9ebc3c57549b66d32bbc207172bc5d5f45924b51.zip | |
[target/generic/2.6.38]: replace the mips_boot patch with one that makes BOOT_RAW selectable, and enable it in the generic config
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25088 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.38')
| -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 |
2 files changed, 39 insertions, 11 deletions
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 |