[systemd-commits] src/shared

[Lennart Poettering]

 src/shared/gpt.h |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

New commits:
commit a86eae57ff8e28f194b84719835cb7f88112dd11
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Mar 14 15:12:05 2014 +0100

    gpt: introduce root partition type GUIDs for ARM 32bit + ARM 64bit

diff --git a/src/shared/gpt.h b/src/shared/gpt.h
index a0dff5f..64090e0 100644
--- a/src/shared/gpt.h
+++ b/src/shared/gpt.h
@@ -21,12 +21,14 @@
 
 #include "sd-id128.h"
 
-/* We only support root disk discovery for x86 and x86-64 for now,
- * since EFI for anything else doesn't really exist, and we only care
- * for root partitions on the same disk as the EFI ESP. */
+/* We only support root disk discovery for x86, x86-64 and ARM for
+ * now, since EFI for anything else doesn't really exist, and we only
+ * care for root partitions on the same disk as the EFI ESP. */
 
 #define GPT_ROOT_X86    SD_ID128_MAKE(44,47,95,40,f2,97,41,b2,9a,f7,d1,31,d5,f0,45,8a)
 #define GPT_ROOT_X86_64 SD_ID128_MAKE(4f,68,bc,e3,e8,cd,4d,b1,96,e7,fb,ca,f9,84,b7,09)
+#define GPT_ROOT_ARM    SD_ID128_MAKE(69,da,d7,10,2c,e4,4e,3c,b1,6c,21,a1,d4,9a,be,d3)
+#define GPT_ROOT_ARM_64 SD_ID128_MAKE(b9,21,b0,45,1d,f0,41,c3,af,44,4c,6f,28,0d,3f,ae)
 
 #define GPT_ESP         SD_ID128_MAKE(c1,2a,73,28,f8,1f,11,d2,ba,4b,00,a0,c9,3e,c9,3b)
 #define GPT_SWAP        SD_ID128_MAKE(06,57,fd,6d,a4,ab,43,c4,84,e5,09,33,c8,4b,4f,4f)
@@ -40,6 +42,13 @@
 #  define GPT_ROOT_NATIVE GPT_ROOT_X86
 #endif
 
+#if defined(__aarch64__) && !defined(WORDS_BIGENDIAN)
+#  define GPT_ROOT_NATIVE GPT_ROOT_ARM_64
+#  define GPT_ROOT_SECONDARY GPT_ROOT_ARM
+#elif defined(__arm__) && !defined(WORDS_BIGENDIAN)
+#  define GPT_ROOT_NATIVE GPT_ROOT_ARM
+#endif
+
 /* Flags we recognize on the root, swap, home and srv partitions when
  * doing auto-discovery. These happen to be identical to what
  * Microsoft defines for its own Basic Data Partitions, but that's