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>
This commit is contained in:
		| @@ -82,7 +82,6 @@ CONFIG_HAS_DMA=y | |||||||
| CONFIG_HAS_IOMEM=y | CONFIG_HAS_IOMEM=y | ||||||
| CONFIG_HAS_IOPORT_MAP=y | CONFIG_HAS_IOPORT_MAP=y | ||||||
| CONFIG_HZ_PERIODIC=y | CONFIG_HZ_PERIODIC=y | ||||||
| CONFIG_IMAGE_CMDLINE_HACK=y |  | ||||||
| CONFIG_INITRAMFS_SOURCE="" | CONFIG_INITRAMFS_SOURCE="" | ||||||
| CONFIG_IRQCHIP=y | CONFIG_IRQCHIP=y | ||||||
| CONFIG_IRQ_DOMAIN=y | CONFIG_IRQ_DOMAIN=y | ||||||
|   | |||||||
| @@ -2528,7 +2528,6 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 | |||||||
| # CONFIG_IKCONFIG_PROC is not set | # CONFIG_IKCONFIG_PROC is not set | ||||||
| # CONFIG_IKHEADERS is not set | # CONFIG_IKHEADERS is not set | ||||||
| # CONFIG_IMA is not set | # CONFIG_IMA is not set | ||||||
| # CONFIG_IMAGE_CMDLINE_HACK is not set |  | ||||||
| # CONFIG_IMGPDC_WDT is not set | # CONFIG_IMGPDC_WDT is not set | ||||||
| # CONFIG_IMG_MDC_DMA is not set | # CONFIG_IMG_MDC_DMA is not set | ||||||
| # CONFIG_IMX7D_ADC is not set | # CONFIG_IMX7D_ADC is not set | ||||||
|   | |||||||
| @@ -2619,7 +2619,6 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 | |||||||
| # CONFIG_IKCONFIG_PROC is not set | # CONFIG_IKCONFIG_PROC is not set | ||||||
| # CONFIG_IKHEADERS is not set | # CONFIG_IKHEADERS is not set | ||||||
| # CONFIG_IMA is not set | # CONFIG_IMA is not set | ||||||
| # CONFIG_IMAGE_CMDLINE_HACK is not set |  | ||||||
| # CONFIG_IMGPDC_WDT is not set | # CONFIG_IMGPDC_WDT is not set | ||||||
| # CONFIG_IMG_MDC_DMA is not set | # CONFIG_IMG_MDC_DMA is not set | ||||||
| # CONFIG_IMX7D_ADC is not set | # CONFIG_IMX7D_ADC is not set | ||||||
|   | |||||||
| @@ -44,20 +44,6 @@ | |||||||
|   |   | ||||||
|  EXPORT(_stext) |  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 | --- a/arch/mips/kernel/vmlinux.lds.S | ||||||
| +++ b/arch/mips/kernel/vmlinux.lds.S | +++ b/arch/mips/kernel/vmlinux.lds.S | ||||||
| @@ -55,7 +55,11 @@ SECTIONS | @@ -55,7 +55,11 @@ SECTIONS | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Felix Fietkau
					Felix Fietkau