diff options
| author | Simon Glass <sjg@chromium.org> | 2016-05-14 18:49:35 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-27 15:39:54 -0400 |
| commit | 9be2e790eb28cbb30fb16a939cb95f82ad73efe5 (patch) | |
| tree | 6ec89affcfe4cb63fcbe8291dc88ab651e78ce23 /common | |
| parent | 14c67ebaefec6d477603454aa2998c36da40453b (diff) | |
| download | blackbird-obmc-uboot-9be2e790eb28cbb30fb16a939cb95f82ad73efe5.tar.gz blackbird-obmc-uboot-9be2e790eb28cbb30fb16a939cb95f82ad73efe5.zip | |
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>
Diffstat (limited to 'common')
| -rw-r--r-- | common/Makefile | 4 | ||||
| -rw-r--r-- | common/main.c | 6 |
2 files changed, 2 insertions, 8 deletions
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 */ |
