From fd7786159d47d26277f3e70600aa5dc90a6b53cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Tue, 24 May 2016 20:59:54 +0200 Subject: brcm63xx: drop linux 4.1 support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Switch to linux 4.4 now that it has been enough tested. Signed-off-by: Álvaro Fernández Rojas --- ...-Add-support-for-vmlinux.bin-appended-dtb.patch | 112 --------------------- 1 file changed, 112 deletions(-) delete mode 100644 target/linux/brcm63xx/patches-4.1/001-4.2-MIPS-Add-support-for-vmlinux.bin-appended-dtb.patch (limited to 'target/linux/brcm63xx/patches-4.1/001-4.2-MIPS-Add-support-for-vmlinux.bin-appended-dtb.patch') diff --git a/target/linux/brcm63xx/patches-4.1/001-4.2-MIPS-Add-support-for-vmlinux.bin-appended-dtb.patch b/target/linux/brcm63xx/patches-4.1/001-4.2-MIPS-Add-support-for-vmlinux.bin-appended-dtb.patch deleted file mode 100644 index fa7732b1a4..0000000000 --- a/target/linux/brcm63xx/patches-4.1/001-4.2-MIPS-Add-support-for-vmlinux.bin-appended-dtb.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 1da8f1798e307fb8422753984339beb00025f97d Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Sun, 12 Apr 2015 12:24:58 +0200 -Subject: [PATCH] MIPS: Add support for vmlinux.bin appended dtb - -Add support for detecting a vmlinux.bin appended dtb and overriding -the boot arguments to match the UHI interface. - -Due to the PERCPU section being empty for !SMP, but still modifying -the current address by aligning it to the page size, do not define -it for !SMP builds to allow __appended_dtb to still point to -the actual end of the data. - -Signed-off-by: Jonas Gorski -Cc: linux-mips@linux-mips.org -Cc: devicetree@vger.kernel.org -Cc: John Crispin -Cc: Kevin Cernekee -Cc: Florian Fainelli -Cc: Aaro Koskinen -Cc: Markos Chandras -Cc: Andrew Bresticker -Cc: Daniel Schwierzeck -Cc: Paul Burton -Cc: James Hartley -Patchwork: https://patchwork.linux-mips.org/patch/9739/ -Signed-off-by: Ralf Baechle ---- - arch/mips/Kconfig | 27 +++++++++++++++++++++++++++ - arch/mips/kernel/head.S | 16 ++++++++++++++++ - arch/mips/kernel/vmlinux.lds.S | 8 +++++++- - 3 files changed, 50 insertions(+), 1 deletion(-) - ---- a/arch/mips/Kconfig -+++ b/arch/mips/Kconfig -@@ -2703,6 +2703,33 @@ config BOOT_RAW - - - -+choice -+ prompt "Kernel appended dtb support" if OF -+ default MIPS_NO_APPENDED_DTB -+ -+ config MIPS_NO_APPENDED_DTB -+ bool "None" -+ help -+ Do not enable appended dtb support. -+ -+ config MIPS_RAW_APPENDED_DTB -+ bool "vmlinux.bin" -+ help -+ With this option, the boot code will look for a device tree binary -+ DTB) appended to raw vmlinux.bin (without decompressor). -+ (e.g. cat vmlinux.bin .dtb > vmlinux_w_dtb). -+ -+ This is meant as a backward compatibility convenience for those -+ systems with a bootloader that can't be upgraded to accommodate -+ the documented boot protocol using a device tree. -+ -+ Beware that there is very little in terms of protection against -+ this option being confused by leftover garbage in memory that might -+ look like a DTB header after a reboot if no actual DTB is appended -+ to vmlinux.bin. Do not leave this option active in a production kernel -+ if you don't intend to always append a DTB. -+endchoice -+ - endmenu - - config LOCKDEP_SUPPORT ---- a/arch/mips/kernel/head.S -+++ b/arch/mips/kernel/head.S -@@ -100,6 +100,22 @@ NESTED(kernel_entry, 16, sp) # kernel - jr t0 - 0: - -+#ifdef CONFIG_MIPS_RAW_APPENDED_DTB -+ PTR_LA t0, __appended_dtb -+ -+#ifdef CONFIG_CPU_BIG_ENDIAN -+ li t1, 0xd00dfeed -+#else -+ li t1, 0xedfe0dd0 -+#endif -+ lw t2, (t0) -+ bne t1, t2, not_found -+ nop -+ -+ move a1, t0 -+ PTR_LI a0, -2 -+not_found: -+#endif - PTR_LA t0, __bss_start # clear .bss - LONG_S zero, (t0) - PTR_LA t1, __bss_stop - LONGSIZE ---- a/arch/mips/kernel/vmlinux.lds.S -+++ b/arch/mips/kernel/vmlinux.lds.S -@@ -125,8 +125,14 @@ SECTIONS - .exit.data : { - EXIT_DATA - } -- -+#ifdef CONFIG_SMP - PERCPU_SECTION(1 << CONFIG_MIPS_L1_CACHE_SHIFT) -+#endif -+#ifdef CONFIG_MIPS_RAW_APPENDED_DTB -+ __appended_dtb = .; -+ /* leave space for appended DTB */ -+ . += 0x100000; -+#endif - /* - * Align to 64K in attempt to eliminate holes before the - * .bss..swapper_pg_dir section at the start of .bss. This -- cgit v1.2.3