diff options
| author | Martin Roth <gaumless@gmail.com> | 2015-01-11 11:34:36 -0700 |
|---|---|---|
| committer | Martin Roth <gaumless@gmail.com> | 2015-01-13 18:19:08 +0100 |
| commit | fa6bd71bddca404e99e4ab119b890020c0fda998 (patch) | |
| tree | 7ae0e0d60048eaa2b016021c2ca2cd505825f802 /src/vendorcode | |
| parent | 735e10a0d55117034233b8b0388ddf862138699d (diff) | |
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>
Reviewed-on: http://review.coreboot.org/8193
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Diffstat (limited to 'src/vendorcode')
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 54f75a2fd6..4a313adc5d 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 8950367245..a3a54c0d2f 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 8950367245..a3a54c0d2f 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 3d2e6631a1..5912e0115b 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 |