diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-09-10 18:30:20 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-09-10 18:30:20 +0000 |
| commit | 47c0d7419fb1decd5610b1a1347c16368501df0d (patch) | |
| tree | 27f4b920768aab0fd7e730d52cb3fd5f1a23315c | |
| parent | 967cc718f897f043cd441660e4ae25907838470e (diff) | |
| download | upstream-47c0d7419fb1decd5610b1a1347c16368501df0d.tar.gz upstream-47c0d7419fb1decd5610b1a1347c16368501df0d.tar.bz2 upstream-47c0d7419fb1decd5610b1a1347c16368501df0d.zip | |
kernel: get rid of the simple_prom_emulator, it is not really useful
SVN-Revision: 17567
31 files changed, 2 insertions, 254 deletions
diff --git a/target/linux/adm5120/router_be/config-2.6.28 b/target/linux/adm5120/router_be/config-2.6.28 index 4cbb744f9a..bff855d0e4 100644 --- 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 825ae75572..6635077de2 100644 --- 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 3bd82df7c9..24c0f8d42a 100644 --- 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 519c7d62d5..538fed0b6c 100644 --- 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 6f419ca155..5c5ebbacfb 100644 --- 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 f8c6f3c8ed..e47a151ed2 100644 --- 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 aab637e4cf..539396ff6a 100644 --- 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 d717c3c1bb..cac69a5a5e 100644 --- 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 eb70f1b44d..579f48a7e7 100644 --- 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 index 5ed804666c..0000000000 --- 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 index 5ed804666c..0000000000 --- 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 index 8b1609b1fa..0000000000 --- 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 888b7f4fd3..03f44f9f67 100644 --- 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 11fc0220a4..c5730b51a3 100644 --- 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 e56e533ecd..1c22769722 100644 --- 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 91920c79f9..581ef65622 100644 --- 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 77c42b61e3..377485a89a 100644 --- 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 7264d7f4cd..a947c1bbb5 100644 --- 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 97df382ddf..c405f9f444 100644 --- 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 7834448564..dc22ac9a27 100644 --- 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 37a6be634e..38256ea716 100644 --- 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 index 527abc4fc5..0000000000 --- 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 index 5aa5245d6e..0000000000 --- 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 index 80f402c4de..0000000000 --- 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 index 3119420dd0..0000000000 --- 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 eb621132f4..8003af5a09 100644 --- 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 0f9da8af30..a59c46ee8e 100644 --- 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 fce2682f72..9511dc4eaf 100644 --- 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 dd83f64141..db99f52247 100644 --- 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 c51b4cdd10..c9598b216c 100644 --- 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 7e6fdd2562..10f1d9c89d 100644 --- 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 |