From 0867062412dd4bfe5a556e5f3fd85ba5b682d79b Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Tue, 30 Jun 2009 15:17:49 +0000 Subject: This patch unifies the use of config options in v2 to all start with CONFIG_ It's basically done with the following script and some manual fixup: VARS=`grep ^define src/config/Options.lb | cut -f2 -d\ | grep -v ^CONFIG | grep -v ^COREBOOT |grep -v ^CC` for VAR in $VARS; do find . -name .svn -prune -o -type f -exec perl -pi -e "s/(^|[^0-9a-zA-Z_]+)$VAR($|[^0-9a-zA-Z_]+)/\1CONFIG_$VAR\2/g" {} \; done Signed-off-by: Stefan Reinauer Acked-by: Ronald G. Minnich git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4381 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/include/part/fallback_boot.h | 2 +- src/include/part/hard_reset.h | 2 +- src/include/part/init_timer.h | 2 +- src/include/part/watchdog.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/include/part') diff --git a/src/include/part/fallback_boot.h b/src/include/part/fallback_boot.h index 17db5c6d9f..be4e3989bd 100644 --- a/src/include/part/fallback_boot.h +++ b/src/include/part/fallback_boot.h @@ -3,7 +3,7 @@ #ifndef ASSEMBLY -#if HAVE_FALLBACK_BOOT == 1 +#if CONFIG_HAVE_FALLBACK_BOOT == 1 void set_boot_successful(void); #else #define set_boot_successful() diff --git a/src/include/part/hard_reset.h b/src/include/part/hard_reset.h index fd1bf62c44..cbfc747d1e 100644 --- a/src/include/part/hard_reset.h +++ b/src/include/part/hard_reset.h @@ -1,7 +1,7 @@ #ifndef PART_HARD_RESET_H #define PART_HARD_RESET_H -#if HAVE_HARD_RESET == 1 +#if CONFIG_HAVE_HARD_RESET == 1 void hard_reset(void); #else #define hard_reset() do {} while(0) diff --git a/src/include/part/init_timer.h b/src/include/part/init_timer.h index d8b372dc38..61142964a2 100644 --- a/src/include/part/init_timer.h +++ b/src/include/part/init_timer.h @@ -1,7 +1,7 @@ #ifndef PART_INIT_TIMER_H #define PART_DELAY_H -#if HAVE_INIT_TIMER == 1 +#if CONFIG_HAVE_INIT_TIMER == 1 void init_timer(void); #else #define init_timer() do{} while(0) diff --git a/src/include/part/watchdog.h b/src/include/part/watchdog.h index 4374f3060d..26b537dbe9 100644 --- a/src/include/part/watchdog.h +++ b/src/include/part/watchdog.h @@ -1,7 +1,7 @@ #ifndef PART_WATCHDOG_H #define PART_WATCHDOG_H -#if USE_WATCHDOG_ON_BOOT == 1 +#if CONFIG_USE_WATCHDOG_ON_BOOT == 1 void watchdog_off(void); #else #define watchdog_off() -- cgit v1.2.3