From: Simon Glass Date: Sun, 15 May 2016 00:49:35 +0000 (-0600) Subject: Drop use of CONFIG_SYS_GENERIC_BOARD in U-Boot X-Git-Tag: v2016.07-rc1~133 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9be2e790eb28cbb30fb16a939cb95f82ad73efe5;p=u-boot Drop use of CONFIG_SYS_GENERIC_BOARD in U-Boot This option is always enabled and is about to be removed. Drop references to it. Signed-off-by: Simon Glass Reviewed-by: Andreas Bießmann --- diff --git a/common/Makefile b/common/Makefile index 0562d5cea4..1557a044de 100644 --- a/common/Makefile +++ b/common/Makefile @@ -26,8 +26,8 @@ obj-y += bootretry.o endif # boards -obj-$(CONFIG_SYS_GENERIC_BOARD) += board_f.o -obj-$(CONFIG_SYS_GENERIC_BOARD) += board_r.o +obj-y += board_f.o +obj-y += board_r.o obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o obj-$(CONFIG_DISPLAY_BOARDINFO_LATE) += board_info.o diff --git a/common/main.c b/common/main.c index 42bbb50733..2116a9e0a2 100644 --- a/common/main.c +++ b/common/main.c @@ -47,12 +47,6 @@ void main_loop(void) bootstage_mark_name(BOOTSTAGE_ID_MAIN_LOOP, "main_loop"); -#ifndef CONFIG_SYS_GENERIC_BOARD - puts("Warning: Your board does not use generic board. Please read\n"); - puts("doc/README.generic-board and take action. Boards not\n"); - puts("upgraded by the late 2014 may break or be removed.\n"); -#endif - #ifdef CONFIG_VERSION_VARIABLE setenv("ver", version_string); /* set version variable */ #endif /* CONFIG_VERSION_VARIABLE */ diff --git a/include/watchdog.h b/include/watchdog.h index 9273fa1e80..174c894e49 100644 --- a/include/watchdog.h +++ b/include/watchdog.h @@ -21,8 +21,7 @@ int init_func_watchdog_reset(void); #endif -#if defined(CONFIG_SYS_GENERIC_BOARD) && \ - (defined(CONFIG_WATCHDOG) || defined(CONFIG_HW_WATCHDOG)) +#if defined(CONFIG_WATCHDOG) || defined(CONFIG_HW_WATCHDOG) #define INIT_FUNC_WATCHDOG_INIT init_func_watchdog_init, #define INIT_FUNC_WATCHDOG_RESET init_func_watchdog_reset, #else