aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.10/311-MIPS-zboot-put-appended-dtb-into-a-section.patch
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2021-05-11 00:06:02 +0100
committerDaniel Golle <daniel@makrotopia.org>2021-05-11 01:05:38 +0100
commite7249669d2af8f588a4e3beec589c4cbe5bd2fec (patch)
tree3bd9b1fcd7335a87ed45dd8f51a104feb5dc04f1 /target/linux/generic/pending-5.10/311-MIPS-zboot-put-appended-dtb-into-a-section.patch
parente57e460dc75836d3227e7370b9e64a0eabc9d91d (diff)
downloadupstream-e7249669d2af8f588a4e3beec589c4cbe5bd2fec.tar.gz
upstream-e7249669d2af8f588a4e3beec589c4cbe5bd2fec.tar.bz2
upstream-e7249669d2af8f588a4e3beec589c4cbe5bd2fec.zip
kernel: move three accepted patches from pending to backports
311-MIPS-zboot-put-appended-dtb-into-a-section.patch commit d2e850e96183 in kernel, part of v5.11 499-mtd-don-t-lock-when-recursively-deleting-partitions.patch commit cb4543054c5c in kernel, part of v5.13 103-MIPS-select-CPU_MIPS64-for-remaining-MIPS64-CPUs.patch commit 5a4fa44f5e1b in kernel, part of v5.13 Move them to backports folder to make maintainance easier. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'target/linux/generic/pending-5.10/311-MIPS-zboot-put-appended-dtb-into-a-section.patch')
-rw-r--r--target/linux/generic/pending-5.10/311-MIPS-zboot-put-appended-dtb-into-a-section.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/target/linux/generic/pending-5.10/311-MIPS-zboot-put-appended-dtb-into-a-section.patch b/target/linux/generic/pending-5.10/311-MIPS-zboot-put-appended-dtb-into-a-section.patch
deleted file mode 100644
index 3f8808f702..0000000000
--- a/target/linux/generic/pending-5.10/311-MIPS-zboot-put-appended-dtb-into-a-section.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7d1531c81c0fb4c93bea8dc316043ad0e4d0c270 Mon Sep 17 00:00:00 2001
-From: Chuanhong Guo <gch981213@gmail.com>
-Date: Sun, 25 Oct 2020 23:19:40 +0800
-Subject: [PATCH] MIPS: zboot: put appended dtb into a section
-
-This will make a separated section for dtb appear in ELF, and we can
-then use objcopy to patch a dtb into vmlinuz when RAW_APPENDED_DTB
-is set in kernel config.
-
-command to patch a dtb:
-objcopy --set-section-flags=.appended_dtb=alloc,contents \
- --update-section=.appended_dtb=<target>.dtb vmlinuz vmlinuz-dtb
-
-Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
----
- arch/mips/boot/compressed/ld.script | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
---- a/arch/mips/boot/compressed/ld.script
-+++ b/arch/mips/boot/compressed/ld.script
-@@ -31,9 +31,12 @@ SECTIONS
- CONSTRUCTORS
- . = ALIGN(16);
- }
-- __appended_dtb = .;
-- /* leave space for appended DTB */
-- . += 0x100000;
-+
-+ .appended_dtb : {
-+ __appended_dtb = .;
-+ /* leave space for appended DTB */
-+ . += 0x100000;
-+ }
-
- _edata = .;
- /* End of data section */