Martin Roth (gaumless@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8193
-gerrit
commit c400497eac5dfff5bafe2183953ec3b8aa099c80 Author: Martin Roth gaumless@gmail.com Date: Sun Jan 11 11:34:36 2015 -0700
vendorcode/intel: remove DebugDeadLoop() from fsptypes.h
When included for the CAR transition, this was causing the error: error: invalid storage class for function 'DebugDeadLoop'
Change-Id: Idf37a8104b4468b40c29c8cbe9a40f7a357a4f17 Signed-off-by: Martin Roth gaumless@gmail.com --- src/vendorcode/intel/fsp/baytrail/include/fsptypes.h | 9 ++------- src/vendorcode/intel/fsp/ivybridge_bd82x6x/include/fsptypes.h | 9 ++------- src/vendorcode/intel/fsp/ivybridge_i89xx/include/fsptypes.h | 9 ++------- src/vendorcode/intel/fsp/rangeley/include/fsptypes.h | 9 ++------- 4 files changed, 8 insertions(+), 28 deletions(-)
diff --git a/src/vendorcode/intel/fsp/baytrail/include/fsptypes.h b/src/vendorcode/intel/fsp/baytrail/include/fsptypes.h index 54f75a2..4a313ad 100644 --- a/src/vendorcode/intel/fsp/baytrail/include/fsptypes.h +++ b/src/vendorcode/intel/fsp/baytrail/include/fsptypes.h @@ -100,22 +100,17 @@ typedef struct { #define TRUE ((BOOLEAN)(1==1)) #define FALSE ((BOOLEAN)(0==1))
-static inline void DebugDeadLoop(void) { - for (;;); -} - #define FSPAPI __attribute__((cdecl)) #define EFIAPI __attribute__((cdecl))
-#define _ASSERT(Expression) DebugDeadLoop() #define ASSERT(Expression) \ do { \ if (!(Expression)) { \ - _ASSERT (Expression); \ + for (;;); \ } \ } while (FALSE)
typedef UINT32 FSP_STATUS; typedef UINT32 EFI_STATUS;
-#endif \ No newline at end of file +#endif diff --git a/src/vendorcode/intel/fsp/ivybridge_bd82x6x/include/fsptypes.h b/src/vendorcode/intel/fsp/ivybridge_bd82x6x/include/fsptypes.h index 8950367..a3a54c0 100644 --- a/src/vendorcode/intel/fsp/ivybridge_bd82x6x/include/fsptypes.h +++ b/src/vendorcode/intel/fsp/ivybridge_bd82x6x/include/fsptypes.h @@ -100,22 +100,17 @@ typedef struct { #define TRUE ((BOOLEAN)(1==1)) #define FALSE ((BOOLEAN)(0==1))
-static inline void DebugDeadLoop(void) { - for (;;); -} - #define FSPAPI __attribute__((cdecl)) #define EFIAPI __attribute__((cdecl))
-#define _ASSERT(Expression) DebugDeadLoop() #define ASSERT(Expression) \ do { \ if (!(Expression)) { \ - _ASSERT (Expression); \ + for (;;); \ } \ } while (FALSE)
typedef UINT32 FSP_STATUS; typedef UINT32 EFI_STATUS;
-#endif \ No newline at end of file +#endif diff --git a/src/vendorcode/intel/fsp/ivybridge_i89xx/include/fsptypes.h b/src/vendorcode/intel/fsp/ivybridge_i89xx/include/fsptypes.h index 8950367..a3a54c0 100644 --- a/src/vendorcode/intel/fsp/ivybridge_i89xx/include/fsptypes.h +++ b/src/vendorcode/intel/fsp/ivybridge_i89xx/include/fsptypes.h @@ -100,22 +100,17 @@ typedef struct { #define TRUE ((BOOLEAN)(1==1)) #define FALSE ((BOOLEAN)(0==1))
-static inline void DebugDeadLoop(void) { - for (;;); -} - #define FSPAPI __attribute__((cdecl)) #define EFIAPI __attribute__((cdecl))
-#define _ASSERT(Expression) DebugDeadLoop() #define ASSERT(Expression) \ do { \ if (!(Expression)) { \ - _ASSERT (Expression); \ + for (;;); \ } \ } while (FALSE)
typedef UINT32 FSP_STATUS; typedef UINT32 EFI_STATUS;
-#endif \ No newline at end of file +#endif diff --git a/src/vendorcode/intel/fsp/rangeley/include/fsptypes.h b/src/vendorcode/intel/fsp/rangeley/include/fsptypes.h index 3d2e663..5912e01 100644 --- a/src/vendorcode/intel/fsp/rangeley/include/fsptypes.h +++ b/src/vendorcode/intel/fsp/rangeley/include/fsptypes.h @@ -100,18 +100,13 @@ typedef struct { #define TRUE ((BOOLEAN)(1==1)) #define FALSE ((BOOLEAN)(0==1))
-static inline void DebugDeadLoop(void) { - for (;;); -} - #define FSPAPI __attribute__((cdecl)) #define EFIAPI __attribute__((cdecl))
-#define _ASSERT(Expression) DebugDeadLoop() #define ASSERT(Expression) \ do { \ if (!(Expression)) { \ - _ASSERT (Expression); \ + for (;;); \ } \ } while (FALSE)
@@ -180,4 +175,4 @@ typedef UINT32 EFI_STATUS; #define SIGNATURE_64(A, B, C, D, E, F, G, H) \ (SIGNATURE_32 (A, B, C, D) | ((UINT64) (SIGNATURE_32 (E, F, G, H)) << 32))
-#endif \ No newline at end of file +#endif