diff options
author | Julius Werner <jwerner@chromium.org> | 2019-11-13 19:50:33 -0800 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2019-11-18 22:47:13 +0000 |
commit | a2148377b5605e96860476bd7cffbabc6e92542e (patch) | |
tree | 7cd07d20d3283bb141f85ef66b6b86ade1e6ee26 /src | |
parent | 85b41445b5c4df5833eceb7e1602408dc6c68662 (diff) | |
download | coreboot-a2148377b5605e96860476bd7cffbabc6e92542e.tar.gz coreboot-a2148377b5605e96860476bd7cffbabc6e92542e.tar.bz2 coreboot-a2148377b5605e96860476bd7cffbabc6e92542e.zip |
include: Make stdbool.h a separate file
This patch moves the traditional POSIX stdbool.h definitions out from
stdint.h into their own file. This helps for using these definitions in
commonlib code which may be compiled in different environments. For
coreboot everything should chain-include this stuff via types.h anyway
so nothing should change.
Change-Id: Ic8d52be80b64d8e9564f3aee8975cb25e4c187f5
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36837
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/arch/x86/include/arch/cpu.h | 3 | ||||
-rw-r--r-- | src/drivers/vpd/vpd.h | 2 | ||||
-rw-r--r-- | src/ec/google/chromeec/ec.h | 3 | ||||
-rw-r--r-- | src/include/bootmem.h | 4 | ||||
-rw-r--r-- | src/include/console/usb.h | 2 | ||||
-rw-r--r-- | src/include/device/device.h | 3 | ||||
-rw-r--r-- | src/include/stdbool.h | 16 | ||||
-rw-r--r-- | src/include/stdint.h | 9 | ||||
-rw-r--r-- | src/include/types.h | 3 | ||||
-rw-r--r-- | src/lib/imd.c | 1 | ||||
-rw-r--r-- | src/security/memory/memory.c | 2 | ||||
-rw-r--r-- | src/soc/intel/common/block/include/intelblocks/cpulib.h | 3 | ||||
-rw-r--r-- | src/soc/intel/common/block/include/intelblocks/fast_spi.h | 3 | ||||
-rw-r--r-- | src/soc/intel/common/block/include/intelblocks/pcr.h | 2 | ||||
-rw-r--r-- | src/soc/mediatek/mt8183/include/soc/mt6358.h | 2 |
15 files changed, 32 insertions, 26 deletions
diff --git a/src/arch/x86/include/arch/cpu.h b/src/arch/x86/include/arch/cpu.h index 9133f53065dc..d74d6de7b57a 100644 --- a/src/arch/x86/include/arch/cpu.h +++ b/src/arch/x86/include/arch/cpu.h @@ -14,8 +14,7 @@ #ifndef ARCH_CPU_H #define ARCH_CPU_H -#include <stdint.h> -#include <stddef.h> +#include <types.h> /* * EFLAGS bits diff --git a/src/drivers/vpd/vpd.h b/src/drivers/vpd/vpd.h index 244a7be6d71b..1bae5132cda5 100644 --- a/src/drivers/vpd/vpd.h +++ b/src/drivers/vpd/vpd.h @@ -7,7 +7,7 @@ #ifndef __VPD_H__ #define __VPD_H__ -#include <stdint.h> +#include <types.h> #define GOOGLE_VPD_2_0_OFFSET 0x600 diff --git a/src/ec/google/chromeec/ec.h b/src/ec/google/chromeec/ec.h index 9fb9c391ccdb..5ef43661170c 100644 --- a/src/ec/google/chromeec/ec.h +++ b/src/ec/google/chromeec/ec.h @@ -17,8 +17,7 @@ #ifndef _EC_GOOGLE_CHROMEEC_EC_H #define _EC_GOOGLE_CHROMEEC_EC_H -#include <stddef.h> -#include <stdint.h> +#include <types.h> #include "ec_commands.h" /* Fill in base and size of the IO port resources used. */ diff --git a/src/include/bootmem.h b/src/include/bootmem.h index 2e33fcdf76da..53e2d0f9db0f 100644 --- a/src/include/bootmem.h +++ b/src/include/bootmem.h @@ -16,9 +16,9 @@ #ifndef BOOTMEM_H #define BOOTMEM_H -#include <memrange.h> -#include <stdint.h> #include <boot/coreboot_tables.h> +#include <memrange.h> +#include <types.h> /** * Bootmem types match to LB_MEM tags, except for the following: diff --git a/src/include/console/usb.h b/src/include/console/usb.h index 33edbf6e5fb3..ad57d522dc87 100644 --- a/src/include/console/usb.h +++ b/src/include/console/usb.h @@ -17,7 +17,7 @@ #ifndef _CONSOLE_USB_H_ #define _CONSOLE_USB_H_ -#include <stdint.h> +#include <types.h> void usbdebug_init(void); int usbdebug_hw_init(bool force); diff --git a/src/include/device/device.h b/src/include/device/device.h index 405d816e153f..b1c1651ec9e0 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -9,11 +9,10 @@ */ #if !defined(__ROMCC__) -#include <stdint.h> -#include <stddef.h> #include <device/resource.h> #include <device/path.h> #include <device/pci_type.h> +#include <types.h> struct device; struct pci_operations; diff --git a/src/include/stdbool.h b/src/include/stdbool.h new file mode 100644 index 000000000000..2eeb70ef5bbe --- /dev/null +++ b/src/include/stdbool.h @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __STDBOOL_H__ +#define __STDBOOL_H__ + +#include <stdint.h> + +#ifdef __ROMCC__ +typedef uint8_t bool; +#else +typedef _Bool bool; +#endif +#define true 1 +#define false 0 + +#endif /* __STDBOOL_H__ */ diff --git a/src/include/stdint.h b/src/include/stdint.h index 0a8e153d6afa..67b0b0be08dd 100644 --- a/src/include/stdint.h +++ b/src/include/stdint.h @@ -101,13 +101,4 @@ typedef uint64_t u64; #define UINTMAX_MAX UINT64_MAX #endif -/* TODO: move into stdbool.h */ -#ifdef __ROMCC__ -typedef uint8_t bool; -#else -typedef _Bool bool; -#endif -#define true 1 -#define false 0 - #endif /* STDINT_H */ diff --git a/src/include/types.h b/src/include/types.h index 5902bc268a7b..30f243ff995c 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -16,7 +16,8 @@ #ifndef __TYPES_H #define __TYPES_H -/* types.h is supposed to provide stdint and stddef defined in here: */ +/* types.h is supposed to provide the standard headers defined in here: */ +#include <stdbool.h> #include <stdint.h> #include <stddef.h> diff --git a/src/lib/imd.c b/src/lib/imd.c index 17ec2d9a48de..b5fc34a9a0fd 100644 --- a/src/lib/imd.c +++ b/src/lib/imd.c @@ -19,6 +19,7 @@ #include <imd.h> #include <stdlib.h> #include <string.h> +#include <types.h> /* For more details on implementation and usage please see the imd.h header. */ diff --git a/src/security/memory/memory.c b/src/security/memory/memory.c index 14f28578b5ee..c815236c9c32 100644 --- a/src/security/memory/memory.c +++ b/src/security/memory/memory.c @@ -14,7 +14,7 @@ * GNU General Public License for more details. */ -#include <stdint.h> +#include <types.h> #include "memory.h" /** diff --git a/src/soc/intel/common/block/include/intelblocks/cpulib.h b/src/soc/intel/common/block/include/intelblocks/cpulib.h index a422094b2619..84e750e2afa2 100644 --- a/src/soc/intel/common/block/include/intelblocks/cpulib.h +++ b/src/soc/intel/common/block/include/intelblocks/cpulib.h @@ -17,8 +17,7 @@ #ifndef SOC_INTEL_COMMON_BLOCK_CPULIB_H #define SOC_INTEL_COMMON_BLOCK_CPULIB_H -#include <stdint.h> -#include <stddef.h> +#include <types.h> /* * Set PERF_CTL MSR (0x199) P_Req with diff --git a/src/soc/intel/common/block/include/intelblocks/fast_spi.h b/src/soc/intel/common/block/include/intelblocks/fast_spi.h index 6499ca5f5c4c..e0e664931b9e 100644 --- a/src/soc/intel/common/block/include/intelblocks/fast_spi.h +++ b/src/soc/intel/common/block/include/intelblocks/fast_spi.h @@ -16,8 +16,7 @@ #ifndef SOC_INTEL_COMMON_BLOCK_FAST_SPI_H #define SOC_INTEL_COMMON_BLOCK_FAST_SPI_H -#include <stdint.h> -#include <stddef.h> +#include <types.h> /* * Disable the BIOS write protect and Enable Prefetching and Caching. diff --git a/src/soc/intel/common/block/include/intelblocks/pcr.h b/src/soc/intel/common/block/include/intelblocks/pcr.h index c3af2fddc3fe..c6554a36e516 100644 --- a/src/soc/intel/common/block/include/intelblocks/pcr.h +++ b/src/soc/intel/common/block/include/intelblocks/pcr.h @@ -20,7 +20,7 @@ #define PCR_PORTID_SHIFT 16 #if !defined(__ACPI__) -#include <stdint.h> +#include <types.h> uint32_t pcr_read32(uint8_t pid, uint16_t offset); uint16_t pcr_read16(uint8_t pid, uint16_t offset); diff --git a/src/soc/mediatek/mt8183/include/soc/mt6358.h b/src/soc/mediatek/mt8183/include/soc/mt6358.h index 6b74695babe6..1c3e563df874 100644 --- a/src/soc/mediatek/mt8183/include/soc/mt6358.h +++ b/src/soc/mediatek/mt8183/include/soc/mt6358.h @@ -16,6 +16,8 @@ #ifndef __SOC_MEDIATEK_MT6358_H__ #define __SOC_MEDIATEK_MT6358_H__ +#include <types.h> + enum { PMIC_SWCID = 0x000a, PMIC_VM_MODE = 0x004e, |