HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/44207 )
Change subject: src/include: Clean up some includes ......................................................................
src/include: Clean up some includes
Change-Id: I69c4d21273c9fb400449fd39274f15c0be013402 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/include/bootblock_common.h M src/include/bootsplash.h M src/include/cpu/amd/amd64_save_state.h M src/include/cpu/intel/em64t100_save_state.h M src/include/cpu/intel/em64t101_save_state.h M src/include/cpu/x86/legacy_save_state.h M src/include/device/smbus_def.h M src/include/option.h M src/include/symbols.h M src/include/timer.h 10 files changed, 9 insertions(+), 13 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/44207/1
diff --git a/src/include/bootblock_common.h b/src/include/bootblock_common.h index 97ccf96..59eb83a 100644 --- a/src/include/bootblock_common.h +++ b/src/include/bootblock_common.h @@ -5,8 +5,8 @@
#include <arch/cpu.h> #include <main_decl.h> +#include <stdint.h> #include <timestamp.h> -#include <types.h>
/* * These are defined as weak no-ops that can be overridden by mainboard/SoC. diff --git a/src/include/bootsplash.h b/src/include/bootsplash.h index d5aecf8..9ba730d 100644 --- a/src/include/bootsplash.h +++ b/src/include/bootsplash.h @@ -3,8 +3,6 @@ #ifndef __BOOTSPLASH_H__ #define __BOOTSPLASH_H__
-#include <types.h> - /** * Sets up the framebuffer with the bootsplash.jpg from cbfs. * Returns 0 on success diff --git a/src/include/cpu/amd/amd64_save_state.h b/src/include/cpu/amd/amd64_save_state.h index 08b700a..27b1ecf 100644 --- a/src/include/cpu/amd/amd64_save_state.h +++ b/src/include/cpu/amd/amd64_save_state.h @@ -4,8 +4,8 @@ #define __AMD64_SAVE_STATE_H__ #endif
-#include <types.h> #include <cpu/x86/smm.h> +#include <stdint.h>
/* AMD64 x86 SMM State-Save Area * starts @ 0x7e00 diff --git a/src/include/cpu/intel/em64t100_save_state.h b/src/include/cpu/intel/em64t100_save_state.h index 8596ce5..c510d4b 100644 --- a/src/include/cpu/intel/em64t100_save_state.h +++ b/src/include/cpu/intel/em64t100_save_state.h @@ -3,8 +3,8 @@ #ifndef __EM64T100_SAVE_STATE_H__ #define __EM64T100_SAVE_STATE_H__
-#include <types.h> #include <cpu/x86/smm.h> +#include <stdint.h>
/* Intel Revision 30100 SMM State-Save Area */
diff --git a/src/include/cpu/intel/em64t101_save_state.h b/src/include/cpu/intel/em64t101_save_state.h index 2e4e0d5..ce5a974 100644 --- a/src/include/cpu/intel/em64t101_save_state.h +++ b/src/include/cpu/intel/em64t101_save_state.h @@ -3,9 +3,8 @@ #ifndef __EM64T101_SAVE_STATE_H__ #define __EM64T101_SAVE_STATE_H__
-#include <types.h> #include <cpu/x86/smm.h> - +#include <stdint.h>
/* Intel Revision 30101 SMM State-Save Area * The following processor architectures use this: diff --git a/src/include/cpu/x86/legacy_save_state.h b/src/include/cpu/x86/legacy_save_state.h index 4c9923c..c557e28 100644 --- a/src/include/cpu/x86/legacy_save_state.h +++ b/src/include/cpu/x86/legacy_save_state.h @@ -3,7 +3,7 @@ #ifndef __X86_LEGACY_SAVE_STATE_H__ #define __X86_LEGACY_SAVE_STATE_H__
-#include <types.h> +#include <stdint.h>
/* Legacy x86 SMM State-Save Area * starts @ 0x7e00 diff --git a/src/include/device/smbus_def.h b/src/include/device/smbus_def.h index 61d7861..ef9fb56 100644 --- a/src/include/device/smbus_def.h +++ b/src/include/device/smbus_def.h @@ -1,7 +1,7 @@ #ifndef DEVICE_SMBUS_DEF_H #define DEVICE_SMBUS_DEF_H
-#include <types.h> +#include <commonlib/bsd/cb_err.h>
/* Error results are negative success is >= 0 */ #define SMBUS_ERROR CB_ERR diff --git a/src/include/option.h b/src/include/option.h index 6b4e6a9..09a29f2 100644 --- a/src/include/option.h +++ b/src/include/option.h @@ -3,7 +3,7 @@ #ifndef _OPTION_H_ #define _OPTION_H_
-#include <types.h> +#include <commonlib/bsd/cb_err.h>
void sanitize_cmos(void);
diff --git a/src/include/symbols.h b/src/include/symbols.h index f84672e..c081efc 100644 --- a/src/include/symbols.h +++ b/src/include/symbols.h @@ -3,7 +3,8 @@ #ifndef __SYMBOLS_H #define __SYMBOLS_H
-#include <types.h> +#include <rules.h> +#include <stdint.h>
extern u8 _dram[];
diff --git a/src/include/timer.h b/src/include/timer.h index 9b7a05e..0bb8666 100644 --- a/src/include/timer.h +++ b/src/include/timer.h @@ -2,8 +2,6 @@ #ifndef TIMER_H #define TIMER_H
-#include <types.h> - #define NSECS_PER_SEC 1000000000 #define USECS_PER_SEC 1000000 #define MSECS_PER_SEC 1000