From: "Andreas Bießmann" <andreas@biessmann.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 10/12] Drop use of CONFIG_SYS_GENERIC_BOARD in U-Boot
Date: Wed, 18 May 2016 09:39:49 +0200 [thread overview]
Message-ID: <e918847ad9abb147cd5b51eb2e01e35d@biessmann.de> (raw)
In-Reply-To: <1463273377-11235-11-git-send-email-sjg@chromium.org>
On 2016-05-15 02:49, Simon Glass wrote:
> 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>
> ---
>
> common/Makefile | 4 ++--
> common/main.c | 6 ------
> include/watchdog.h | 3 +--
> 3 files changed, 3 insertions(+), 10 deletions(-)
>
> diff --git a/common/Makefile b/common/Makefile
> index b23f312..c0f16cc 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 */
> diff --git a/include/watchdog.h b/include/watchdog.h
> index 9273fa1..174c894 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
next prev parent reply other threads:[~2016-05-18 7:39 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-15 0:49 [U-Boot] [PATCH 00/12] Drop old pre-generic-board code Simon Glass
2016-05-15 0:49 ` [U-Boot] [PATCH 01/12] openrisc: Drop the arch-specific board init Simon Glass
2016-05-30 17:58 ` [U-Boot] [U-Boot, " Tom Rini
2016-05-15 0:49 ` [U-Boot] [PATCH 02/12] Remove/update old generic-board documentation and warning Simon Glass
2016-05-18 7:27 ` Andreas Bießmann
2016-05-30 17:58 ` [U-Boot] [U-Boot, " Tom Rini
2016-05-15 0:49 ` [U-Boot] [PATCH 03/12] board_f: Don't require CONFIG_SYS_MONITOR_BASE Simon Glass
2016-05-18 7:33 ` Andreas Bießmann
2016-05-18 7:34 ` Andreas Bießmann
2016-05-19 3:59 ` Simon Glass
2016-05-30 17:58 ` [U-Boot] [U-Boot, " Tom Rini
2016-05-15 0:49 ` [U-Boot] [PATCH 04/12] sh: Fix build errors for generic board Simon Glass
2016-05-30 17:58 ` [U-Boot] [U-Boot,04/12] " Tom Rini
2016-05-15 0:49 ` [U-Boot] [PATCH 05/12] sh: Drop the arch-specific board init Simon Glass
2016-05-30 17:58 ` [U-Boot] [U-Boot,05/12] " Tom Rini
2016-05-15 0:49 ` [U-Boot] [PATCH 06/12] avr32: Drop unused code in u-boot.h Simon Glass
2016-05-18 7:23 ` Andreas Bießmann
2016-05-30 17:58 ` [U-Boot] [U-Boot,06/12] " Tom Rini
2016-05-15 0:49 ` [U-Boot] [PATCH 07/12] m68k: " Simon Glass
2016-05-17 20:42 ` Angelo Dureghello
2016-05-30 17:58 ` [U-Boot] [U-Boot,07/12] " Tom Rini
2016-05-15 0:49 ` [U-Boot] [PATCH 08/12] mips: " Simon Glass
2016-05-18 9:58 ` Daniel Schwierzeck
2016-05-30 17:59 ` [U-Boot] [U-Boot,08/12] " Tom Rini
2016-05-15 0:49 ` [U-Boot] [PATCH 09/12] powerpc: Drop unused code related to generic board Simon Glass
2016-05-30 17:59 ` [U-Boot] [U-Boot, " Tom Rini
2016-05-30 17:59 ` Tom Rini
2016-05-15 0:49 ` [U-Boot] [PATCH 10/12] Drop use of CONFIG_SYS_GENERIC_BOARD in U-Boot Simon Glass
2016-05-18 7:39 ` Andreas Bießmann [this message]
2016-05-30 17:59 ` [U-Boot] [U-Boot, " Tom Rini
2016-05-15 0:49 ` [U-Boot] [PATCH 11/12] Drop references to CONFIG_SYS_GENERIC_BOARD in config files Simon Glass
2016-05-30 17:59 ` [U-Boot] [U-Boot, " Tom Rini
2016-05-15 0:49 ` [U-Boot] [PATCH 12/12] Drop HAVE_GENERIC_BOARD and SYS_GENERIC_BOARD options Simon Glass
2016-05-17 20:45 ` Angelo Dureghello
2016-05-18 8:37 ` Andreas Bießmann
2016-05-30 17:59 ` [U-Boot] [U-Boot, " Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e918847ad9abb147cd5b51eb2e01e35d@biessmann.de \
--to=andreas@biessmann.org \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox