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 <sjg@chromium.org>
Reviewed-by: Andreas Bießmann <andreas@biessmann.org>

diff --git a/common/Makefile b/common/Makefile
index 0562d5cea46a5d50b1364451fd8b7701348551bb..1557a044de5710b69c8e03768ec5e29899653ca5 100644 (file)
--- 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 42bbb507332c8de234723d02024f787da4501f59..2116a9e0a2e0bc5d25993b43ad50aed9aab19e97 100644 (file)
--- 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 9273fa1e8090a4ae2262459a9c26b494e528edfc..174c894e4993cd1c030391a111de782647673d1a 100644 (file)
--- 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