mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 17:48:58 +00:00
f80272dd9c
Refreshed all patches. Remove upstreamed: - 302-0002-dmaengine-dw-implement-per-channel-protection-contro.patch Fixes: - CVE-2019-19332 Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
39 lines
900 B
Diff
39 lines
900 B
Diff
From: John Crispin <john@phrozen.org>
|
|
Subject: hack: kernel: add generic image_cmdline hack to MIPS targets
|
|
|
|
lede-commit: d59f5b3a987a48508257a0ddbaeadc7909f9f976
|
|
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|
---
|
|
arch/mips/Kconfig | 4 ++++
|
|
arch/mips/kernel/head.S | 6 ++++++
|
|
2 files changed, 10 insertions(+)
|
|
|
|
--- a/arch/mips/Kconfig
|
|
+++ b/arch/mips/Kconfig
|
|
@@ -1159,6 +1159,10 @@ config SYNC_R4K
|
|
config MIPS_MACHINE
|
|
def_bool n
|
|
|
|
+config IMAGE_CMDLINE_HACK
|
|
+ bool "OpenWrt specific image command line hack"
|
|
+ default n
|
|
+
|
|
config NO_IOPORT_MAP
|
|
def_bool n
|
|
|
|
--- a/arch/mips/kernel/head.S
|
|
+++ b/arch/mips/kernel/head.S
|
|
@@ -79,6 +79,12 @@ FEXPORT(__kernel_entry)
|
|
j kernel_entry
|
|
#endif
|
|
|
|
+#ifdef CONFIG_IMAGE_CMDLINE_HACK
|
|
+ .ascii "CMDLINE:"
|
|
+EXPORT(__image_cmdline)
|
|
+ .fill 0x400
|
|
+#endif /* CONFIG_IMAGE_CMDLINE_HACK */
|
|
+
|
|
__REF
|
|
|
|
NESTED(kernel_entry, 16, sp) # kernel entry point
|