From d7a039ced03757f927f50af2bc789d9d0692e6dc Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 13 May 2014 17:18:50 -0700 Subject: [PATCH] 3.10-stable patches added patches: arm-multi_v7_defconfig-enable-arm_atag_dtb_compat.patch arm-multi_v7_defconfig-enable-initrd-initramfs-support.patch --- ...defconfig-enable-arm_atag_dtb_compat.patch | 34 +++++++++++++++++++ ...nfig-enable-initrd-initramfs-support.patch | 30 ++++++++++++++++ queue-3.10/series | 2 ++ 3 files changed, 66 insertions(+) create mode 100644 queue-3.10/arm-multi_v7_defconfig-enable-arm_atag_dtb_compat.patch create mode 100644 queue-3.10/arm-multi_v7_defconfig-enable-initrd-initramfs-support.patch diff --git a/queue-3.10/arm-multi_v7_defconfig-enable-arm_atag_dtb_compat.patch b/queue-3.10/arm-multi_v7_defconfig-enable-arm_atag_dtb_compat.patch new file mode 100644 index 00000000000..4959dd82f39 --- /dev/null +++ b/queue-3.10/arm-multi_v7_defconfig-enable-arm_atag_dtb_compat.patch @@ -0,0 +1,34 @@ +From a0396b9bd5a4a7baf598b60d2ca53c605c440a42 Mon Sep 17 00:00:00 2001 +From: Olof Johansson +Date: Mon, 16 Sep 2013 09:01:24 -0700 +Subject: ARM: multi_v7_defconfig: enable ARM_ATAG_DTB_COMPAT + +From: Olof Johansson + +commit a0396b9bd5a4a7baf598b60d2ca53c605c440a42 upstream. + +Without this, legacy platforms that can boot with a multiplatform +kernel but that need the DTB to be appended, won't have a way to pass +firmware-set bootargs to the kernel. + +This is needed to boot multi_v7_defconfig on snowball, for instance. + +Signed-off-by: Olof Johansson +Cc: Jason Cooper +Cc: Kevin Hilman +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/configs/multi_v7_defconfig | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm/configs/multi_v7_defconfig ++++ b/arch/arm/configs/multi_v7_defconfig +@@ -23,6 +23,7 @@ CONFIG_AEABI=y + CONFIG_HIGHMEM=y + CONFIG_HIGHPTE=y + CONFIG_ARM_APPENDED_DTB=y ++CONFIG_ARM_ATAG_DTB_COMPAT=y + CONFIG_VFP=y + CONFIG_NEON=y + CONFIG_NET=y diff --git a/queue-3.10/arm-multi_v7_defconfig-enable-initrd-initramfs-support.patch b/queue-3.10/arm-multi_v7_defconfig-enable-initrd-initramfs-support.patch new file mode 100644 index 00000000000..3024a4c3f17 --- /dev/null +++ b/queue-3.10/arm-multi_v7_defconfig-enable-initrd-initramfs-support.patch @@ -0,0 +1,30 @@ +From c12d82b84353784f8233c28ee43cec0ac9fbd7d2 Mon Sep 17 00:00:00 2001 +From: Soren Brinkmann +Date: Wed, 19 Jun 2013 10:53:04 -0700 +Subject: arm: multi_v7_defconfig: Enable initrd/initramfs support + +From: Soren Brinkmann + +commit c12d82b84353784f8233c28ee43cec0ac9fbd7d2 upstream. + +Add CONFIG_BLK_DEV_INITRD to the defconfig to support +initramfs and initrd. + +Signed-off-by: Soren Brinkmann +Signed-off-by: Michal Simek +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/configs/multi_v7_defconfig | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm/configs/multi_v7_defconfig ++++ b/arch/arm/configs/multi_v7_defconfig +@@ -1,6 +1,7 @@ + CONFIG_EXPERIMENTAL=y + CONFIG_NO_HZ=y + CONFIG_HIGH_RES_TIMERS=y ++CONFIG_BLK_DEV_INITRD=y + CONFIG_ARCH_MVEBU=y + CONFIG_MACH_ARMADA_370=y + CONFIG_ARCH_SIRF=y diff --git a/queue-3.10/series b/queue-3.10/series index 3c748c59655..e00d072f04f 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -7,3 +7,5 @@ netfilter-can-t-fail-and-free-after-table-replacement.patch tracepoint-do-not-waste-memory-on-mods-with-no-tracepoints.patch firewire-ohci-beautify-some-macro-definitions.patch firewire-ohci-fix-probe-failure-with-agere-lsi-controllers.patch +arm-multi_v7_defconfig-enable-initrd-initramfs-support.patch +arm-multi_v7_defconfig-enable-arm_atag_dtb_compat.patch -- 2.47.3