From aac31ca22149f7e3a6f90d6c229f3fc87fb53592 Mon Sep 17 00:00:00 2001 From: Lee Leahy Date: Sat, 30 Jul 2016 10:29:37 -0700 Subject: soc/intel/common: Fix build error in reset.c Fix build error caused by macro substitution in the function definition when the Kconfig value HAVE_HARD_RESET is not selected. src/soc/intel/common/reset.c:36:21: error: macro "hard_reset" passed 1 arguments, but takes just 0 void hard_reset(void) ^ src/soc/intel/common/reset.c:37:1: error: expected '=', ',', ';', 'asm' or '__attribute__' before '{' token { ^ make: *** [build/bootblock/soc/intel/common/reset.o] Error 1 TEST=Build and run on Galileo Gen2 Change-Id: I793570e62a0e46cca86cc540c243e363896ceac7 Signed-off-by: Lee Leahy Reviewed-on: https://review.coreboot.org/15988 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/soc/intel/common/reset.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/soc/intel') diff --git a/src/soc/intel/common/reset.c b/src/soc/intel/common/reset.c index 08f36b6560..e9be1855b0 100644 --- a/src/soc/intel/common/reset.c +++ b/src/soc/intel/common/reset.c @@ -33,6 +33,7 @@ void WEAK reset_prepare(void) { /* do nothing */ } +#if IS_ENABLED(CONFIG_HAVE_HARD_RESET) void hard_reset(void) { reset_prepare(); @@ -41,6 +42,7 @@ void hard_reset(void) while (1) hlt(); } +#endif void soft_reset(void) { -- cgit v1.2.3