mirror of https://github.com/hak5/openwrt-owl.git
kernel: get rid of the simple_prom_emulator, it is not really useful
SVN-Revision: 17567owl
parent
967cc718f8
commit
47c0d7419f
|
@ -149,7 +149,6 @@ CONFIG_PCI_DOMAINS=y
|
||||||
# CONFIG_PNX8550_JBS is not set
|
# CONFIG_PNX8550_JBS is not set
|
||||||
# CONFIG_PNX8550_STB810 is not set
|
# CONFIG_PNX8550_STB810 is not set
|
||||||
# CONFIG_PROBE_INITRD_HEADER 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_SCHED_NO_NO_OMIT_FRAME_POINTER=y
|
||||||
# CONFIG_SCSI_DMA is not set
|
# CONFIG_SCSI_DMA is not set
|
||||||
# CONFIG_SERIAL_8250 is not set
|
# CONFIG_SERIAL_8250 is not set
|
||||||
|
|
|
@ -162,7 +162,6 @@ CONFIG_PCI_DOMAINS=y
|
||||||
# CONFIG_PNX8550_JBS is not set
|
# CONFIG_PNX8550_JBS is not set
|
||||||
# CONFIG_PNX8550_STB810 is not set
|
# CONFIG_PNX8550_STB810 is not set
|
||||||
# CONFIG_PROBE_INITRD_HEADER is not set
|
# CONFIG_PROBE_INITRD_HEADER is not set
|
||||||
# CONFIG_PROM_EMU is not set
|
|
||||||
CONFIG_SCHED_OMIT_FRAME_POINTER=y
|
CONFIG_SCHED_OMIT_FRAME_POINTER=y
|
||||||
# CONFIG_SCSI_DMA is not set
|
# CONFIG_SCSI_DMA is not set
|
||||||
# CONFIG_SERIAL_8250 is not set
|
# CONFIG_SERIAL_8250 is not set
|
||||||
|
|
|
@ -185,7 +185,6 @@ CONFIG_PCI_DOMAINS=y
|
||||||
# CONFIG_PNX8550_JBS is not set
|
# CONFIG_PNX8550_JBS is not set
|
||||||
# CONFIG_PNX8550_STB810 is not set
|
# CONFIG_PNX8550_STB810 is not set
|
||||||
# CONFIG_PROBE_INITRD_HEADER is not set
|
# CONFIG_PROBE_INITRD_HEADER is not set
|
||||||
# CONFIG_PROM_EMU is not set
|
|
||||||
# CONFIG_R6040 is not set
|
# CONFIG_R6040 is not set
|
||||||
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
|
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
|
||||||
CONFIG_SCSI=m
|
CONFIG_SCSI=m
|
||||||
|
|
|
@ -201,7 +201,6 @@ CONFIG_PCI_DOMAINS=y
|
||||||
# CONFIG_PNX8550_JBS is not set
|
# CONFIG_PNX8550_JBS is not set
|
||||||
# CONFIG_PNX8550_STB810 is not set
|
# CONFIG_PNX8550_STB810 is not set
|
||||||
# CONFIG_PROBE_INITRD_HEADER is not set
|
# CONFIG_PROBE_INITRD_HEADER is not set
|
||||||
# CONFIG_PROM_EMU is not set
|
|
||||||
CONFIG_SCHED_OMIT_FRAME_POINTER=y
|
CONFIG_SCHED_OMIT_FRAME_POINTER=y
|
||||||
CONFIG_SCSI=m
|
CONFIG_SCSI=m
|
||||||
# CONFIG_SERIAL_8250 is not set
|
# CONFIG_SERIAL_8250 is not set
|
||||||
|
|
|
@ -115,7 +115,6 @@ CONFIG_PHYLIB=y
|
||||||
# CONFIG_PNX8550_JBS is not set
|
# CONFIG_PNX8550_JBS is not set
|
||||||
# CONFIG_PNX8550_STB810 is not set
|
# CONFIG_PNX8550_STB810 is not set
|
||||||
# CONFIG_PROBE_INITRD_HEADER 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_SCHED_NO_NO_OMIT_FRAME_POINTER=y
|
||||||
# CONFIG_SCSI_DMA is not set
|
# CONFIG_SCSI_DMA is not set
|
||||||
# CONFIG_SERIAL_8250_EXTENDED is not set
|
# CONFIG_SERIAL_8250_EXTENDED is not set
|
||||||
|
|
|
@ -116,7 +116,7 @@ CONFIG_PHYLIB=y
|
||||||
# CONFIG_PNX8550_JBS is not set
|
# CONFIG_PNX8550_JBS is not set
|
||||||
# CONFIG_PNX8550_STB810 is not set
|
# CONFIG_PNX8550_STB810 is not set
|
||||||
# CONFIG_PROBE_INITRD_HEADER is not set
|
# CONFIG_PROBE_INITRD_HEADER is not set
|
||||||
# CONFIG_PROM_EMU is not set
|
|
||||||
CONFIG_SCHED_OMIT_FRAME_POINTER=y
|
CONFIG_SCHED_OMIT_FRAME_POINTER=y
|
||||||
# CONFIG_SCSI_DMA is not set
|
# CONFIG_SCSI_DMA is not set
|
||||||
# CONFIG_SERIAL_8250_EXTENDED is not set
|
# CONFIG_SERIAL_8250_EXTENDED is not set
|
||||||
|
|
|
@ -162,7 +162,6 @@ CONFIG_PHYLIB=y
|
||||||
# CONFIG_PNX8550_JBS is not set
|
# CONFIG_PNX8550_JBS is not set
|
||||||
# CONFIG_PNX8550_STB810 is not set
|
# CONFIG_PNX8550_STB810 is not set
|
||||||
# CONFIG_PROBE_INITRD_HEADER is not set
|
# CONFIG_PROBE_INITRD_HEADER is not set
|
||||||
CONFIG_PROM_EMU=y
|
|
||||||
# CONFIG_R6040 is not set
|
# CONFIG_R6040 is not set
|
||||||
CONFIG_RTL8306_PHY=y
|
CONFIG_RTL8306_PHY=y
|
||||||
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
|
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
|
||||||
|
|
|
@ -172,7 +172,6 @@ CONFIG_PHYLIB=y
|
||||||
# CONFIG_PNX8550_JBS is not set
|
# CONFIG_PNX8550_JBS is not set
|
||||||
# CONFIG_PNX8550_STB810 is not set
|
# CONFIG_PNX8550_STB810 is not set
|
||||||
# CONFIG_PROBE_INITRD_HEADER is not set
|
# CONFIG_PROBE_INITRD_HEADER is not set
|
||||||
CONFIG_PROM_EMU=y
|
|
||||||
CONFIG_RTL8306_PHY=y
|
CONFIG_RTL8306_PHY=y
|
||||||
CONFIG_SCHED_OMIT_FRAME_POINTER=y
|
CONFIG_SCHED_OMIT_FRAME_POINTER=y
|
||||||
# CONFIG_SCSI_DMA is not set
|
# CONFIG_SCSI_DMA is not set
|
||||||
|
|
|
@ -173,7 +173,6 @@ CONFIG_PHYLIB=y
|
||||||
# CONFIG_PNX8550_JBS is not set
|
# CONFIG_PNX8550_JBS is not set
|
||||||
# CONFIG_PNX8550_STB810 is not set
|
# CONFIG_PNX8550_STB810 is not set
|
||||||
# CONFIG_PROBE_INITRD_HEADER is not set
|
# CONFIG_PROBE_INITRD_HEADER is not set
|
||||||
CONFIG_PROM_EMU=y
|
|
||||||
CONFIG_RTL8306_PHY=y
|
CONFIG_RTL8306_PHY=y
|
||||||
CONFIG_SCHED_OMIT_FRAME_POINTER=y
|
CONFIG_SCHED_OMIT_FRAME_POINTER=y
|
||||||
# CONFIG_SCSI_DMA is not set
|
# CONFIG_SCSI_DMA is not set
|
||||||
|
|
|
@ -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.
|
|
||||||
|
|
|
@ -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.
|
|
||||||
|
|
|
@ -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.
|
|
||||||
|
|
|
@ -124,7 +124,6 @@ CONFIG_PHYLIB=y
|
||||||
# CONFIG_PNX8550_JBS is not set
|
# CONFIG_PNX8550_JBS is not set
|
||||||
# CONFIG_PNX8550_STB810 is not set
|
# CONFIG_PNX8550_STB810 is not set
|
||||||
# CONFIG_PROBE_INITRD_HEADER 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_SCHED_NO_NO_OMIT_FRAME_POINTER=y
|
||||||
# CONFIG_SCSI_DMA is not set
|
# CONFIG_SCSI_DMA is not set
|
||||||
# CONFIG_SERIAL_8250_EXTENDED is not set
|
# CONFIG_SERIAL_8250_EXTENDED is not set
|
||||||
|
|
|
@ -134,7 +134,6 @@ CONFIG_PHYLIB=y
|
||||||
# CONFIG_PNX8550_JBS is not set
|
# CONFIG_PNX8550_JBS is not set
|
||||||
# CONFIG_PNX8550_STB810 is not set
|
# CONFIG_PNX8550_STB810 is not set
|
||||||
# CONFIG_PROBE_INITRD_HEADER is not set
|
# CONFIG_PROBE_INITRD_HEADER is not set
|
||||||
# CONFIG_PROM_EMU is not set
|
|
||||||
CONFIG_SCHED_OMIT_FRAME_POINTER=y
|
CONFIG_SCHED_OMIT_FRAME_POINTER=y
|
||||||
# CONFIG_SCSI_DMA is not set
|
# CONFIG_SCSI_DMA is not set
|
||||||
# CONFIG_SERIAL_8250_EXTENDED is not set
|
# CONFIG_SERIAL_8250_EXTENDED is not set
|
||||||
|
|
|
@ -153,7 +153,6 @@ CONFIG_PHYLIB=y
|
||||||
# CONFIG_PNX8550_STB810 is not set
|
# CONFIG_PNX8550_STB810 is not set
|
||||||
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
|
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
|
||||||
# CONFIG_PROBE_INITRD_HEADER is not set
|
# CONFIG_PROBE_INITRD_HEADER is not set
|
||||||
# CONFIG_PROM_EMU is not set
|
|
||||||
CONFIG_SCHED_OMIT_FRAME_POINTER=y
|
CONFIG_SCHED_OMIT_FRAME_POINTER=y
|
||||||
# CONFIG_SCSI_DMA is not set
|
# CONFIG_SCSI_DMA is not set
|
||||||
CONFIG_SERIAL_8250_AU1X00=y
|
CONFIG_SERIAL_8250_AU1X00=y
|
||||||
|
|
|
@ -120,7 +120,6 @@ CONFIG_PHYLIB=y
|
||||||
# CONFIG_PNX8550_STB810 is not set
|
# CONFIG_PNX8550_STB810 is not set
|
||||||
# CONFIG_PROBE_INITRD_HEADER is not set
|
# CONFIG_PROBE_INITRD_HEADER is not set
|
||||||
# CONFIG_PROC_KCORE is not set
|
# CONFIG_PROC_KCORE is not set
|
||||||
# CONFIG_PROM_EMU is not set
|
|
||||||
# CONFIG_R6040 is not set
|
# CONFIG_R6040 is not set
|
||||||
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
|
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
|
||||||
# CONFIG_SCSI_DMA is not set
|
# CONFIG_SCSI_DMA is not set
|
||||||
|
|
|
@ -130,7 +130,6 @@ CONFIG_PHYLIB=y
|
||||||
# CONFIG_PNX8550_STB810 is not set
|
# CONFIG_PNX8550_STB810 is not set
|
||||||
# CONFIG_PROBE_INITRD_HEADER is not set
|
# CONFIG_PROBE_INITRD_HEADER is not set
|
||||||
# CONFIG_PROC_KCORE is not set
|
# CONFIG_PROC_KCORE is not set
|
||||||
# CONFIG_PROM_EMU is not set
|
|
||||||
CONFIG_SCHED_OMIT_FRAME_POINTER=y
|
CONFIG_SCHED_OMIT_FRAME_POINTER=y
|
||||||
# CONFIG_SCSI_DMA is not set
|
# CONFIG_SCSI_DMA is not set
|
||||||
# CONFIG_SERIAL_8250_DETECT_IRQ is not set
|
# CONFIG_SERIAL_8250_DETECT_IRQ is not set
|
||||||
|
|
|
@ -158,7 +158,6 @@ CONFIG_PHYLIB=y
|
||||||
# CONFIG_PNX8550_STB810 is not set
|
# CONFIG_PNX8550_STB810 is not set
|
||||||
CONFIG_POSIX_MQUEUE=y
|
CONFIG_POSIX_MQUEUE=y
|
||||||
# CONFIG_PROBE_INITRD_HEADER is not set
|
# CONFIG_PROBE_INITRD_HEADER is not set
|
||||||
# CONFIG_PROM_EMU is not set
|
|
||||||
# CONFIG_R6040 is not set
|
# CONFIG_R6040 is not set
|
||||||
CONFIG_RELAY=y
|
CONFIG_RELAY=y
|
||||||
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
|
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
|
||||||
|
|
|
@ -155,7 +155,6 @@ CONFIG_PHYLIB=y
|
||||||
# CONFIG_PNX8550_STB810 is not set
|
# CONFIG_PNX8550_STB810 is not set
|
||||||
CONFIG_POSIX_MQUEUE=y
|
CONFIG_POSIX_MQUEUE=y
|
||||||
# CONFIG_PROBE_INITRD_HEADER is not set
|
# CONFIG_PROBE_INITRD_HEADER is not set
|
||||||
# CONFIG_PROM_EMU is not set
|
|
||||||
# CONFIG_R6040 is not set
|
# CONFIG_R6040 is not set
|
||||||
CONFIG_RELAY=y
|
CONFIG_RELAY=y
|
||||||
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
|
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
|
||||||
|
|
|
@ -169,7 +169,6 @@ CONFIG_PHYLIB=y
|
||||||
CONFIG_POSIX_MQUEUE=y
|
CONFIG_POSIX_MQUEUE=y
|
||||||
CONFIG_POSIX_MQUEUE_SYSCTL=y
|
CONFIG_POSIX_MQUEUE_SYSCTL=y
|
||||||
# CONFIG_PROBE_INITRD_HEADER is not set
|
# CONFIG_PROBE_INITRD_HEADER is not set
|
||||||
# CONFIG_PROM_EMU is not set
|
|
||||||
CONFIG_RELAY=y
|
CONFIG_RELAY=y
|
||||||
CONFIG_RING_BUFFER=y
|
CONFIG_RING_BUFFER=y
|
||||||
CONFIG_SCHED_OMIT_FRAME_POINTER=y
|
CONFIG_SCHED_OMIT_FRAME_POINTER=y
|
||||||
|
|
|
@ -304,7 +304,6 @@ CONFIG_PHYS_ADDR_T_64BIT=y
|
||||||
# CONFIG_PNX8550_JBS is not set
|
# CONFIG_PNX8550_JBS is not set
|
||||||
# CONFIG_PNX8550_STB810 is not set
|
# CONFIG_PNX8550_STB810 is not set
|
||||||
CONFIG_PROC_PAGE_MONITOR=y
|
CONFIG_PROC_PAGE_MONITOR=y
|
||||||
# CONFIG_PROM_EMU is not set
|
|
||||||
CONFIG_RAID_ATTRS=y
|
CONFIG_RAID_ATTRS=y
|
||||||
CONFIG_RELAY=y
|
CONFIG_RELAY=y
|
||||||
CONFIG_RTC_CLASS=y
|
CONFIG_RTC_CLASS=y
|
||||||
|
|
|
@ -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
|
|
|
@ -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
|
|
|
@ -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
|
|
|
@ -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
|
|
|
@ -130,7 +130,6 @@ CONFIG_PCI_DOMAINS=y
|
||||||
# CONFIG_PNX8550_JBS is not set
|
# CONFIG_PNX8550_JBS is not set
|
||||||
# CONFIG_PNX8550_STB810 is not set
|
# CONFIG_PNX8550_STB810 is not set
|
||||||
# CONFIG_PROBE_INITRD_HEADER is not set
|
# CONFIG_PROBE_INITRD_HEADER is not set
|
||||||
# CONFIG_PROM_EMU is not set
|
|
||||||
# CONFIG_R6040 is not set
|
# CONFIG_R6040 is not set
|
||||||
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
|
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
|
||||||
# CONFIG_SCSI_WAIT_SCAN is not set
|
# CONFIG_SCSI_WAIT_SCAN is not set
|
||||||
|
|
|
@ -125,7 +125,6 @@ CONFIG_PCI_DOMAINS=y
|
||||||
# CONFIG_PNX8550_JBS is not set
|
# CONFIG_PNX8550_JBS is not set
|
||||||
# CONFIG_PNX8550_STB810 is not set
|
# CONFIG_PNX8550_STB810 is not set
|
||||||
# CONFIG_PROBE_INITRD_HEADER is not set
|
# CONFIG_PROBE_INITRD_HEADER is not set
|
||||||
# CONFIG_PROM_EMU is not set
|
|
||||||
# CONFIG_R6040 is not set
|
# CONFIG_R6040 is not set
|
||||||
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
|
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
|
||||||
# CONFIG_SCSI_DMA is not set
|
# CONFIG_SCSI_DMA is not set
|
||||||
|
|
|
@ -228,7 +228,7 @@ CONFIG_POSIX_MQUEUE=y
|
||||||
CONFIG_POSIX_MQUEUE_SYSCTL=y
|
CONFIG_POSIX_MQUEUE_SYSCTL=y
|
||||||
# CONFIG_PROBE_INITRD_HEADER is not set
|
# CONFIG_PROBE_INITRD_HEADER is not set
|
||||||
CONFIG_PROC_PAGE_MONITOR=y
|
CONFIG_PROC_PAGE_MONITOR=y
|
||||||
# CONFIG_PROM_EMU is not set
|
|
||||||
# CONFIG_PROVE_LOCKING is not set
|
# CONFIG_PROVE_LOCKING is not set
|
||||||
# CONFIG_RCU_TORTURE_TEST is not set
|
# CONFIG_RCU_TORTURE_TEST is not set
|
||||||
CONFIG_RELAY=y
|
CONFIG_RELAY=y
|
||||||
|
|
|
@ -115,7 +115,6 @@ CONFIG_PHYLIB=y
|
||||||
# CONFIG_PNX8550_JBS is not set
|
# CONFIG_PNX8550_JBS is not set
|
||||||
# CONFIG_PNX8550_STB810 is not set
|
# CONFIG_PNX8550_STB810 is not set
|
||||||
# CONFIG_PROBE_INITRD_HEADER is not set
|
# CONFIG_PROBE_INITRD_HEADER is not set
|
||||||
# CONFIG_PROM_EMU is not set
|
|
||||||
CONFIG_RALINK_RT288X=y
|
CONFIG_RALINK_RT288X=y
|
||||||
# CONFIG_RALINK_RT305X is not set
|
# CONFIG_RALINK_RT305X is not set
|
||||||
CONFIG_RT288X_MACH_RT_N15=y
|
CONFIG_RT288X_MACH_RT_N15=y
|
||||||
|
|
|
@ -113,7 +113,6 @@ CONFIG_PHYLIB=y
|
||||||
# CONFIG_PNX8550_JBS is not set
|
# CONFIG_PNX8550_JBS is not set
|
||||||
# CONFIG_PNX8550_STB810 is not set
|
# CONFIG_PNX8550_STB810 is not set
|
||||||
# CONFIG_PROBE_INITRD_HEADER is not set
|
# CONFIG_PROBE_INITRD_HEADER is not set
|
||||||
# CONFIG_PROM_EMU is not set
|
|
||||||
CONFIG_RALINK_DEV_GPIO_LEDS=y
|
CONFIG_RALINK_DEV_GPIO_LEDS=y
|
||||||
# CONFIG_RALINK_RT288X is not set
|
# CONFIG_RALINK_RT288X is not set
|
||||||
CONFIG_RALINK_RT305X=y
|
CONFIG_RALINK_RT305X=y
|
||||||
|
|
|
@ -150,7 +150,6 @@ CONFIG_PCSPKR_PLATFORM=y
|
||||||
# CONFIG_PNX8550_JBS is not set
|
# CONFIG_PNX8550_JBS is not set
|
||||||
# CONFIG_PNX8550_STB810 is not set
|
# CONFIG_PNX8550_STB810 is not set
|
||||||
# CONFIG_PROBE_INITRD_HEADER is not set
|
# CONFIG_PROBE_INITRD_HEADER is not set
|
||||||
# CONFIG_PROM_EMU is not set
|
|
||||||
CONFIG_RC32434_WDT=y
|
CONFIG_RC32434_WDT=y
|
||||||
CONFIG_SCHED_OMIT_FRAME_POINTER=y
|
CONFIG_SCHED_OMIT_FRAME_POINTER=y
|
||||||
CONFIG_SCSI=y
|
CONFIG_SCSI=y
|
||||||
|
|
Loading…
Reference in New Issue