Hung-Te Lin (hungte@chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2298
-gerrit
commit 4d41ed83d18dfd8593a5e637ef3a1d2b6970be8c Author: Hung-Te Lin hungte@chromium.org Date: Wed Feb 6 18:03:40 2013 +0800
armv7: Clean up: replace hang() by hlt().
hang() is the legacy function from U-boot and should be replaced by hlt() in coreboot.
Change-Id: I0f390b1b6f9ff71487ea36cf16c462724b66d8ca Signed-off-by: Hung-Te Lin hungte@chromium.org --- src/arch/armv7/include/common.h | 2 -- src/arch/armv7/include/hang.h | 20 -------------------- src/arch/armv7/lib/Makefile.inc | 2 -- src/arch/armv7/lib/hang_spl.c | 16 ---------------- src/cpu/samsung/exynos5-common/spl_boot.c | 2 +- 5 files changed, 1 insertion(+), 41 deletions(-)
diff --git a/src/arch/armv7/include/common.h b/src/arch/armv7/include/common.h index 1b69e84..d95a74d 100644 --- a/src/arch/armv7/include/common.h +++ b/src/arch/armv7/include/common.h @@ -129,8 +129,6 @@ ulong timer_get_us(void); * Function Prototypes */
-void hang (void) __attribute__ ((noreturn)); - int init_timer(void); /* FIXME(dhendrix): used to be timer_init() */ int cpu_init(void);
diff --git a/src/arch/armv7/include/hang.h b/src/arch/armv7/include/hang.h deleted file mode 100644 index f57fc28..0000000 --- a/src/arch/armv7/include/hang.h +++ /dev/null @@ -1,20 +0,0 @@ - /* - * This file is part of the coreboot project. - * - * Copyright (C) 2012 The ChromiumOS Authors. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -void hang(void); diff --git a/src/arch/armv7/lib/Makefile.inc b/src/arch/armv7/lib/Makefile.inc index 4fd15a6..343e9f8 100644 --- a/src/arch/armv7/lib/Makefile.inc +++ b/src/arch/armv7/lib/Makefile.inc @@ -5,7 +5,6 @@ romstage-y += cache_v7.c romstage-y += cache-cp15.c romstage-y += div0.c romstage-y += div64.S -romstage-y += hang_spl.c romstage-y += romstage_console.c romstage-y += syslib.c
@@ -13,7 +12,6 @@ romstage-y += syslib.c
ramstage-y += div0.c ramstage-y += div64.S -ramstage-y += hang_spl.c #ramstage-y += interrupts.c #ramstage-y += memcpy.S #ramstage-y += memset.S diff --git a/src/arch/armv7/lib/hang_spl.c b/src/arch/armv7/lib/hang_spl.c deleted file mode 100644 index 630a57a..0000000 --- a/src/arch/armv7/lib/hang_spl.c +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (c) 2012 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - */ - -#include <hang.h> - -void hang(void) -{ - for (;;); -} diff --git a/src/cpu/samsung/exynos5-common/spl_boot.c b/src/cpu/samsung/exynos5-common/spl_boot.c index ddf6937..101afeb 100644 --- a/src/cpu/samsung/exynos5-common/spl_boot.c +++ b/src/cpu/samsung/exynos5-common/spl_boot.c @@ -410,7 +410,7 @@ void panic(const char *fmt, ...) putc('\n'); va_end(args); #if defined(CONFIG_PANIC_HANG) - hang(); + hlt(); #else udelay(100000); /* allow messages to go out */ do_reset(NULL, 0, 0, NULL);