|
 |
de80c6 |
From 2ca220389d212249cc842d49084c95e524fb299b Mon Sep 17 00:00:00 2001
|
|
|
de80c6 |
From: Laurent Dufour <ldufour@linux.vnet.ibm.com>
|
|
|
de80c6 |
Date: Mon, 16 Jun 2014 14:42:43 +0200
|
|
|
de80c6 |
Subject: [PATCH] kexec/ppc64: move to device tree version 17
|
|
|
de80c6 |
|
|
|
de80c6 |
Kernel commit e6a6928c3ea1d0195ed75a091e345696b916c09b changed the way the
|
|
|
de80c6 |
device tree is processed in the kernel. Now version 2 is no more supported.
|
|
|
de80c6 |
|
|
|
de80c6 |
This patch move the version of the device tree generated in ppc64
|
|
|
de80c6 |
environment from 2 to 17, allowing to kexec kernel 3.16.
|
|
|
de80c6 |
|
|
|
de80c6 |
In addition, automates the define of NEED_STRUCTURE_BLOCK_EXTRA_PAD which
|
|
|
de80c6 |
should not be set for DT version 16 and above.
|
|
|
de80c6 |
|
|
|
de80c6 |
Signed-off-by: Laurent Dufour <ldufour@linux.vnet.ibm.com>
|
|
|
de80c6 |
Signed-off-by: Simon Horman <horms@verge.net.au>
|
|
|
de80c6 |
---
|
|
|
de80c6 |
kexec/arch/ppc64/kexec-ppc64.h | 8 +++++---
|
|
|
de80c6 |
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
de80c6 |
|
|
|
de80c6 |
diff --git a/kexec/arch/ppc64/kexec-ppc64.h b/kexec/arch/ppc64/kexec-ppc64.h
|
|
|
de80c6 |
index 9a0aecf..89ee942 100644
|
|
|
de80c6 |
--- a/kexec/arch/ppc64/kexec-ppc64.h
|
|
|
de80c6 |
+++ b/kexec/arch/ppc64/kexec-ppc64.h
|
|
|
de80c6 |
@@ -6,9 +6,11 @@
|
|
|
de80c6 |
#define CORE_TYPE_ELF32 1
|
|
|
de80c6 |
#define CORE_TYPE_ELF64 2
|
|
|
de80c6 |
|
|
|
de80c6 |
-#define BOOT_BLOCK_VERSION 2
|
|
|
de80c6 |
-#define BOOT_BLOCK_LAST_COMP_VERSION 2
|
|
|
de80c6 |
-#define NEED_STRUCTURE_BLOCK_EXTRA_PAD
|
|
|
de80c6 |
+#define BOOT_BLOCK_VERSION 17
|
|
|
de80c6 |
+#define BOOT_BLOCK_LAST_COMP_VERSION 17
|
|
|
de80c6 |
+#if (BOOT_BLOCK_VERSION < 16)
|
|
|
de80c6 |
+# define NEED_STRUCTURE_BLOCK_EXTRA_PAD
|
|
|
de80c6 |
+#endif
|
|
|
de80c6 |
#define HAVE_DYNAMIC_MEMORY
|
|
|
de80c6 |
#define NEED_RESERVE_DTB
|
|
|
de80c6 |
|
|
|
de80c6 |
--
|
|
|
de80c6 |
1.9.3
|
|
|
de80c6 |
|