diff options
Diffstat (limited to 'include/lib')
| -rw-r--r-- | include/lib/aarch64/arch.h | 1 | ||||
| -rw-r--r-- | include/lib/aarch64/arch_helpers.h | 5 | ||||
| -rw-r--r-- | include/lib/bakery_lock.h | 2 | ||||
| -rw-r--r-- | include/lib/io_storage.h | 6 | ||||
| -rw-r--r-- | include/lib/mmio.h | 4 | ||||
| -rw-r--r-- | include/lib/semihosting.h | 3 |
6 files changed, 5 insertions, 16 deletions
diff --git a/include/lib/aarch64/arch.h b/include/lib/aarch64/arch.h index 32167eb..d7e65b3 100644 --- a/include/lib/aarch64/arch.h +++ b/include/lib/aarch64/arch.h @@ -31,7 +31,6 @@ #ifndef __ARCH_H__ #define __ARCH_H__ -#include <bl_common.h> /******************************************************************************* * MIDR bit definitions diff --git a/include/lib/aarch64/arch_helpers.h b/include/lib/aarch64/arch_helpers.h index f55c003..565b1b4 100644 --- a/include/lib/aarch64/arch_helpers.h +++ b/include/lib/aarch64/arch_helpers.h @@ -31,10 +31,8 @@ #ifndef __ARCH_HELPERS_H__ #define __ARCH_HELPERS_H__ -#include <arch.h> +#include <cdefs.h> /* For __dead2 */ -#ifndef __ASSEMBLY__ -#include <stdio.h> /******************************************************************************* * Aarch64 translation tables manipulation helper prototypes @@ -268,6 +266,5 @@ extern void write_cpuectlr(unsigned long); extern void write_cptr_el2(unsigned long); extern void write_cptr_el3(unsigned long); -#endif /*__ASSEMBLY__*/ #endif /* __ARCH_HELPERS_H__ */ diff --git a/include/lib/bakery_lock.h b/include/lib/bakery_lock.h index 0def067..e6744a5 100644 --- a/include/lib/bakery_lock.h +++ b/include/lib/bakery_lock.h @@ -35,7 +35,6 @@ #define BAKERY_LOCK_MAX_CPUS PLATFORM_CORE_COUNT -#ifndef __ASSEMBLY__ typedef struct bakery_lock { int owner; volatile char entering[BAKERY_LOCK_MAX_CPUS]; @@ -48,6 +47,5 @@ void bakery_lock_init(bakery_lock_t *bakery); void bakery_lock_get(unsigned long mpidr, bakery_lock_t *bakery); void bakery_lock_release(unsigned long mpidr, bakery_lock_t *bakery); int bakery_lock_try(unsigned long mpidr, bakery_lock_t *bakery); -#endif /*__ASSEMBLY__*/ #endif /* __BAKERY_LOCK_H__ */ diff --git a/include/lib/io_storage.h b/include/lib/io_storage.h index 59fd3f4..b6c5f9f 100644 --- a/include/lib/io_storage.h +++ b/include/lib/io_storage.h @@ -31,10 +31,7 @@ #ifndef __IO_H__ #define __IO_H__ -#ifndef __ASSEMBLY__ - -#include <stdint.h> -#include <stdio.h> /* For ssize_t */ +#include <stdio.h> /* For ssize_t */ /* Device type which can be used to enable policy decisions about which device @@ -128,5 +125,4 @@ int io_write(io_handle handle, const void *buffer, size_t length, int io_close(io_handle handle); -#endif /* __ASSEMBLY__ */ #endif /* __IO_H__ */ diff --git a/include/lib/mmio.h b/include/lib/mmio.h index c79c3f5..d3c2cae 100644 --- a/include/lib/mmio.h +++ b/include/lib/mmio.h @@ -31,8 +31,6 @@ #ifndef __MMIO_H__ #define __MMIO_H__ -#ifndef __ASSEMBLY__ - #include <stdint.h> extern void mmio_write_8(uintptr_t addr, uint8_t value); @@ -44,6 +42,4 @@ extern uint32_t mmio_read_32(uintptr_t addr); extern void mmio_write_64(uintptr_t addr, uint64_t value); extern uint64_t mmio_read_64(uintptr_t addr); -#endif /*__ASSEMBLY__*/ - #endif /* __MMIO_H__ */ diff --git a/include/lib/semihosting.h b/include/lib/semihosting.h index e688618..9d0b39f 100644 --- a/include/lib/semihosting.h +++ b/include/lib/semihosting.h @@ -31,6 +31,9 @@ #ifndef __SEMIHOSTING_H__ #define __SEMIHOSTING_H__ +#include <stdio.h> /* For ssize_t */ + + #define SEMIHOSTING_SYS_OPEN 0x01 #define SEMIHOSTING_SYS_CLOSE 0x02 #define SEMIHOSTING_SYS_WRITE0 0x04 |