2021-11-04 20:52:43 +00:00
|
|
|
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
|
kernel: bump 5.15 to 5.15.145
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.145
No patches needed a rebase.
23.05 backport:
Rebased patch mediatek/100-dts-update-mt7622-rfb1.patch due to
changes introduced in commit e37aa926447f ("arm64: dts: mediatek:
mt7622: fix memory node warning check") in version v5.15.143 and we
jumped over from v5.15.139 directly to v5.15.145.
Build system: x86_64
Build-tested: ramips/tplink_archer-a6-v3
Run-tested: ramips/tplink_archer-a6-v3
23.05 backport:
Stijn:
Compile-tested: ath79/generic, ipq40xx/generic, mvebu/cortexa72, ramips/mt{7621,7620,76x8}, realtek/rtl{838x,930x}, 86/64.
Run-tested: cortexa72 (RB5009UG+S+IN), mt7621 (EAP615-Wall v1), rtl838x (GS1900-10HP, GS1900-8HP, GS108T v3).
Petr:
Compile-tested: ipq807x, mvebu/cortexa9
Run-tested: turris-omnia, prpl-haze
Tested-by: Stijn Segers <foss@volatilesystems.org> [23.05 testing]
Signed-off-by: John Audia <therealgraysky@proton.me>
Signed-off-by: Petr Štetiar <ynezz@true.cz> [23.05 refresh]
(cherry picked from commit 8de4cc77a6d5c25e48566d0203f159287ac7f3fe)
2023-12-23 11:52:06 +00:00
|
|
|
@@ -1183,6 +1183,10 @@ config MIPS_MSC
|
2021-11-04 20:52:43 +00:00
|
|
|
config SYNC_R4K
|
|
|
|
|
bool
|
|
|
|
|
|
|
|
|
|
+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 /* CONFIG_BOOT_RAW */
|
|
|
|
|
|
|
|
|
|
+#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
|
