HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32806
Change subject: src/{device,drivers}: Add missing 'include <types.h>' ......................................................................
src/{device,drivers}: Add missing 'include <types.h>'
<types.h> is supposed to provide <stdint.h> and <stddef.h>. So when <types.h> is included, <stdint.h> and/or <stddef.h> is removed.
Change-Id: I3395715f9e2b03175089186ab2e57d9e508fc87c Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/device/dram/ddr2.c M src/device/dram/ddr3.c M src/drivers/generic/bayhub/bh720.h M src/drivers/intel/fsp2_0/graphics.c M src/drivers/intel/fsp2_0/include/fsp/util.h M src/drivers/intel/fsp2_0/memory_init.c M src/drivers/intel/fsp2_0/silicon_init.c M src/drivers/intel/fsp2_0/temp_ram_exit.c M src/drivers/intel/fsp2_0/util.c M src/drivers/net/atl1e.c M src/drivers/net/r8168.c M src/drivers/pc80/rtc/mc146818rtc.c M src/drivers/xpowers/axp209/axp209.c 13 files changed, 18 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/06/32806/1
diff --git a/src/device/dram/ddr2.c b/src/device/dram/ddr2.c index 53106f2..60588b8 100644 --- a/src/device/dram/ddr2.c +++ b/src/device/dram/ddr2.c @@ -26,6 +26,7 @@ #include <device/dram/ddr2.h> #include <lib.h> #include <string.h> +#include <types.h>
/*============================================================================== * = DDR2 SPD decoding helpers diff --git a/src/device/dram/ddr3.c b/src/device/dram/ddr3.c index e545b4d..3272dac 100644 --- a/src/device/dram/ddr3.c +++ b/src/device/dram/ddr3.c @@ -27,6 +27,7 @@ #include <memory_info.h> #include <cbmem.h> #include <smbios.h> +#include <types.h>
/*============================================================================== * = DDR3 SPD decoding helpers diff --git a/src/drivers/generic/bayhub/bh720.h b/src/drivers/generic/bayhub/bh720.h index 3183bf1..ecea513 100644 --- a/src/drivers/generic/bayhub/bh720.h +++ b/src/drivers/generic/bayhub/bh720.h @@ -15,6 +15,8 @@ * GNU General Public License for more details. */
+#include <types.h> + enum { BH720_PROTECT = 0xd0, BH720_PROTECT_LOCK_OFF = 0, diff --git a/src/drivers/intel/fsp2_0/graphics.c b/src/drivers/intel/fsp2_0/graphics.c index e0c63d2..55dc6df 100644 --- a/src/drivers/intel/fsp2_0/graphics.c +++ b/src/drivers/intel/fsp2_0/graphics.c @@ -13,6 +13,7 @@ #include <console/console.h> #include <fsp/util.h> #include <soc/intel/common/vbt.h> +#include <types.h>
enum pixel_format { pixel_rgbx_8bpc = 0, diff --git a/src/drivers/intel/fsp2_0/include/fsp/util.h b/src/drivers/intel/fsp2_0/include/fsp/util.h index 231162e..ef7ecd1 100644 --- a/src/drivers/intel/fsp2_0/include/fsp/util.h +++ b/src/drivers/intel/fsp2_0/include/fsp/util.h @@ -19,6 +19,7 @@ #include <fsp/api.h> #include <fsp/info_header.h> #include <memrange.h> +#include <types.h>
struct hob_header { uint16_t type; diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c index b3afb98..97d35fe 100644 --- a/src/drivers/intel/fsp2_0/memory_init.c +++ b/src/drivers/intel/fsp2_0/memory_init.c @@ -32,6 +32,7 @@ #include <security/tpm/tspi.h> #include <vb2_api.h> #include <fsp/memory_init.h> +#include <types.h>
/* TPM MRC hash functionality depends on vboot starting before memory init. */ _Static_assert(!CONFIG(FSP2_0_USES_TPM_MRC_HASH) || diff --git a/src/drivers/intel/fsp2_0/silicon_init.c b/src/drivers/intel/fsp2_0/silicon_init.c index 402b05d..d5fb65f 100644 --- a/src/drivers/intel/fsp2_0/silicon_init.c +++ b/src/drivers/intel/fsp2_0/silicon_init.c @@ -21,6 +21,7 @@ #include <stage_cache.h> #include <string.h> #include <timestamp.h> +#include <types.h>
struct fsp_header fsps_hdr;
diff --git a/src/drivers/intel/fsp2_0/temp_ram_exit.c b/src/drivers/intel/fsp2_0/temp_ram_exit.c index ced3584..075e923 100644 --- a/src/drivers/intel/fsp2_0/temp_ram_exit.c +++ b/src/drivers/intel/fsp2_0/temp_ram_exit.c @@ -15,6 +15,7 @@ #include <fsp/util.h> #include <memrange.h> #include <cbfs.h> +#include <types.h>
void fsp_temp_ram_exit(void) { diff --git a/src/drivers/intel/fsp2_0/util.c b/src/drivers/intel/fsp2_0/util.c index 19b8127..f670e6f 100644 --- a/src/drivers/intel/fsp2_0/util.c +++ b/src/drivers/intel/fsp2_0/util.c @@ -16,6 +16,7 @@ #include <console/console.h> #include <fsp/util.h> #include <string.h> +#include <types.h>
static bool looks_like_fsp_header(const uint8_t *raw_hdr) { diff --git a/src/drivers/net/atl1e.c b/src/drivers/net/atl1e.c index f6f04a1..097b768 100644 --- a/src/drivers/net/atl1e.c +++ b/src/drivers/net/atl1e.c @@ -26,6 +26,7 @@ #include <console/console.h> #include <device/pci.h> #include <device/pci_ops.h> +#include <types.h>
#define REG_SPI_FLASH_CTRL 0x200 #define SPI_FLASH_CTRL_EN_VPD 0x2000 diff --git a/src/drivers/net/r8168.c b/src/drivers/net/r8168.c index 3200163..3188778 100644 --- a/src/drivers/net/r8168.c +++ b/src/drivers/net/r8168.c @@ -33,6 +33,8 @@ #include <device/pci_def.h> #include <delay.h> #include <fmap.h> +#include <types.h> + #include "chip.h"
#define NIC_TIMEOUT 1000 diff --git a/src/drivers/pc80/rtc/mc146818rtc.c b/src/drivers/pc80/rtc/mc146818rtc.c index 6e37cd2..e0869a9 100644 --- a/src/drivers/pc80/rtc/mc146818rtc.c +++ b/src/drivers/pc80/rtc/mc146818rtc.c @@ -19,7 +19,6 @@ #include <arch/io.h> #include <bcd.h> #include <fallback.h> -#include <stdint.h> #include <version.h> #include <console/console.h> #include <pc80/mc146818rtc.h> @@ -29,6 +28,7 @@ #include <cbfs.h> #include <security/vboot/vbnv.h> #include <security/vboot/vbnv_layout.h> +#include <types.h>
/* There's no way around this include guard. option_table.h is autogenerated */ #if CONFIG(USE_OPTION_TABLE) diff --git a/src/drivers/xpowers/axp209/axp209.c b/src/drivers/xpowers/axp209/axp209.c index da575cc..93e864d 100644 --- a/src/drivers/xpowers/axp209/axp209.c +++ b/src/drivers/xpowers/axp209/axp209.c @@ -8,12 +8,13 @@ * Subject to the GNU GPL v2, or (at your option) any later version. */
-#include "axp209.h" -#include "chip.h" - #include <console/console.h> #include <device/device.h> #include <device/i2c_simple.h> +#include <types.h> + +#include "axp209.h" +#include "chip.h"
/* Hide these definitions from the rest of the source, so keep them here */ enum registers {
Lijian Zhao has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32806 )
Change subject: src/{device,drivers}: Add missing 'include <types.h>' ......................................................................
Patch Set 1: Code-Review+2
Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/32806 )
Change subject: src/{device,drivers}: Add missing 'include <types.h>' ......................................................................
src/{device,drivers}: Add missing 'include <types.h>'
<types.h> is supposed to provide <stdint.h> and <stddef.h>. So when <types.h> is included, <stdint.h> and/or <stddef.h> is removed.
Change-Id: I3395715f9e2b03175089186ab2e57d9e508fc87c Signed-off-by: Elyes HAOUAS ehaouas@noos.fr Reviewed-on: https://review.coreboot.org/c/coreboot/+/32806 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Lijian Zhao lijian.zhao@intel.com --- M src/device/dram/ddr2.c M src/device/dram/ddr3.c M src/drivers/generic/bayhub/bh720.h M src/drivers/intel/fsp2_0/graphics.c M src/drivers/intel/fsp2_0/include/fsp/util.h M src/drivers/intel/fsp2_0/memory_init.c M src/drivers/intel/fsp2_0/silicon_init.c M src/drivers/intel/fsp2_0/temp_ram_exit.c M src/drivers/intel/fsp2_0/util.c M src/drivers/net/atl1e.c M src/drivers/net/r8168.c M src/drivers/pc80/rtc/mc146818rtc.c M src/drivers/xpowers/axp209/axp209.c 13 files changed, 18 insertions(+), 4 deletions(-)
Approvals: build bot (Jenkins): Verified Lijian Zhao: Looks good to me, approved
diff --git a/src/device/dram/ddr2.c b/src/device/dram/ddr2.c index 53106f2..60588b8 100644 --- a/src/device/dram/ddr2.c +++ b/src/device/dram/ddr2.c @@ -26,6 +26,7 @@ #include <device/dram/ddr2.h> #include <lib.h> #include <string.h> +#include <types.h>
/*============================================================================== * = DDR2 SPD decoding helpers diff --git a/src/device/dram/ddr3.c b/src/device/dram/ddr3.c index e545b4d..3272dac 100644 --- a/src/device/dram/ddr3.c +++ b/src/device/dram/ddr3.c @@ -27,6 +27,7 @@ #include <memory_info.h> #include <cbmem.h> #include <smbios.h> +#include <types.h>
/*============================================================================== * = DDR3 SPD decoding helpers diff --git a/src/drivers/generic/bayhub/bh720.h b/src/drivers/generic/bayhub/bh720.h index 3183bf1..ecea513 100644 --- a/src/drivers/generic/bayhub/bh720.h +++ b/src/drivers/generic/bayhub/bh720.h @@ -15,6 +15,8 @@ * GNU General Public License for more details. */
+#include <types.h> + enum { BH720_PROTECT = 0xd0, BH720_PROTECT_LOCK_OFF = 0, diff --git a/src/drivers/intel/fsp2_0/graphics.c b/src/drivers/intel/fsp2_0/graphics.c index e0c63d2..55dc6df 100644 --- a/src/drivers/intel/fsp2_0/graphics.c +++ b/src/drivers/intel/fsp2_0/graphics.c @@ -13,6 +13,7 @@ #include <console/console.h> #include <fsp/util.h> #include <soc/intel/common/vbt.h> +#include <types.h>
enum pixel_format { pixel_rgbx_8bpc = 0, diff --git a/src/drivers/intel/fsp2_0/include/fsp/util.h b/src/drivers/intel/fsp2_0/include/fsp/util.h index 231162e..ef7ecd1 100644 --- a/src/drivers/intel/fsp2_0/include/fsp/util.h +++ b/src/drivers/intel/fsp2_0/include/fsp/util.h @@ -19,6 +19,7 @@ #include <fsp/api.h> #include <fsp/info_header.h> #include <memrange.h> +#include <types.h>
struct hob_header { uint16_t type; diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c index 60e3310..f248a58 100644 --- a/src/drivers/intel/fsp2_0/memory_init.c +++ b/src/drivers/intel/fsp2_0/memory_init.c @@ -32,6 +32,7 @@ #include <security/tpm/tspi.h> #include <vb2_api.h> #include <fsp/memory_init.h> +#include <types.h>
/* TPM MRC hash functionality depends on vboot starting before memory init. */ _Static_assert(!CONFIG(FSP2_0_USES_TPM_MRC_HASH) || diff --git a/src/drivers/intel/fsp2_0/silicon_init.c b/src/drivers/intel/fsp2_0/silicon_init.c index 302bc0f..e72e4ac 100644 --- a/src/drivers/intel/fsp2_0/silicon_init.c +++ b/src/drivers/intel/fsp2_0/silicon_init.c @@ -22,6 +22,7 @@ #include <stage_cache.h> #include <string.h> #include <timestamp.h> +#include <types.h>
struct fsp_header fsps_hdr;
diff --git a/src/drivers/intel/fsp2_0/temp_ram_exit.c b/src/drivers/intel/fsp2_0/temp_ram_exit.c index ced3584..075e923 100644 --- a/src/drivers/intel/fsp2_0/temp_ram_exit.c +++ b/src/drivers/intel/fsp2_0/temp_ram_exit.c @@ -15,6 +15,7 @@ #include <fsp/util.h> #include <memrange.h> #include <cbfs.h> +#include <types.h>
void fsp_temp_ram_exit(void) { diff --git a/src/drivers/intel/fsp2_0/util.c b/src/drivers/intel/fsp2_0/util.c index 19b8127..f670e6f 100644 --- a/src/drivers/intel/fsp2_0/util.c +++ b/src/drivers/intel/fsp2_0/util.c @@ -16,6 +16,7 @@ #include <console/console.h> #include <fsp/util.h> #include <string.h> +#include <types.h>
static bool looks_like_fsp_header(const uint8_t *raw_hdr) { diff --git a/src/drivers/net/atl1e.c b/src/drivers/net/atl1e.c index f6f04a1..097b768 100644 --- a/src/drivers/net/atl1e.c +++ b/src/drivers/net/atl1e.c @@ -26,6 +26,7 @@ #include <console/console.h> #include <device/pci.h> #include <device/pci_ops.h> +#include <types.h>
#define REG_SPI_FLASH_CTRL 0x200 #define SPI_FLASH_CTRL_EN_VPD 0x2000 diff --git a/src/drivers/net/r8168.c b/src/drivers/net/r8168.c index 3200163..3188778 100644 --- a/src/drivers/net/r8168.c +++ b/src/drivers/net/r8168.c @@ -33,6 +33,8 @@ #include <device/pci_def.h> #include <delay.h> #include <fmap.h> +#include <types.h> + #include "chip.h"
#define NIC_TIMEOUT 1000 diff --git a/src/drivers/pc80/rtc/mc146818rtc.c b/src/drivers/pc80/rtc/mc146818rtc.c index 6e37cd2..e0869a9 100644 --- a/src/drivers/pc80/rtc/mc146818rtc.c +++ b/src/drivers/pc80/rtc/mc146818rtc.c @@ -19,7 +19,6 @@ #include <arch/io.h> #include <bcd.h> #include <fallback.h> -#include <stdint.h> #include <version.h> #include <console/console.h> #include <pc80/mc146818rtc.h> @@ -29,6 +28,7 @@ #include <cbfs.h> #include <security/vboot/vbnv.h> #include <security/vboot/vbnv_layout.h> +#include <types.h>
/* There's no way around this include guard. option_table.h is autogenerated */ #if CONFIG(USE_OPTION_TABLE) diff --git a/src/drivers/xpowers/axp209/axp209.c b/src/drivers/xpowers/axp209/axp209.c index da575cc..93e864d 100644 --- a/src/drivers/xpowers/axp209/axp209.c +++ b/src/drivers/xpowers/axp209/axp209.c @@ -8,12 +8,13 @@ * Subject to the GNU GPL v2, or (at your option) any later version. */
-#include "axp209.h" -#include "chip.h" - #include <console/console.h> #include <device/device.h> #include <device/i2c_simple.h> +#include <types.h> + +#include "axp209.h" +#include "chip.h"
/* Hide these definitions from the rest of the source, so keep them here */ enum registers {
-
HAOUAS Elyes (Code Review) -
Lijian Zhao (Code Review)
-
Patrick Georgi (Code Review)