diff options
| author | Felix Fietkau <nbd@nbd.name> | 2022-09-30 11:48:21 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2022-09-30 13:13:51 +0200 |
| commit | 36f2ab4bfd50f2db66c0988bfa703b0b2b72f10a (patch) | |
| tree | 87edc17a0bf2ceade11a5c12ba4b441978dbea81 | |
| parent | 2e375e9b3148cfdb9b19494a25eebc2fa7b256a3 (diff) | |
| download | upstream-36f2ab4bfd50f2db66c0988bfa703b0b2b72f10a.tar.gz upstream-36f2ab4bfd50f2db66c0988bfa703b0b2b72f10a.tar.bz2 upstream-36f2ab4bfd50f2db66c0988bfa703b0b2b72f10a.zip | |
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@nbd.name>
| -rw-r--r-- | target/linux/ath79/config-5.10 | 1 | ||||
| -rw-r--r-- | target/linux/generic/config-5.10 | 1 | ||||
| -rw-r--r-- | target/linux/generic/config-5.15 | 1 | ||||
| -rw-r--r-- | target/linux/octeon/patches-5.10/100-mips_image_cmdline_hack.patch (renamed from target/linux/generic/hack-5.10/301-mips_image_cmdline_hack.patch) | 0 | ||||
| -rw-r--r-- | target/linux/octeon/patches-5.15/100-mips_image_cmdline_hack.patch (renamed from target/linux/generic/hack-5.15/301-mips_image_cmdline_hack.patch) | 0 | ||||
| -rw-r--r-- | target/linux/realtek/patches-5.10/312-rt9313-support.patch | 14 |
6 files changed, 0 insertions, 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 index 4edf527246..4edf527246 100644 --- 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 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 index 15e233aceb..15e233aceb 100644 --- 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 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 |