Skip to contentSkip to conversation

arm64 kexec-tools fixups

PATCH Applied Geoff Levand 3 participants 5 messages Oct 10, 2016 – Oct 13, 2016

Subsystems (2)
Live update kexec handover (KHO)
lore
Share & tools
lore

Geoff Levand

author
#0 lore raw

cover arm64 kexec-tools fixups

Hi Simon,

Fixes for 'make tarball'. Please apply.

-Geoff

The following changes since commit 6e8804f9ca67bee65aedd5e1cdf504737ab5c7ed:

multiboot: Use the "reserved" type for non-ram zones (2016-10-07 11:54:44 +0900)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/geoff/kexec-tools.git for-merge-arm64-dist

for you to fetch changes up to 3552a3e85a910688d932535549b35354a54927ad:

arm64: Add missing kexec dist files (2016-10-10 14:15:21 -0700)

----------------------------------------------------------------
Geoff Levand (2):
arm64: Cleanup kexec Makefile
arm64: Add missing kexec dist files

 kexec/arch/arm64/Makefile | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
Signature · 7 lines
2.7.4


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
author
#1 lore raw

PATCH 1/2 arm64: Cleanup kexec Makefile

Put files in alphabetical order, reformat whitspace.

Signed-off-by Geoff Levand <[email protected]>
---
 kexec/arch/arm64/Makefile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
kexec/arch/arm64/Makefile +7 -6
index 37414dc..d729df8 100644
@@ -1,17 +1,18 @@
 
 arm64_FS2DT += kexec/fs2dt.c
-arm64_FS2DT_INCLUDE += -include $(srcdir)/kexec/arch/arm64/kexec-arm64.h \
-	-include $(srcdir)/kexec/arch/arm64/crashdump-arm64.h
+arm64_FS2DT_INCLUDE += \
+	-include $(srcdir)/kexec/arch/arm64/crashdump-arm64.h \
+	-include $(srcdir)/kexec/arch/arm64/kexec-arm64.h
 
 arm64_DT_OPS += kexec/dt-ops.c
 
 arm64_CPPFLAGS += -I $(srcdir)/kexec/
 
 arm64_KEXEC_SRCS += \
+	kexec/arch/arm64/crashdump-arm64.c \
 	kexec/arch/arm64/kexec-arm64.c \
-	kexec/arch/arm64/kexec-image-arm64.c \
 	kexec/arch/arm64/kexec-elf-arm64.c \
-	kexec/arch/arm64/crashdump-arm64.c
+	kexec/arch/arm64/kexec-image-arm64.c
 
 arm64_ARCH_REUSE_INITRD =
 arm64_ADD_SEGMENT =

@@ -19,9 +20,9 @@ arm64_VIRT_TO_PHYS =
 arm64_PHYS_TO_VIRT =
 
 dist += $(arm64_KEXEC_SRCS) \
-	kexec/arch/arm64/Makefile \
+	kexec/arch/arm64/crashdump-arm64.h \
 	kexec/arch/arm64/kexec-arm64.h \
-	kexec/arch/arm64/crashdump-arm64.h
+	kexec/arch/arm64/Makefile
 
 ifdef HAVE_LIBFDT
Signature · 8 lines
2.7.4



_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
author
#2 lore raw

PATCH 2/2 arm64: Add missing kexec dist files

In reply to Geoff Levand
Signed-off-by Geoff Levand <[email protected]>
---
 kexec/arch/arm64/Makefile | 2 ++
 1 file changed, 2 insertions(+)
kexec/arch/arm64/Makefile +2 -0
index d729df8..74b677f 100644
@@ -20,7 +20,9 @@ arm64_VIRT_TO_PHYS =
 arm64_PHYS_TO_VIRT =
 
 dist += $(arm64_KEXEC_SRCS) \
+	kexec/arch/arm64/include/arch/options.h \
 	kexec/arch/arm64/crashdump-arm64.h \
+	kexec/arch/arm64/image-header.h \
 	kexec/arch/arm64/kexec-arm64.h \
 	kexec/arch/arm64/Makefile
Signature · 7 lines
2.7.4


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Reviewed-by on the v1 series
#3 lore raw
In reply to Geoff Levand
Quoted 18 lines · Geoff Levand

Hi Simon,

Fixes for 'make tarball'. Please apply.

-Geoff

The following changes since commit 6e8804f9ca67bee65aedd5e1cdf504737ab5c7ed:

multiboot: Use the "reserved" type for non-ram zones (2016-10-07 11:54:44 +0900)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/geoff/kexec-tools.git for-merge-arm64-dist

for you to fetch changes up to 3552a3e85a910688d932535549b35354a54927ad:

arm64: Add missing kexec dist files (2016-10-10 14:15:21 -0700)

Quoted 8 lines

----------------------------------------------------------------
Geoff Levand (2):
arm64: Cleanup kexec Makefile
arm64: Add missing kexec dist files

 kexec/arch/arm64/Makefile | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
Reviewed-by Matthias Brugger <[email protected]>

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

Applied
#4 lore raw
Quoted 26 lines · Matthias Brugger
Quoted 23 lines · Geoff Levand

Hi Simon,

Fixes for 'make tarball'. Please apply.

-Geoff

The following changes since commit 6e8804f9ca67bee65aedd5e1cdf504737ab5c7ed:

multiboot: Use the "reserved" type for non-ram zones (2016-10-07 11:54:44 +0900)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/geoff/kexec-tools.git for-merge-arm64-dist

for you to fetch changes up to 3552a3e85a910688d932535549b35354a54927ad:

arm64: Add missing kexec dist files (2016-10-10 14:15:21 -0700)

----------------------------------------------------------------
Geoff Levand (2):
arm64: Cleanup kexec Makefile
arm64: Add missing kexec dist files

Quoted 5 lines
Quoted 3 lines

kexec/arch/arm64/Makefile | 15 +++++++++------

1 file changed, 9 insertions(+), 6 deletions(-)
Reviewed-by Matthias Brugger <[email protected]>

Thanks, applied.

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec