| Patrick Williams | ddad1a1 | 2017-02-23 20:36:32 -0600 | [diff] [blame^] | 1 | From d9e4dc750dc45e42b482d744829254a3672c11b3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 19 Oct 2016 00:24:08 +0000 |
| 4 | Subject: [PATCH 1/3] Fix compilation on aarch64 |
| 5 | |
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 7 | --- |
| 8 | arch.h | 2 +- |
| 9 | hwaccess.c | 2 +- |
| 10 | hwaccess.h | 6 +++--- |
| 11 | 3 files changed, 5 insertions(+), 5 deletions(-) |
| 12 | |
| 13 | Index: flashrom-0.9.6.1/arch.h |
| 14 | =================================================================== |
| 15 | --- flashrom-0.9.6.1.orig/arch.h |
| 16 | +++ flashrom-0.9.6.1/arch.h |
| 17 | @@ -27,7 +27,7 @@ |
| 18 | #define __FLASHROM_ARCH__ "mips" |
| 19 | #elif defined(__powerpc__) || defined(__powerpc64__) || defined(__ppc__) || defined(__ppc64__) |
| 20 | #define __FLASHROM_ARCH__ "ppc" |
| 21 | -#elif defined(__arm__) |
| 22 | +#elif defined(__arm__) || defined(__aarch64__) |
| 23 | #define __FLASHROM_ARCH__ "arm" |
| 24 | #endif |
| 25 | __FLASHROM_ARCH__ |
| 26 | Index: flashrom-0.9.6.1/hwaccess.c |
| 27 | =================================================================== |
| 28 | --- flashrom-0.9.6.1.orig/hwaccess.c |
| 29 | +++ flashrom-0.9.6.1/hwaccess.c |
| 30 | @@ -121,7 +121,7 @@ int rget_io_perms(void) |
| 31 | return 0; |
| 32 | } |
| 33 | |
| 34 | -#elif defined (__arm__) |
| 35 | +#elif defined (__arm__) || defined (__aarch64__) |
| 36 | |
| 37 | static inline void sync_primitive(void) |
| 38 | { |
| 39 | Index: flashrom-0.9.6.1/hwaccess.h |
| 40 | =================================================================== |
| 41 | --- flashrom-0.9.6.1.orig/hwaccess.h |
| 42 | +++ flashrom-0.9.6.1/hwaccess.h |
| 43 | @@ -68,8 +68,8 @@ |
| 44 | #error Little-endian PowerPC #defines are unknown |
| 45 | #endif |
| 46 | |
| 47 | -#elif defined (__arm__) |
| 48 | -#if defined (__ARMEL__) |
| 49 | +#elif defined (__arm__) || defined (__aarch64__) |
| 50 | +#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ |
| 51 | #define __FLASHROM_LITTLE_ENDIAN__ 1 |
| 52 | #else |
| 53 | #error Big-endian ARM #defines are unknown |
| 54 | @@ -337,7 +337,7 @@ int libpayload_wrmsr(int addr, msr_t msr |
| 55 | |
| 56 | /* PCI port I/O is not yet implemented on MIPS. */ |
| 57 | |
| 58 | -#elif defined(__arm__) |
| 59 | +#elif defined(__arm__) || defined (__aarch64__) |
| 60 | |
| 61 | /* Non memory mapped I/O is not supported on ARM. */ |
| 62 | |