diff for duplicates of <20121129143041.GC30437@arm.com> diff --git a/a/1.txt b/N1/1.txt index d43b1ce..d3ff2f7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -10,7 +10,7 @@ On Tue, Nov 27, 2012 at 11:29:12PM +0000, Stephen Warren wrote: > new Makefile. > > Cc: Catalin Marinas <catalin.marinas@arm.com> -> Cc: linux-arm-kernel@lists.infradead.org +> Cc: linux-arm-kernel at lists.infradead.org > Signed-off-by: Stephen Warren <swarren@nvidia.com> I had a bit more clean-up in a local patch (see attached). Depending on @@ -20,3 +20,10 @@ derived from your arch/arm patch anyway ;). -- Catalin +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: 0001-arm64-Add-dtbs-target-for-building-all-the-enabled-d.patch +Type: text/x-diff +Size: 2975 bytes +Desc: not available +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121129/742bd030/attachment.bin> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index dbf8280..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,4 +0,0 @@ -Content-Type: text/x-diff; charset=WINDOWS-1252 -Content-Transfer-Encoding: quoted-printable -Content-Disposition: attachment; - filename="0001-arm64-Add-dtbs-target-for-building-all-the-enabled-d.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index 7831717..0000000 --- a/a/2.txt +++ /dev/null @@ -1,95 +0,0 @@ -From 906ea5523f1a5c2fadea72b54d5d6a8e5fecdfe5 Mon Sep 17 00:00:00 2001 -From: Catalin Marinas <catalin.marinas@arm.com> -Date: Wed, 21 Nov 2012 11:44:59 +0000 -Subject: [PATCH] arm64: Add dtbs target for building all the enabled dtb - files - -Based on Rob Herring's patches for arch/arm, this patch adds a dtbs -target to arch/arm64/boot/Makefile. - -Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> ---- - arch/arm64/Makefile | 17 +++++++++++------ - arch/arm64/boot/.gitignore | 1 + - arch/arm64/boot/Makefile | 6 ++++++ - 3 files changed, 18 insertions(+), 6 deletions(-) - create mode 100644 arch/arm64/boot/dts/Makefile - -diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile -index 93e871e..ddadd27 100644 ---- a/arch/arm64/Makefile -+++ b/arch/arm64/Makefile -@@ -42,20 +42,24 @@ libs-y := arch/arm64/lib/ $(libs-y) - libs-y += $(LIBGCC) - - # Default target when executing plain make --KBUILD_IMAGE := Image.gz -+KBUILD_IMAGE := Image.gz -+KBUILD_DTBS := dtbs - --all: $(KBUILD_IMAGE) -+all: $(KBUILD_IMAGE) $(KBUILD_DTBS) - - boot := arch/arm64/boot - - Image Image.gz: vmlinux -- $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ -+ $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ - - zinstall install: vmlinux -- $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ -+ $(Q)$(MAKE) $(build)=$(boot) $@ - --%.dtb: -- $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ -+%.dtb: scripts -+ $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ -+ -+dtbs: scripts -+ $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ - - # We use MRPROPER_FILES and CLEAN_FILES now - archclean: -@@ -64,6 +68,7 @@ archclean: - define archhelp - echo '* Image.gz - Compressed kernel image (arch/$(ARCH)/boot/Image.gz)' - echo ' Image - Uncompressed kernel image (arch/$(ARCH)/boot/Image)' -+ echo '* dtbs - Build device tree blobs for enabled boards' - echo ' install - Install uncompressed kernel' - echo ' zinstall - Install compressed kernel' - echo ' Install using (your) ~/bin/installkernel or' -diff --git a/arch/arm64/boot/.gitignore b/arch/arm64/boot/.gitignore -index 8dab0bb..98af90a 100644 ---- a/arch/arm64/boot/.gitignore -+++ b/arch/arm64/boot/.gitignore -@@ -1,2 +1,3 @@ - Image - Image.gz -+*.dtb -diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile -index 20048be..ce8642e 100644 ---- a/arch/arm64/boot/Makefile -+++ b/arch/arm64/boot/Makefile -@@ -14,6 +14,8 @@ - # Based on the ia64 boot/Makefile. - # - -+include $(srctree)/arch/arm64/boot/dts/Makefile -+ - targets := Image Image.gz - - $(obj)/Image: vmlinux FORCE -@@ -22,6 +24,10 @@ $(obj)/Image: vmlinux FORCE - $(obj)/Image.gz: $(obj)/Image FORCE - $(call if_changed,gzip) - -+targets += $(dtb-y) -+ -+$(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y)) -+ - install: $(obj)/Image - $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ - $(obj)/Image System.map "$(INSTALL_PATH)" -diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile -new file mode 100644 -index 0000000..e69de29 diff --git a/a/content_digest b/N1/content_digest index 0fd3535..0abc4ff 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,18 +1,10 @@ "ref\01354058956-7199-1-git-send-email-swarren@wwwdotorg.org\0" "ref\01354058956-7199-3-git-send-email-swarren@wwwdotorg.org\0" - "From\0Catalin Marinas <catalin.marinas@arm.com>\0" - "Subject\0Re: [PATCH V7 3/7] arm64: use new common dtc rule\0" + "From\0catalin.marinas@arm.com (Catalin Marinas)\0" + "Subject\0[PATCH V7 3/7] arm64: use new common dtc rule\0" "Date\0Thu, 29 Nov 2012 14:30:41 +0000\0" - "To\0Stephen Warren <swarren@wwwdotorg.org>\0" - "Cc\0Michal Marek <mmarek@suse.cz>" - Grant Likely <grant.likely@secretlab.ca> - rob.herring@calxeda.com <rob.herring@calxeda.com> - Sam Ravnborg <sam@ravnborg.org> - linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> - linux-arch@vger.kernel.org <linux-arch@vger.kernel.org> - Stephen Warren <swarren@nvidia.com> - " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "On Tue, Nov 27, 2012 at 11:29:12PM +0000, Stephen Warren wrote:\n" "> From: Stephen Warren <swarren@nvidia.com>\n" @@ -26,7 +18,7 @@ "> new Makefile.\n" "> \n" "> Cc: Catalin Marinas <catalin.marinas@arm.com>\n" - "> Cc: linux-arm-kernel@lists.infradead.org\n" + "> Cc: linux-arm-kernel at lists.infradead.org\n" "> Signed-off-by: Stephen Warren <swarren@nvidia.com>\n" "\n" "I had a bit more clean-up in a local patch (see attached). Depending on\n" @@ -35,104 +27,13 @@ "derived from your arch/arm patch anyway ;).\n" "\n" "-- \n" - Catalin - "\01:2\0" - "fn\00001-arm64-Add-dtbs-target-for-building-all-the-enabled-d.patch\0" - "b\0" - "From 906ea5523f1a5c2fadea72b54d5d6a8e5fecdfe5 Mon Sep 17 00:00:00 2001\n" - "From: Catalin Marinas <catalin.marinas@arm.com>\n" - "Date: Wed, 21 Nov 2012 11:44:59 +0000\n" - "Subject: [PATCH] arm64: Add dtbs target for building all the enabled dtb\n" - " files\n" - "\n" - "Based on Rob Herring's patches for arch/arm, this patch adds a dtbs\n" - "target to arch/arm64/boot/Makefile.\n" - "\n" - "Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>\n" - "---\n" - " arch/arm64/Makefile | 17 +++++++++++------\n" - " arch/arm64/boot/.gitignore | 1 +\n" - " arch/arm64/boot/Makefile | 6 ++++++\n" - " 3 files changed, 18 insertions(+), 6 deletions(-)\n" - " create mode 100644 arch/arm64/boot/dts/Makefile\n" - "\n" - "diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile\n" - "index 93e871e..ddadd27 100644\n" - "--- a/arch/arm64/Makefile\n" - "+++ b/arch/arm64/Makefile\n" - "@@ -42,20 +42,24 @@ libs-y\t\t:= arch/arm64/lib/ $(libs-y)\n" - " libs-y\t\t+= $(LIBGCC)\n" - " \n" - " # Default target when executing plain make\n" - "-KBUILD_IMAGE := Image.gz\n" - "+KBUILD_IMAGE\t:= Image.gz\n" - "+KBUILD_DTBS\t:= dtbs\n" - " \n" - "-all:\t$(KBUILD_IMAGE)\n" - "+all:\t$(KBUILD_IMAGE) $(KBUILD_DTBS)\n" - " \n" - " boot := arch/arm64/boot\n" - " \n" - " Image Image.gz: vmlinux\n" - "-\t$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@\n" - "+\t$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@\n" - " \n" - " zinstall install: vmlinux\n" - "-\t$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@\n" - "+\t$(Q)$(MAKE) $(build)=$(boot) $@\n" - " \n" - "-%.dtb:\n" - "-\t$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@\n" - "+%.dtb: scripts\n" - "+\t$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@\n" - "+\n" - "+dtbs: scripts\n" - "+\t$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@\n" - " \n" - " # We use MRPROPER_FILES and CLEAN_FILES now\n" - " archclean:\n" - "@@ -64,6 +68,7 @@ archclean:\n" - " define archhelp\n" - " echo '* Image.gz - Compressed kernel image (arch/$(ARCH)/boot/Image.gz)'\n" - " echo ' Image - Uncompressed kernel image (arch/$(ARCH)/boot/Image)'\n" - "+ echo '* dtbs - Build device tree blobs for enabled boards'\n" - " echo ' install - Install uncompressed kernel'\n" - " echo ' zinstall - Install compressed kernel'\n" - " echo ' Install using (your) ~/bin/installkernel or'\n" - "diff --git a/arch/arm64/boot/.gitignore b/arch/arm64/boot/.gitignore\n" - "index 8dab0bb..98af90a 100644\n" - "--- a/arch/arm64/boot/.gitignore\n" - "+++ b/arch/arm64/boot/.gitignore\n" - "@@ -1,2 +1,3 @@\n" - " Image\n" - " Image.gz\n" - "+*.dtb\n" - "diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile\n" - "index 20048be..ce8642e 100644\n" - "--- a/arch/arm64/boot/Makefile\n" - "+++ b/arch/arm64/boot/Makefile\n" - "@@ -14,6 +14,8 @@\n" - " # Based on the ia64 boot/Makefile.\n" - " #\n" - " \n" - "+include $(srctree)/arch/arm64/boot/dts/Makefile\n" - "+\n" - " targets := Image Image.gz\n" - " \n" - " $(obj)/Image: vmlinux FORCE\n" - "@@ -22,6 +24,10 @@ $(obj)/Image: vmlinux FORCE\n" - " $(obj)/Image.gz: $(obj)/Image FORCE\n" - " \t$(call if_changed,gzip)\n" - " \n" - "+targets += $(dtb-y)\n" - "+\n" - "+$(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y))\n" - "+\n" - " install: $(obj)/Image\n" - " \t$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \\\n" - " \t$(obj)/Image System.map \"$(INSTALL_PATH)\"\n" - "diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile\n" - "new file mode 100644\n" - index 0000000..e69de29 + "Catalin\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: 0001-arm64-Add-dtbs-target-for-building-all-the-enabled-d.patch\n" + "Type: text/x-diff\n" + "Size: 2975 bytes\n" + "Desc: not available\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121129/742bd030/attachment.bin> -465e1f3adcb26cbcf6909e99a76bc73f65f65b44c3ec4aec9de9b62269f742db +dcc610aa5e68d2aa5a6217402343ca1e61a55de3e04520d4445b8b034186ae9f
diff --git a/a/2.txt b/N2/2.txt index 7831717..b0f5234 100644 --- a/a/2.txt +++ b/N2/2.txt @@ -1,4 +1,4 @@ -From 906ea5523f1a5c2fadea72b54d5d6a8e5fecdfe5 Mon Sep 17 00:00:00 2001 +>From 906ea5523f1a5c2fadea72b54d5d6a8e5fecdfe5 Mon Sep 17 00:00:00 2001 From: Catalin Marinas <catalin.marinas@arm.com> Date: Wed, 21 Nov 2012 11:44:59 +0000 Subject: [PATCH] arm64: Add dtbs target for building all the enabled dtb diff --git a/a/content_digest b/N2/content_digest index 0fd3535..d308aca 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -39,7 +39,7 @@ "\01:2\0" "fn\00001-arm64-Add-dtbs-target-for-building-all-the-enabled-d.patch\0" "b\0" - "From 906ea5523f1a5c2fadea72b54d5d6a8e5fecdfe5 Mon Sep 17 00:00:00 2001\n" + ">From 906ea5523f1a5c2fadea72b54d5d6a8e5fecdfe5 Mon Sep 17 00:00:00 2001\n" "From: Catalin Marinas <catalin.marinas@arm.com>\n" "Date: Wed, 21 Nov 2012 11:44:59 +0000\n" "Subject: [PATCH] arm64: Add dtbs target for building all the enabled dtb\n" @@ -135,4 +135,4 @@ "new file mode 100644\n" index 0000000..e69de29 -465e1f3adcb26cbcf6909e99a76bc73f65f65b44c3ec4aec9de9b62269f742db +52b179ef943eb2d7ea55bbf6c3a647ecfe8e52662bbc96fcc53515e2fa0012d3
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.