From c82ec0ed33eddfff8dfb20de81376a329bc7f51e Mon Sep 17 00:00:00 2001 From: David Hendricks Date: Wed, 9 Jan 2013 16:14:00 -0800 Subject: [PATCH] armv7: update board_init_f function signature We don't pass arguments when we jump out of assembly code. Change-Id: Iccf3a6f713e260b08f9ff47e8b542b9e96369166 Signed-off-by: David Hendricks Reviewed-on: http://review.coreboot.org/2122 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich --- src/arch/armv7/include/common.h | 3 +-- src/cpu/samsung/exynos5-common/spl_boot.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/arch/armv7/include/common.h b/src/arch/armv7/include/common.h index e21cfb0239..2d4d020f37 100644 --- a/src/arch/armv7/include/common.h +++ b/src/arch/armv7/include/common.h @@ -164,8 +164,7 @@ void init_cmd_timeout(void); void reset_cmd_timeout(void); /* arch/$(ARCH)/lib/board.c */ -void board_init_f (ulong); -//void board_init_f (ulong) __attribute__ ((noreturn)); +void board_init_f (void); void board_init_r (gd_t *, ulong) __attribute__ ((noreturn)); int checkboard (void); int checkflash (void); diff --git a/src/cpu/samsung/exynos5-common/spl_boot.c b/src/cpu/samsung/exynos5-common/spl_boot.c index a734d5c17b..ecff87131e 100644 --- a/src/cpu/samsung/exynos5-common/spl_boot.c +++ b/src/cpu/samsung/exynos5-common/spl_boot.c @@ -308,7 +308,7 @@ static int __def_board_wakeup_permitted(void) int board_wakeup_permitted(void) __attribute__((weak, alias("__def_board_wakeup_permitted"))); -void board_init_f(unsigned long bootflag) +void board_init_f(void) { /* * The gd struct is only needed for serial initialization. Since this