[openwrt/openwrt] kernel: move kernel image cmdline hack to the octeon target

[LEDE Commits]

nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/36f2ab4bfd50f2db66c0988bfa703b0b2b72f10a

commit 36f2ab4bfd50f2db66c0988bfa703b0b2b72f10a
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Fri Sep 30 11:48:21 2022 +0200

    kernel: move kernel image cmdline hack to the octeon target
    
    It is the only remaining user of this hack
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 target/linux/ath79/config-5.10                             |  1 -
 target/linux/generic/config-5.10                           |  1 -
 target/linux/generic/config-5.15                           |  1 -
 .../patches-5.10/100-mips_image_cmdline_hack.patch}        |  0
 .../patches-5.15/100-mips_image_cmdline_hack.patch}        |  0
 target/linux/realtek/patches-5.10/312-rt9313-support.patch | 14 --------------
 6 files changed, 17 deletions(-)

diff --git a/target/linux/ath79/config-5.10 b/target/linux/ath79/config-5.10
index bdc4b74508..ac903aee6d 100644
--- a/target/linux/ath79/config-5.10
+++ b/target/linux/ath79/config-5.10
@@ -82,7 +82,6 @@ CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HZ_PERIODIC=y
-CONFIG_IMAGE_CMDLINE_HACK=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_IRQCHIP=y
 CONFIG_IRQ_DOMAIN=y
diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10
index 873fde044c..aa31aba756 100644
--- a/target/linux/generic/config-5.10
+++ b/target/linux/generic/config-5.10
@@ -2528,7 +2528,6 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_IKCONFIG_PROC is not set
 # CONFIG_IKHEADERS is not set
 # CONFIG_IMA is not set
-# CONFIG_IMAGE_CMDLINE_HACK is not set
 # CONFIG_IMGPDC_WDT is not set
 # CONFIG_IMG_MDC_DMA is not set
 # CONFIG_IMX7D_ADC is not set
diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15
index 547e3ac882..c1733ec7de 100644
--- a/target/linux/generic/config-5.15
+++ b/target/linux/generic/config-5.15
@@ -2619,7 +2619,6 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_IKCONFIG_PROC is not set
 # CONFIG_IKHEADERS is not set
 # CONFIG_IMA is not set
-# CONFIG_IMAGE_CMDLINE_HACK is not set
 # CONFIG_IMGPDC_WDT is not set
 # CONFIG_IMG_MDC_DMA is not set
 # CONFIG_IMX7D_ADC is not set
diff --git a/target/linux/generic/hack-5.10/301-mips_image_cmdline_hack.patch b/target/linux/octeon/patches-5.10/100-mips_image_cmdline_hack.patch
similarity index 100%
rename from target/linux/generic/hack-5.10/301-mips_image_cmdline_hack.patch
rename to target/linux/octeon/patches-5.10/100-mips_image_cmdline_hack.patch
diff --git a/target/linux/generic/hack-5.15/301-mips_image_cmdline_hack.patch b/target/linux/octeon/patches-5.15/100-mips_image_cmdline_hack.patch
similarity index 100%
rename from target/linux/generic/hack-5.15/301-mips_image_cmdline_hack.patch
rename to target/linux/octeon/patches-5.15/100-mips_image_cmdline_hack.patch
diff --git a/target/linux/realtek/patches-5.10/312-rt9313-support.patch b/target/linux/realtek/patches-5.10/312-rt9313-support.patch
index 37a61106d2..665dbe3e1c 100644
--- a/target/linux/realtek/patches-5.10/312-rt9313-support.patch
+++ b/target/linux/realtek/patches-5.10/312-rt9313-support.patch
@@ -44,20 +44,6 @@
  
  EXPORT(_stext)
  
-@@ -79,11 +81,13 @@ FEXPORT(__kernel_entry)
- 	j	kernel_entry
- #endif /* CONFIG_BOOT_RAW */
- 
-+#ifndef CONFIG_RTL931X
- #ifdef CONFIG_IMAGE_CMDLINE_HACK
- 	.ascii	"CMDLINE:"
- EXPORT(__image_cmdline)
- 	.fill	0x400
- #endif /* CONFIG_IMAGE_CMDLINE_HACK */
-+#endif
- 
- 	__REF
- 
 --- a/arch/mips/kernel/vmlinux.lds.S
 +++ b/arch/mips/kernel/vmlinux.lds.S
 @@ -55,7 +55,11 @@ SECTIONS