GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arch/x86: do not define type of SPIN_LOCK_UNLOCKED 

This fixes building coreboot with -std=gnu11 on gcc 4.9.x
Also needs fix ups for asus/kcma-d8 and asus/kgpe-d16 due to the missing
type.

Change-Id: I920d492a1422433d7d4b4659b27f5a22914bc438
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: https://review.coreboot.org/18220
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins)
This commit is contained in:
Patrick Georgi 2017-01-24 12:30:04 +01:00 committed by Patrick Georgi
parent 29c19a027a
commit 06a629e4b1
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/arch/x86/include/arch/smp/spinlock.h
View File

@ -36,7 +36,7 @@ spinlock_t* romstage_microcode_cbfs_lock(void);
void initialize_romstage_microcode_cbfs_lock(void); void initialize_romstage_microcode_cbfs_lock(void);
#endif #endif
#define SPIN_LOCK_UNLOCKED (spinlock_t) { 1 } #define SPIN_LOCK_UNLOCKED { 1 }
#ifndef __PRE_RAM__ #ifndef __PRE_RAM__
#define DECLARE_SPIN_LOCK(x) static spinlock_t x = SPIN_LOCK_UNLOCKED; #define DECLARE_SPIN_LOCK(x) static spinlock_t x = SPIN_LOCK_UNLOCKED;

6
src/mainboard/asus/kcma-d8/romstage.c
View File

@ -323,7 +323,7 @@ spinlock_t* romstage_console_lock(void)
void initialize_romstage_console_lock(void) void initialize_romstage_console_lock(void)
{ {
car_get_var(printk_spinlock) = SPIN_LOCK_UNLOCKED; spin_unlock(romstage_console_lock());
} }
static spinlock_t nvram_cbfs_spinlock CAR_GLOBAL; static spinlock_t nvram_cbfs_spinlock CAR_GLOBAL;
@ -335,7 +335,7 @@ spinlock_t* romstage_nvram_cbfs_lock(void)
void initialize_romstage_nvram_cbfs_lock(void) void initialize_romstage_nvram_cbfs_lock(void)
{ {
car_get_var(nvram_cbfs_spinlock) = SPIN_LOCK_UNLOCKED; spin_unlock(romstage_nvram_cbfs_lock());
} }
static spinlock_t microcode_cbfs_spinlock CAR_GLOBAL; static spinlock_t microcode_cbfs_spinlock CAR_GLOBAL;
@ -347,7 +347,7 @@ spinlock_t* romstage_microcode_cbfs_lock(void)
void initialize_romstage_microcode_cbfs_lock(void) void initialize_romstage_microcode_cbfs_lock(void)
{ {
car_get_var(microcode_cbfs_spinlock) = SPIN_LOCK_UNLOCKED; spin_unlock(romstage_microcode_cbfs_lock());
} }
void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)

6
src/mainboard/asus/kgpe-d16/romstage.c
View File

@ -363,7 +363,7 @@ spinlock_t* romstage_console_lock(void)
void initialize_romstage_console_lock(void) void initialize_romstage_console_lock(void)
{ {
car_get_var(printk_spinlock) = SPIN_LOCK_UNLOCKED; spin_unlock(romstage_console_lock());
} }
static spinlock_t nvram_cbfs_spinlock CAR_GLOBAL; static spinlock_t nvram_cbfs_spinlock CAR_GLOBAL;
@ -375,7 +375,7 @@ spinlock_t* romstage_nvram_cbfs_lock(void)
void initialize_romstage_nvram_cbfs_lock(void) void initialize_romstage_nvram_cbfs_lock(void)
{ {
car_get_var(nvram_cbfs_spinlock) = SPIN_LOCK_UNLOCKED; spin_unlock(romstage_nvram_cbfs_lock());
} }
static spinlock_t microcode_cbfs_spinlock CAR_GLOBAL; static spinlock_t microcode_cbfs_spinlock CAR_GLOBAL;
@ -387,7 +387,7 @@ spinlock_t* romstage_microcode_cbfs_lock(void)
void initialize_romstage_microcode_cbfs_lock(void) void initialize_romstage_microcode_cbfs_lock(void)
{ {
car_get_var(microcode_cbfs_spinlock) = SPIN_LOCK_UNLOCKED; spin_unlock(romstage_microcode_cbfs_lock());
} }
void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)