kernel: get rid of the simple_prom_emulator, it is not really useful

SVN-Revision: 17567

diff --git a/target/linux/adm5120/router_be/config-2.6.28 b/target/linux/adm5120/router_be/config-2.6.28
index 4cbb744f9a8bec847a384a921d8e5897f6551b81..bff855d0e42aa0ebd53c8fedb0033a60fb3cb117 100644 (file)
--- a/target/linux/adm5120/router_be/config-2.6.28
+++ b/target/linux/adm5120/router_be/config-2.6.28
@@ -149,7 +149,6 @@ CONFIG_PCI_DOMAINS=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
-# CONFIG_PROM_EMU is not set
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250 is not set

diff --git a/target/linux/adm5120/router_be/config-2.6.30 b/target/linux/adm5120/router_be/config-2.6.30
index 825ae755721b67c6a6be687da16f2c0bf5c2f3df..6635077de2a1c524f0b73a5b4ece04986e2095c3 100644 (file)
--- a/target/linux/adm5120/router_be/config-2.6.30
+++ b/target/linux/adm5120/router_be/config-2.6.30
@@ -162,7 +162,6 @@ CONFIG_PCI_DOMAINS=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
-# CONFIG_PROM_EMU is not set
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250 is not set

diff --git a/target/linux/adm5120/router_le/config-2.6.28 b/target/linux/adm5120/router_le/config-2.6.28
index 3bd82df7c90e8cddea674fc7ac5d1eb3db32ea72..24c0f8d42a8b5955e5efdd4481d81c4ac021ecb6 100644 (file)
--- a/target/linux/adm5120/router_le/config-2.6.28
+++ b/target/linux/adm5120/router_le/config-2.6.28
@@ -185,7 +185,6 @@ CONFIG_PCI_DOMAINS=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
-# CONFIG_PROM_EMU is not set
 # CONFIG_R6040 is not set
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_SCSI=m

diff --git a/target/linux/adm5120/router_le/config-2.6.30 b/target/linux/adm5120/router_le/config-2.6.30
index 519c7d62d581679b4b7e1b2b64a82ddf893481ef..538fed0b6c1d87ec926ff4aac3d9bbdf5e90191e 100644 (file)
--- a/target/linux/adm5120/router_le/config-2.6.30
+++ b/target/linux/adm5120/router_le/config-2.6.30
@@ -201,7 +201,6 @@ CONFIG_PCI_DOMAINS=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
-# CONFIG_PROM_EMU is not set
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_SCSI=m
 # CONFIG_SERIAL_8250 is not set

diff --git a/target/linux/ar7/config-2.6.27 b/target/linux/ar7/config-2.6.27
index 6f419ca15522891750418d8b57693d3ccf557de1..5c5ebbacfb614adbaba929adf9c1d7b414a57b6d 100644 (file)
--- a/target/linux/ar7/config-2.6.27
+++ b/target/linux/ar7/config-2.6.27
@@ -115,7 +115,6 @@ CONFIG_PHYLIB=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
-# CONFIG_PROM_EMU is not set
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set

diff --git a/target/linux/ar7/config-default b/target/linux/ar7/config-default
index f8c6f3c8edaeb2ec17cdf388b2899ad252a03b52..e47a151ed27a63a546f204907685b40db8561d89 100644 (file)
--- a/target/linux/ar7/config-default
+++ b/target/linux/ar7/config-default
@@ -116,7 +116,7 @@ CONFIG_PHYLIB=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
-# CONFIG_PROM_EMU is not set
+
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set

diff --git a/target/linux/ar71xx/config-2.6.28 b/target/linux/ar71xx/config-2.6.28
index aab637e4cf8382496087ad9669eebc33a5c59dab..539396ff6aca1937c8f3c6da8fd9a6dafb40759d 100644 (file)
--- a/target/linux/ar71xx/config-2.6.28
+++ b/target/linux/ar71xx/config-2.6.28
@@ -162,7 +162,6 @@ CONFIG_PHYLIB=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
-CONFIG_PROM_EMU=y
 # CONFIG_R6040 is not set
 CONFIG_RTL8306_PHY=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

diff --git a/target/linux/ar71xx/config-2.6.30 b/target/linux/ar71xx/config-2.6.30
index d717c3c1bb664f9b48b7f815d8a87375c4b32a68..cac69a5a5e135fad4929470ec69f6a95fd138e55 100644 (file)
--- a/target/linux/ar71xx/config-2.6.30
+++ b/target/linux/ar71xx/config-2.6.30
@@ -172,7 +172,6 @@ CONFIG_PHYLIB=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
-CONFIG_PROM_EMU=y
 CONFIG_RTL8306_PHY=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set

diff --git a/target/linux/ar71xx/config-2.6.31 b/target/linux/ar71xx/config-2.6.31
index eb70f1b44d755abbc695971beeb50b1d698d5333..579f48a7e791ba127a0fb37f07622e933d69252f 100644 (file)
--- a/target/linux/ar71xx/config-2.6.31
+++ b/target/linux/ar71xx/config-2.6.31
@@ -173,7 +173,6 @@ CONFIG_PHYLIB=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
-CONFIG_PROM_EMU=y
 CONFIG_RTL8306_PHY=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set

diff --git a/target/linux/ar71xx/patches-2.6.28/301-enable_prom_emulator.patch b/target/linux/ar71xx/patches-2.6.28/301-enable_prom_emulator.patch
deleted file mode 100644 (file)
index 5ed8046..0000000
--- a/target/linux/ar71xx/patches-2.6.28/301-enable_prom_emulator.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -36,6 +36,7 @@ config ATHEROS_AR71XX
-       select SYS_SUPPORTS_BIG_ENDIAN
-       select SYS_HAS_EARLY_PRINTK
-       select MIPS_MACHINE
-+      select PROM_EMU
-       help
-         Support for Atheros AR71xx based boards.
- 

diff --git a/target/linux/ar71xx/patches-2.6.30/301-enable_prom_emulator.patch b/target/linux/ar71xx/patches-2.6.30/301-enable_prom_emulator.patch
deleted file mode 100644 (file)
index 5ed8046..0000000
--- a/target/linux/ar71xx/patches-2.6.30/301-enable_prom_emulator.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -36,6 +36,7 @@ config ATHEROS_AR71XX
-       select SYS_SUPPORTS_BIG_ENDIAN
-       select SYS_HAS_EARLY_PRINTK
-       select MIPS_MACHINE
-+      select PROM_EMU
-       help
-         Support for Atheros AR71xx based boards.
- 

diff --git a/target/linux/ar71xx/patches-2.6.31/301-enable_prom_emulator.patch b/target/linux/ar71xx/patches-2.6.31/301-enable_prom_emulator.patch
deleted file mode 100644 (file)
index 8b1609b..0000000
--- a/target/linux/ar71xx/patches-2.6.31/301-enable_prom_emulator.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -56,6 +56,7 @@ config ATHEROS_AR71XX
-       select SYS_SUPPORTS_BIG_ENDIAN
-       select SYS_HAS_EARLY_PRINTK
-       select MIPS_MACHINE
-+      select PROM_EMU
-       help
-         Support for Atheros AR71xx based boards.
- 

diff --git a/target/linux/atheros/config-2.6.28 b/target/linux/atheros/config-2.6.28
index 888b7f4fd3c1f6fd68cdbd0d1aa8b57df363c954..03f44f9f6736e9e130b9b47f91410022ddd5c437 100644 (file)
--- a/target/linux/atheros/config-2.6.28
+++ b/target/linux/atheros/config-2.6.28
@@ -124,7 +124,6 @@ CONFIG_PHYLIB=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
-# CONFIG_PROM_EMU is not set
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set

diff --git a/target/linux/atheros/config-2.6.30 b/target/linux/atheros/config-2.6.30
index 11fc0220a47cdc51a75f616f9eb1a89d0c986ef1..c5730b51a33036f678f073786965ba21f2ba56fa 100644 (file)
--- a/target/linux/atheros/config-2.6.30
+++ b/target/linux/atheros/config-2.6.30
@@ -134,7 +134,6 @@ CONFIG_PHYLIB=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
-# CONFIG_PROM_EMU is not set
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set

diff --git a/target/linux/au1000/au1500/config-default b/target/linux/au1000/au1500/config-default
index e56e533ecd8e66fbfbc7cafb9762aa6f80cb98bb..1c227697221ae040885b22e692d8cb8d9bbe8cd8 100644 (file)
--- a/target/linux/au1000/au1500/config-default
+++ b/target/linux/au1000/au1500/config-default
@@ -153,7 +153,6 @@ CONFIG_PHYLIB=y
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
-# CONFIG_PROM_EMU is not set
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 CONFIG_SERIAL_8250_AU1X00=y

diff --git a/target/linux/brcm47xx/config-2.6.28 b/target/linux/brcm47xx/config-2.6.28
index 91920c79f994af91a1338cc43d70d829cf156eb5..581ef656228cd2caf63cffcd1beb3e50df3a9d9d 100644 (file)
--- a/target/linux/brcm47xx/config-2.6.28
+++ b/target/linux/brcm47xx/config-2.6.28
@@ -120,7 +120,6 @@ CONFIG_PHYLIB=y
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
 # CONFIG_PROC_KCORE is not set
-# CONFIG_PROM_EMU is not set
 # CONFIG_R6040 is not set
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set

diff --git a/target/linux/brcm47xx/config-2.6.30 b/target/linux/brcm47xx/config-2.6.30
index 77c42b61e38c211344cc26d90c68e7f02febe0ce..377485a89a63521cde8822a31c1552f12dc5fca5 100644 (file)
--- a/target/linux/brcm47xx/config-2.6.30
+++ b/target/linux/brcm47xx/config-2.6.30
@@ -130,7 +130,6 @@ CONFIG_PHYLIB=y
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
 # CONFIG_PROC_KCORE is not set
-# CONFIG_PROM_EMU is not set
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set

diff --git a/target/linux/brcm63xx/config-2.6.27 b/target/linux/brcm63xx/config-2.6.27
index 7264d7f4cd437128bf397dd72b57ea15b511184d..a947c1bbb59a601aef1ba40d09363a1296726950 100644 (file)
--- a/target/linux/brcm63xx/config-2.6.27
+++ b/target/linux/brcm63xx/config-2.6.27
@@ -158,7 +158,6 @@ CONFIG_PHYLIB=y
 # CONFIG_PNX8550_STB810 is not set
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_PROBE_INITRD_HEADER is not set
-# CONFIG_PROM_EMU is not set
 # CONFIG_R6040 is not set
 CONFIG_RELAY=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

diff --git a/target/linux/brcm63xx/config-2.6.28 b/target/linux/brcm63xx/config-2.6.28
index 97df382ddff90a593be9e6841989c8a64f6ebdec..c405f9f44448c75c64c21f08dc83a46f013f5225 100644 (file)
--- a/target/linux/brcm63xx/config-2.6.28
+++ b/target/linux/brcm63xx/config-2.6.28
@@ -155,7 +155,6 @@ CONFIG_PHYLIB=y
 # CONFIG_PNX8550_STB810 is not set
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_PROBE_INITRD_HEADER is not set
-# CONFIG_PROM_EMU is not set
 # CONFIG_R6040 is not set
 CONFIG_RELAY=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

diff --git a/target/linux/brcm63xx/config-2.6.30 b/target/linux/brcm63xx/config-2.6.30
index 7834448564633004e570ad546154112fe805d980..dc22ac9a273e49384b1d6b0d69e55cb436c3a734 100644 (file)
--- a/target/linux/brcm63xx/config-2.6.30
+++ b/target/linux/brcm63xx/config-2.6.30
@@ -169,7 +169,6 @@ CONFIG_PHYLIB=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
 # CONFIG_PROBE_INITRD_HEADER is not set
-# CONFIG_PROM_EMU is not set
 CONFIG_RELAY=y
 CONFIG_RING_BUFFER=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y

diff --git a/target/linux/cobalt/config-default b/target/linux/cobalt/config-default
index 37a6be634e0e06adcf7bf99ac86b4bee21980a9e..38256ea7166abfb304f0d47d966398dcbf154be6 100644 (file)
--- a/target/linux/cobalt/config-default
+++ b/target/linux/cobalt/config-default
@@ -304,7 +304,6 @@ CONFIG_PHYS_ADDR_T_64BIT=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 CONFIG_PROC_PAGE_MONITOR=y
-# CONFIG_PROM_EMU is not set
 CONFIG_RAID_ATTRS=y
 CONFIG_RELAY=y
 CONFIG_RTC_CLASS=y

diff --git a/target/linux/generic-2.6/patches-2.6.27/021-mips_simple_prom_emulator.patch b/target/linux/generic-2.6/patches-2.6.27/021-mips_simple_prom_emulator.patch
deleted file mode 100644 (file)
index 527abc4..0000000
--- a/target/linux/generic-2.6/patches-2.6.27/021-mips_simple_prom_emulator.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -770,6 +770,9 @@ config SYNC_R4K
- 
- config MIPS_MACHINE
-       def_bool n
-+      
-+config PROM_EMU
-+      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
-@@ -149,6 +149,15 @@ EXPORT(__image_cmdline)
-       .fill   0x400
- #endif /* CONFIG_IMAGE_CMDLINE_HACK */
- 
-+#ifdef CONFIG_PROM_EMU
-+EXPORT(prom_emu_argv)
-+      .word   0
-+      .word   prom_emu_cmdline
-+      .ascii  "CMDLINE:"
-+EXPORT(prom_emu_cmdline)
-+      .fill   0x400
-+#endif
-+
-       __REF
- 
- NESTED(kernel_entry, 16, sp)                  # kernel entry point
-@@ -189,6 +198,19 @@ NESTED(kernel_entry, 16, sp)                      # kernel 
-       LONG_S          zero, (t0)
-       bne             t0, t1, 1b
- 
-+#ifdef CONFIG_PROM_EMU
-+      PTR_LA          t0, prom_emu_cmdline
-+      LONG_L          t1, 0(t0)
-+      beqz            t1, 1f
-+
-+      li              a0, 2
-+      PTR_LA          a1, prom_emu_argv
-+      move            a2, zero
-+      move            a3, zero
-+
-+1:
-+#endif /* CONFIG_PROM_EMU */
-+
-       LONG_S          a0, fw_arg0             # firmware arguments
-       LONG_S          a1, fw_arg1
-       LONG_S          a2, fw_arg2

diff --git a/target/linux/generic-2.6/patches-2.6.28/021-mips_simple_prom_emulator.patch b/target/linux/generic-2.6/patches-2.6.28/021-mips_simple_prom_emulator.patch
deleted file mode 100644 (file)
index 5aa5245..0000000
--- a/target/linux/generic-2.6/patches-2.6.28/021-mips_simple_prom_emulator.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -765,6 +765,9 @@ config SYNC_R4K
- 
- config MIPS_MACHINE
-       def_bool n
-+      
-+config PROM_EMU
-+      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
-@@ -149,6 +149,15 @@ EXPORT(__image_cmdline)
-       .fill   0x400
- #endif /* CONFIG_IMAGE_CMDLINE_HACK */
- 
-+#ifdef CONFIG_PROM_EMU
-+EXPORT(prom_emu_argv)
-+      .word   0
-+      .word   prom_emu_cmdline
-+      .ascii  "CMDLINE:"
-+EXPORT(prom_emu_cmdline)
-+      .fill   0x400
-+#endif
-+
-       __REF
- 
- NESTED(kernel_entry, 16, sp)                  # kernel entry point
-@@ -189,6 +198,19 @@ NESTED(kernel_entry, 16, sp)                      # kernel 
-       LONG_S          zero, (t0)
-       bne             t0, t1, 1b
- 
-+#ifdef CONFIG_PROM_EMU
-+      PTR_LA          t0, prom_emu_cmdline
-+      LONG_L          t1, 0(t0)
-+      beqz            t1, 1f
-+
-+      li              a0, 2
-+      PTR_LA          a1, prom_emu_argv
-+      move            a2, zero
-+      move            a3, zero
-+
-+1:
-+#endif /* CONFIG_PROM_EMU */
-+
-       LONG_S          a0, fw_arg0             # firmware arguments
-       LONG_S          a1, fw_arg1
-       LONG_S          a2, fw_arg2

diff --git a/target/linux/generic-2.6/patches-2.6.30/021-mips_simple_prom_emulator.patch b/target/linux/generic-2.6/patches-2.6.30/021-mips_simple_prom_emulator.patch
deleted file mode 100644 (file)
index 80f402c..0000000
--- a/target/linux/generic-2.6/patches-2.6.30/021-mips_simple_prom_emulator.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -805,6 +805,9 @@ config SYNC_R4K
- 
- config MIPS_MACHINE
-       def_bool n
-+      
-+config PROM_EMU
-+      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
-@@ -149,6 +149,15 @@ EXPORT(__image_cmdline)
-       .fill   0x400
- #endif /* CONFIG_IMAGE_CMDLINE_HACK */
- 
-+#ifdef CONFIG_PROM_EMU
-+EXPORT(prom_emu_argv)
-+      .word   0
-+      .word   prom_emu_cmdline
-+      .ascii  "CMDLINE:"
-+EXPORT(prom_emu_cmdline)
-+      .fill   0x400
-+#endif
-+
-       __REF
- 
- NESTED(kernel_entry, 16, sp)                  # kernel entry point
-@@ -189,6 +198,19 @@ NESTED(kernel_entry, 16, sp)                      # kernel 
-       LONG_S          zero, (t0)
-       bne             t0, t1, 1b
- 
-+#ifdef CONFIG_PROM_EMU
-+      PTR_LA          t0, prom_emu_cmdline
-+      LONG_L          t1, 0(t0)
-+      beqz            t1, 1f
-+
-+      li              a0, 2
-+      PTR_LA          a1, prom_emu_argv
-+      move            a2, zero
-+      move            a3, zero
-+
-+1:
-+#endif /* CONFIG_PROM_EMU */
-+
-       LONG_S          a0, fw_arg0             # firmware arguments
-       LONG_S          a1, fw_arg1
-       LONG_S          a2, fw_arg2

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
deleted file mode 100644 (file)
index 3119420..0000000
--- a/target/linux/generic-2.6/patches-2.6.31/021-mips_simple_prom_emulator.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -839,6 +839,9 @@ config SYNC_R4K
- 
- config MIPS_MACHINE
-       def_bool n
-+      
-+config PROM_EMU
-+      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
-@@ -149,6 +149,15 @@ EXPORT(__image_cmdline)
-       .fill   0x400
- #endif /* CONFIG_IMAGE_CMDLINE_HACK */
- 
-+#ifdef CONFIG_PROM_EMU
-+EXPORT(prom_emu_argv)
-+      .word   0
-+      .word   prom_emu_cmdline
-+      .ascii  "CMDLINE:"
-+EXPORT(prom_emu_cmdline)
-+      .fill   0x400
-+#endif
-+
-       __REF
- 
- NESTED(kernel_entry, 16, sp)                  # kernel entry point
-@@ -189,6 +198,19 @@ NESTED(kernel_entry, 16, sp)                      # kernel 
-       LONG_S          zero, (t0)
-       bne             t0, t1, 1b
- 
-+#ifdef CONFIG_PROM_EMU
-+      PTR_LA          t0, prom_emu_cmdline
-+      LONG_L          t1, 0(t0)
-+      beqz            t1, 1f
-+
-+      li              a0, 2
-+      PTR_LA          a1, prom_emu_argv
-+      move            a2, zero
-+      move            a3, zero
-+
-+1:
-+#endif /* CONFIG_PROM_EMU */
-+
-       LONG_S          a0, fw_arg0             # firmware arguments
-       LONG_S          a1, fw_arg1
-       LONG_S          a2, fw_arg2

diff --git a/target/linux/ifxmips/config-2.6.27 b/target/linux/ifxmips/config-2.6.27
index eb621132f4bd3e84cc5d487171b86b66770b67a5..8003af5a0940118b9ae09d1cd0a1b5a727cb99d2 100644 (file)
--- a/target/linux/ifxmips/config-2.6.27
+++ b/target/linux/ifxmips/config-2.6.27
@@ -130,7 +130,6 @@ CONFIG_PCI_DOMAINS=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
-# CONFIG_PROM_EMU is not set
 # CONFIG_R6040 is not set
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_WAIT_SCAN is not set

diff --git a/target/linux/ifxmips/config-2.6.28 b/target/linux/ifxmips/config-2.6.28
index 0f9da8af30593d54aaebe6000416966a470d7ab0..a59c46ee8e40af6e574638121f0291edbbd58b18 100644 (file)
--- a/target/linux/ifxmips/config-2.6.28
+++ b/target/linux/ifxmips/config-2.6.28
@@ -125,7 +125,6 @@ CONFIG_PCI_DOMAINS=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
-# CONFIG_PROM_EMU is not set
 # CONFIG_R6040 is not set
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set

diff --git a/target/linux/octeon/config-default b/target/linux/octeon/config-default
index fce2682f72733f16e276a63ac1c1ab4d15764611..9511dc4eaf243c04242ec5038ed5c4af3d6e0278 100644 (file)
--- a/target/linux/octeon/config-default
+++ b/target/linux/octeon/config-default
@@ -228,7 +228,7 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
 # CONFIG_PROBE_INITRD_HEADER is not set
 CONFIG_PROC_PAGE_MONITOR=y
-# CONFIG_PROM_EMU is not set
+
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_RELAY=y

diff --git a/target/linux/ramips/rt288x/config-2.6.30 b/target/linux/ramips/rt288x/config-2.6.30
index dd83f64141b8c1c6e0a0dafcb36de35dac4136a2..db99f52247f3bc2172060c11e92e2e00445906d0 100644 (file)
--- a/target/linux/ramips/rt288x/config-2.6.30
+++ b/target/linux/ramips/rt288x/config-2.6.30
@@ -115,7 +115,6 @@ CONFIG_PHYLIB=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
-# CONFIG_PROM_EMU is not set
 CONFIG_RALINK_RT288X=y
 # CONFIG_RALINK_RT305X is not set
 CONFIG_RT288X_MACH_RT_N15=y

diff --git a/target/linux/ramips/rt305x/config-2.6.30 b/target/linux/ramips/rt305x/config-2.6.30
index c51b4cdd1089085254268ed04366a114b7db2eb0..c9598b216ce59ad46ef0942b60efc03dab69e979 100644 (file)
--- a/target/linux/ramips/rt305x/config-2.6.30
+++ b/target/linux/ramips/rt305x/config-2.6.30
@@ -113,7 +113,6 @@ CONFIG_PHYLIB=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
-# CONFIG_PROM_EMU is not set
 CONFIG_RALINK_DEV_GPIO_LEDS=y
 # CONFIG_RALINK_RT288X is not set
 CONFIG_RALINK_RT305X=y

diff --git a/target/linux/rb532/config-default b/target/linux/rb532/config-default
index 7e6fdd256204deb56615f837ee91f3c0215eb6f4..10f1d9c89d9d18097a4f9821202ce12ebd40446b 100644 (file)
--- a/target/linux/rb532/config-default
+++ b/target/linux/rb532/config-default
@@ -150,7 +150,6 @@ CONFIG_PCSPKR_PLATFORM=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
-# CONFIG_PROM_EMU is not set
 CONFIG_RC32434_WDT=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_SCSI=y