From 6450cbbdca62fe5fa9e58b835b29b35bf4079286 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Sat, 28 Mar 2020 19:34:50 -0400 Subject: headers: Don't blindly include in files used by ASM Causes things to go boom with newer toolchains. Change-Id: Ibd00edc9ea16aae8115b63ebce08ac920b0608a2 --- firmware/export/pl080.h | 1 + firmware/export/s5l8700.h | 4 +++- firmware/export/s5l8702.h | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'firmware/export') diff --git a/firmware/export/pl080.h b/firmware/export/pl080.h index 9e48f07f0c..fe0013b59d 100644 --- a/firmware/export/pl080.h +++ b/firmware/export/pl080.h @@ -24,6 +24,7 @@ /* * ARM PrimeCell PL080 Multiple Master DMA controller */ +#include #include #include diff --git a/firmware/export/s5l8700.h b/firmware/export/s5l8700.h index b559992c6a..945cf932cd 100644 --- a/firmware/export/s5l8700.h +++ b/firmware/export/s5l8700.h @@ -19,7 +19,9 @@ * ****************************************************************************/ -#include +#ifndef ASM +#include +#endif #define REG8_PTR_T volatile uint8_t * #define REG16_PTR_T volatile uint16_t * diff --git a/firmware/export/s5l8702.h b/firmware/export/s5l8702.h index f9bf99ed3b..4b22e25366 100644 --- a/firmware/export/s5l8702.h +++ b/firmware/export/s5l8702.h @@ -22,7 +22,9 @@ #ifndef __S5L8702_H__ #define __S5L8702_H__ -#include +#ifndef ASM +#include +#endif #define REG8_PTR_T volatile uint8_t * #define REG16_PTR_T volatile uint16_t * -- cgit v1.2.3