From 9be2e790eb28cbb30fb16a939cb95f82ad73efe5 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 14 May 2016 18:49:35 -0600 Subject: Drop use of CONFIG_SYS_GENERIC_BOARD in U-Boot MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- common/Makefile | 4 ++-- common/main.c | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'common') diff --git a/common/Makefile b/common/Makefile index 0562d5c..1557a04 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 42bbb50..2116a9e 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 */ -- cgit v1.1