ar71xx: rewrite prom code (based on a patch by Jeff Hansen)

[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / patches-2.6.31 / 021-mips_simple_prom_emulator.patch

diff --git a/target/linux/generic-2.6/patches-2.6.31/021-mips_simple_prom_emulator.patch b/target/linux/generic-2.6/patches-2.6.31/021-mips_simple_prom_emulator.patch
index b53ca3f50554001199effb65fc69df84cde910a6..3119420dd0af43be9d8b783c2261074c2fa887b8 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.31/021-mips_simple_prom_emulator.patch
+++ b/target/linux/generic-2.6/patches-2.6.31/021-mips_simple_prom_emulator.patch
@@ -8,13 +8,13 @@
 +config PROM_EMU
 +      def_bool n
  
- config NO_IOPORT
-       def_bool n
+ config IMAGE_CMDLINE_HACK
+       bool "OpenWrt specific image command line hack"
 --- a/arch/mips/kernel/head.S
 +++ b/arch/mips/kernel/head.S
-@@ -143,6 +143,15 @@ FEXPORT(__kernel_entry)
-       j       kernel_entry
- #endif
+@@ -149,6 +149,15 @@ EXPORT(__image_cmdline)
+       .fill   0x400
+ #endif /* CONFIG_IMAGE_CMDLINE_HACK */
  
 +#ifdef CONFIG_PROM_EMU
 +EXPORT(prom_emu_argv)
@@ -28,7 +28,7 @@
        __REF
  
  NESTED(kernel_entry, 16, sp)                  # kernel entry point
-@@ -183,6 +192,19 @@ NESTED(kernel_entry, 16, sp)                      # kernel 
+@@ -189,6 +198,19 @@ NESTED(kernel_entry, 16, sp)                      # kernel 
        LONG_S          zero, (t0)
        bne             t0, t1, 1b