V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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>
This commit is contained in:
Simon Glass 2016-05-14 18:49:35 -06:00 committed by Tom Rini
parent 14c67ebaef
commit 9be2e790eb
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/Makefile
View File

@ -26,8 +26,8 @@ obj-y += bootretry.o
endif endif
# boards # boards
obj-$(CONFIG_SYS_GENERIC_BOARD) += board_f.o obj-y += board_f.o
obj-$(CONFIG_SYS_GENERIC_BOARD) += board_r.o obj-y += board_r.o
obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o
obj-$(CONFIG_DISPLAY_BOARDINFO_LATE) += board_info.o obj-$(CONFIG_DISPLAY_BOARDINFO_LATE) += board_info.o

6
common/main.c
View File

@ -47,12 +47,6 @@ void main_loop(void)
bootstage_mark_name(BOOTSTAGE_ID_MAIN_LOOP, "main_loop"); 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 #ifdef CONFIG_VERSION_VARIABLE
setenv("ver", version_string); /* set version variable */ setenv("ver", version_string); /* set version variable */
#endif /* CONFIG_VERSION_VARIABLE */ #endif /* CONFIG_VERSION_VARIABLE */

3
include/watchdog.h
View File

@ -21,8 +21,7 @@
int init_func_watchdog_reset(void); int init_func_watchdog_reset(void);
#endif #endif
#if defined(CONFIG_SYS_GENERIC_BOARD) && \ #if defined(CONFIG_WATCHDOG) || defined(CONFIG_HW_WATCHDOG)
(defined(CONFIG_WATCHDOG) || defined(CONFIG_HW_WATCHDOG))
#define INIT_FUNC_WATCHDOG_INIT init_func_watchdog_init, #define INIT_FUNC_WATCHDOG_INIT init_func_watchdog_init,
#define INIT_FUNC_WATCHDOG_RESET init_func_watchdog_reset, #define INIT_FUNC_WATCHDOG_RESET init_func_watchdog_reset,
#else #else