* [U-Boot] [PATCH 01/12] openrisc: Drop the arch-specific board init
2016-05-15 0:49 [U-Boot] [PATCH 00/12] Drop old pre-generic-board code Simon Glass
@ 2016-05-15 0:49 ` 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
` (10 subsequent siblings)
11 siblings, 1 reply; 36+ messages in thread
From: Simon Glass @ 2016-05-15 0:49 UTC (permalink / raw)
To: u-boot
It is well past the deadline for conversion to generic board init. Remove
the old code.
Stefan, can you test this please and perhaps send a follow-up patch if needed?
Signed-off-by: Simon Glass <sjg@chromium.org>
---
arch/openrisc/lib/Makefile | 1 -
arch/openrisc/lib/board.c | 140 -------------------------------------
include/configs/openrisc-generic.h | 1 +
3 files changed, 1 insertion(+), 141 deletions(-)
delete mode 100644 arch/openrisc/lib/board.c
diff --git a/arch/openrisc/lib/Makefile b/arch/openrisc/lib/Makefile
index dfa72d9..3a2f6ec 100644
--- a/arch/openrisc/lib/Makefile
+++ b/arch/openrisc/lib/Makefile
@@ -5,6 +5,5 @@
# SPDX-License-Identifier: GPL-2.0+
#
-obj-y += board.o
obj-$(CONFIG_CMD_BOOTM) += bootm.o
obj-y += timer.o
diff --git a/arch/openrisc/lib/board.c b/arch/openrisc/lib/board.c
deleted file mode 100644
index b7fbd2f..0000000
--- a/arch/openrisc/lib/board.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * (C) Copyright 2011
- * Julius Baxter, julius at opencores.org
- *
- * (C) Copyright 2003, Psyent Corporation <www.psyent.com>
- * Scott McNutt <smcnutt@psyent.com>
- *
- * (C) Copyright 2000-2002
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#include <common.h>
-#include <console.h>
-#include <stdio_dev.h>
-#include <watchdog.h>
-#include <malloc.h>
-#include <mmc.h>
-#include <net.h>
-#ifdef CONFIG_STATUS_LED
-#include <status_led.h>
-#endif
-#ifdef CONFIG_CMD_NAND
-#include <nand.h> /* cannot even include nand.h if it isnt configured */
-#endif
-
-#include <timestamp.h>
-#include <version.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * All attempts to come up with a "common" initialization sequence
- * that works for all boards and architectures failed: some of the
- * requirements are just _too_ different. To get rid of the resulting
- * mess of board dependend #ifdef'ed code we now make the whole
- * initialization sequence configurable to the user.
- *
- * The requirements for any new initalization function is simple: it
- * receives a pointer to the "global data" structure as it's only
- * argument, and returns an integer return code, where 0 means
- * "continue" and != 0 means "fatal error, hang the system".
- */
-
-extern int cache_init(void);
-
-/*
- * Initialization sequence
- */
-static int (* const init_sequence[])(void) = {
- cache_init,
- timer_init, /* initialize timer */
- env_init,
- serial_init,
- console_init_f,
- display_options,
- checkcpu,
- checkboard,
-};
-
-
-/***********************************************************************/
-void board_init(void)
-{
- bd_t *bd;
- int i;
-
- gd = (gd_t *)CONFIG_SYS_GBL_DATA_ADDR;
-
- memset((void *)gd, 0, GENERATED_GBL_DATA_SIZE);
-
- gd->bd = (bd_t *)(gd+1); /* At end of global data */
- gd->baudrate = CONFIG_BAUDRATE;
- gd->cpu_clk = CONFIG_SYS_CLK_FREQ;
-
- bd = gd->bd;
- bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
- bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
-#ifndef CONFIG_SYS_NO_FLASH
- bd->bi_flashstart = CONFIG_SYS_FLASH_BASE;
-#endif
-#if defined(CONFIG_SYS_SRAM_BASE) && defined(CONFIG_SYS_SRAM_SIZE)
- bd->bi_sramstart = CONFIG_SYS_SRAM_BASE;
- bd->bi_sramsize = CONFIG_SYS_SRAM_SIZE;
-#endif
-
- for (i = 0; i < ARRAY_SIZE(init_sequence); i++) {
- WATCHDOG_RESET();
- if (init_sequence[i]())
- hang();
- }
-
- WATCHDOG_RESET();
-
- /* The Malloc area is immediately below the monitor copy in RAM */
- mem_malloc_init(CONFIG_SYS_MALLOC_BASE, CONFIG_SYS_MALLOC_LEN);
-
-#ifndef CONFIG_SYS_NO_FLASH
- WATCHDOG_RESET();
- bd->bi_flashsize = flash_init();
-#endif
-
-#ifdef CONFIG_CMD_NAND
- puts("NAND: ");
- nand_init();
-#endif
-
-#ifdef CONFIG_GENERIC_MMC
- puts("MMC: ");
- mmc_initialize(bd);
-#endif
-
- WATCHDOG_RESET();
- env_relocate();
-
- WATCHDOG_RESET();
- stdio_init();
- jumptable_init();
- console_init_r();
-
- WATCHDOG_RESET();
- interrupt_init();
-
-#if defined(CONFIG_BOARD_LATE_INIT)
- board_late_init();
-#endif
-
-#if defined(CONFIG_CMD_NET)
- puts("NET: ");
- eth_initialize();
-#endif
-
- /* main_loop */
- for (;;) {
- WATCHDOG_RESET();
- main_loop();
- }
-}
diff --git a/include/configs/openrisc-generic.h b/include/configs/openrisc-generic.h
index dfb8d3a..14e44b0 100644
--- a/include/configs/openrisc-generic.h
+++ b/include/configs/openrisc-generic.h
@@ -10,6 +10,7 @@
/*
* BOARD/CPU
*/
+#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_SYS_CLK_FREQ 50000000
#define CONFIG_SYS_RESET_ADDR 0x00000100
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 36+ messages in thread* [U-Boot] [PATCH 02/12] Remove/update old generic-board documentation and warning
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-15 0:49 ` 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
` (9 subsequent siblings)
11 siblings, 2 replies; 36+ messages in thread
From: Simon Glass @ 2016-05-15 0:49 UTC (permalink / raw)
To: u-boot
Remove the warning from the Makefile, since boards that do not use generic
board will no longer build. Also update documentation.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Makefile | 14 ---------
README | 10 -------
board/sandbox/README.sandbox | 3 +-
doc/README.fdt-control | 6 ----
doc/README.generic-board | 69 +++++---------------------------------------
5 files changed, 8 insertions(+), 94 deletions(-)
diff --git a/Makefile b/Makefile
index 293fad0..8478019 100644
--- a/Makefile
+++ b/Makefile
@@ -801,13 +801,6 @@ quiet_cmd_pad_cat = CAT $@
cmd_pad_cat = $(cmd_objcopy) && $(append) || rm -f $@
all: $(ALL-y)
-ifneq ($(CONFIG_SYS_GENERIC_BOARD),y)
- @echo "===================== WARNING ======================"
- @echo "Please convert this board to generic board."
- @echo "Otherwise it will be removed by the end of 2014."
- @echo "See doc/README.generic-board for further information"
- @echo "===================================================="
-endif
ifeq ($(CONFIG_DM_I2C_COMPAT),y)
@echo "===================== WARNING ======================"
@echo "This board uses CONFIG_DM_I2C_COMPAT. Please remove"
@@ -1257,13 +1250,6 @@ prepare2: prepare3 outputmakefile
prepare1: prepare2 $(version_h) $(timestamp_h) \
include/config/auto.conf
-ifeq ($(CONFIG_HAVE_GENERIC_BOARD),)
-ifeq ($(CONFIG_SYS_GENERIC_BOARD),y)
- @echo >&2 " Your architecture does not support generic board."
- @echo >&2 " Please undefine CONFIG_SYS_GENERIC_BOARD in your board config file."
- @/bin/false
-endif
-endif
ifeq ($(wildcard $(LDSCRIPT)),)
@echo >&2 " Could not find linker script."
@/bin/false
diff --git a/README b/README
index 88ff837..2cdfb92 100644
--- a/README
+++ b/README
@@ -4043,16 +4043,6 @@ Configuration Settings:
If defined, don't allow the -f switch to env set override variable
access flags.
-- CONFIG_SYS_GENERIC_BOARD
- This selects the architecture-generic board system instead of the
- architecture-specific board files. It is intended to move boards
- to this new framework over time. Defining this will disable the
- arch/foo/lib/board.c file and use common/board_f.c and
- common/board_r.c instead. To use this option your architecture
- must support it (i.e. must select HAVE_GENERIC_BOARD in arch/Kconfig).
- If you find problems enabling this option on your board please report
- the problem and send patches!
-
- CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC (OMAP only)
This is set by OMAP boards for the max time that reset should
be asserted. See doc/README.omap-reset-time for details on how
diff --git a/board/sandbox/README.sandbox b/board/sandbox/README.sandbox
index fa1842b..9fe3bf1 100644
--- a/board/sandbox/README.sandbox
+++ b/board/sandbox/README.sandbox
@@ -186,8 +186,7 @@ U-Boot sandbox supports these emulations:
A wide range of commands is implemented. Filesystems which use a block
device are supported.
-Also sandbox uses generic board (CONFIG_SYS_GENERIC_BOARD) and supports
-driver model (CONFIG_DM) and associated commands.
+Also sandbox supports driver model (CONFIG_DM) and associated commands.
Linux RAW Networking Bridge
diff --git a/doc/README.fdt-control b/doc/README.fdt-control
index 29fd56a..2913fcb 100644
--- a/doc/README.fdt-control
+++ b/doc/README.fdt-control
@@ -33,12 +33,6 @@ the features of each board in the device tree file, and have a single
generic source base.
To enable this feature, add CONFIG_OF_CONTROL to your board config file.
-It is currently supported on ARM, x86 and Microblaze - other architectures
-will need to add code to their arch/xxx/lib/board.c file to locate the
-FDT. Alternatively you can enable generic board support on your board
-(with CONFIG_SYS_GENERIC_BOARD) if this is available (as it is for
-PowerPC). For ARM, Tegra and Exynos5 have device trees available for
-common devices.
What is a Flat Device Tree?
diff --git a/doc/README.generic-board b/doc/README.generic-board
index 734f1aa..6858c4d 100644
--- a/doc/README.generic-board
+++ b/doc/README.generic-board
@@ -5,29 +5,22 @@
# SPDX-License-Identifier: GPL-2.0+
#
-DEPRECATION NOTICE FOR arch/<arch>/lib/board.c
-
-For board maintainers: Please submit patches for boards you maintain before
-July 2014, to make them use generic board.
-
-For architecture maintainers: Please submit patches to remove your
-architecture-specific board.c file before October 2014.
-
-
Background
----------
-U-Boot has traditionally had a board.c file for each architecture. This has
-introduced quite a lot of duplication, with each architecture tending to do
+U-Boot traditionally had a board.c file for each architecture. This introduced
+quite a lot of duplication, with each architecture tending to do
initialisation slightly differently. To address this, a new 'generic board
-init' feature was introduced a year ago in March 2013 (further motivation is
+init' feature was introduced in March 2013 (further motivation is
provided in the cover letter below).
+All boards and architectures have moved to this as of mid 2016.
+
What has changed?
-----------------
-The main change is that the arch/<arch>/lib/board.c file is being removed in
+The main change is that the arch/<arch>/lib/board.c file is removed in
favour of common/board_f.c (for pre-relocation init) and common/board_r.c
(for post-relocation init).
@@ -36,55 +29,6 @@ fields which are common to all architectures. Architecture-specific fields
have been moved to separate structures.
-Supported Architectures
-------------------------
-
-If you are unlucky then your architecture may not support generic board.
-The following architectures are supported now:
-
- arc
- arm
- avr32
- blackfin
- m68k
- microblaze
- mips
- nios2
- powerpc
- sandbox
- x86
-
-If your architecture is not supported, you need to select
-HAVE_GENERIC_BOARD in arch/Kconfig
-and test it with a suitable board, as follows.
-
-
-Adding Support for your Board
------------------------------
-
-To enable generic board for your board, define CONFIG_SYS_GENERIC_BOARD in
-your board config header file.
-
-Test that U-Boot still functions correctly on your board, and fix any
-problems you find. Don't be surprised if there are no problems - generic
-board has had a reasonable amount of testing with common boards.
-
-
-DeadLine
---------
-
-Please don't take this the wrong way - there is no intent to make your life
-miserable, and we have the greatest respect and admiration for U-Boot users.
-However, with any migration there has to be a period where the old way is
-deprecated and removed. Every patch to the deprecated code introduces a
-potential breakage in the new unused code. Therefore:
-
-Boards or architectures not converted over to general board by the
-end of 2014 may be forcibly changed over (potentially causing run-time
-breakage) or removed.
-
-
-
Further Background
------------------
@@ -190,3 +134,4 @@ convenience.
Simon Glass, sjg at chromium.org
March 2014
+Updated after final removal, May 2016
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 36+ messages in thread* [U-Boot] [PATCH 02/12] Remove/update old generic-board documentation and warning
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
1 sibling, 0 replies; 36+ messages in thread
From: Andreas Bießmann @ 2016-05-18 7:27 UTC (permalink / raw)
To: u-boot
On 2016-05-15 02:49, Simon Glass wrote:
> Remove the warning from the Makefile, since boards that do not use
> generic
> board will no longer build. Also update documentation.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Andreas Bie?mann <andreas@biessmann.org>
> ---
>
> Makefile | 14 ---------
> README | 10 -------
> board/sandbox/README.sandbox | 3 +-
> doc/README.fdt-control | 6 ----
> doc/README.generic-board | 69
> +++++---------------------------------------
> 5 files changed, 8 insertions(+), 94 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 293fad0..8478019 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -801,13 +801,6 @@ quiet_cmd_pad_cat = CAT $@
> cmd_pad_cat = $(cmd_objcopy) && $(append) || rm -f $@
>
> all: $(ALL-y)
> -ifneq ($(CONFIG_SYS_GENERIC_BOARD),y)
> - @echo "===================== WARNING ======================"
> - @echo "Please convert this board to generic board."
> - @echo "Otherwise it will be removed by the end of 2014."
> - @echo "See doc/README.generic-board for further information"
> - @echo "===================================================="
> -endif
> ifeq ($(CONFIG_DM_I2C_COMPAT),y)
> @echo "===================== WARNING ======================"
> @echo "This board uses CONFIG_DM_I2C_COMPAT. Please remove"
> @@ -1257,13 +1250,6 @@ prepare2: prepare3 outputmakefile
>
> prepare1: prepare2 $(version_h) $(timestamp_h) \
> include/config/auto.conf
> -ifeq ($(CONFIG_HAVE_GENERIC_BOARD),)
> -ifeq ($(CONFIG_SYS_GENERIC_BOARD),y)
> - @echo >&2 " Your architecture does not support generic board."
> - @echo >&2 " Please undefine CONFIG_SYS_GENERIC_BOARD in your board
> config file."
> - @/bin/false
> -endif
> -endif
> ifeq ($(wildcard $(LDSCRIPT)),)
> @echo >&2 " Could not find linker script."
> @/bin/false
> diff --git a/README b/README
> index 88ff837..2cdfb92 100644
> --- a/README
> +++ b/README
> @@ -4043,16 +4043,6 @@ Configuration Settings:
> If defined, don't allow the -f switch to env set override variable
> access flags.
>
> -- CONFIG_SYS_GENERIC_BOARD
> - This selects the architecture-generic board system instead of the
> - architecture-specific board files. It is intended to move boards
> - to this new framework over time. Defining this will disable the
> - arch/foo/lib/board.c file and use common/board_f.c and
> - common/board_r.c instead. To use this option your architecture
> - must support it (i.e. must select HAVE_GENERIC_BOARD in
> arch/Kconfig).
> - If you find problems enabling this option on your board please report
> - the problem and send patches!
> -
> - CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC (OMAP only)
> This is set by OMAP boards for the max time that reset should
> be asserted. See doc/README.omap-reset-time for details on how
> diff --git a/board/sandbox/README.sandbox
> b/board/sandbox/README.sandbox
> index fa1842b..9fe3bf1 100644
> --- a/board/sandbox/README.sandbox
> +++ b/board/sandbox/README.sandbox
> @@ -186,8 +186,7 @@ U-Boot sandbox supports these emulations:
> A wide range of commands is implemented. Filesystems which use a block
> device are supported.
>
> -Also sandbox uses generic board (CONFIG_SYS_GENERIC_BOARD) and
> supports
> -driver model (CONFIG_DM) and associated commands.
> +Also sandbox supports driver model (CONFIG_DM) and associated
> commands.
>
>
> Linux RAW Networking Bridge
> diff --git a/doc/README.fdt-control b/doc/README.fdt-control
> index 29fd56a..2913fcb 100644
> --- a/doc/README.fdt-control
> +++ b/doc/README.fdt-control
> @@ -33,12 +33,6 @@ the features of each board in the device tree file,
> and have a single
> generic source base.
>
> To enable this feature, add CONFIG_OF_CONTROL to your board config
> file.
> -It is currently supported on ARM, x86 and Microblaze - other
> architectures
> -will need to add code to their arch/xxx/lib/board.c file to locate the
> -FDT. Alternatively you can enable generic board support on your board
> -(with CONFIG_SYS_GENERIC_BOARD) if this is available (as it is for
> -PowerPC). For ARM, Tegra and Exynos5 have device trees available for
> -common devices.
>
>
> What is a Flat Device Tree?
> diff --git a/doc/README.generic-board b/doc/README.generic-board
> index 734f1aa..6858c4d 100644
> --- a/doc/README.generic-board
> +++ b/doc/README.generic-board
> @@ -5,29 +5,22 @@
> # SPDX-License-Identifier: GPL-2.0+
> #
>
> -DEPRECATION NOTICE FOR arch/<arch>/lib/board.c
> -
> -For board maintainers: Please submit patches for boards you maintain
> before
> -July 2014, to make them use generic board.
> -
> -For architecture maintainers: Please submit patches to remove your
> -architecture-specific board.c file before October 2014.
> -
> -
> Background
> ----------
>
> -U-Boot has traditionally had a board.c file for each architecture.
> This has
> -introduced quite a lot of duplication, with each architecture tending
> to do
> +U-Boot traditionally had a board.c file for each architecture. This
> introduced
> +quite a lot of duplication, with each architecture tending to do
> initialisation slightly differently. To address this, a new 'generic
> board
> -init' feature was introduced a year ago in March 2013 (further
> motivation is
> +init' feature was introduced in March 2013 (further motivation is
> provided in the cover letter below).
>
> +All boards and architectures have moved to this as of mid 2016.
> +
>
> What has changed?
> -----------------
>
> -The main change is that the arch/<arch>/lib/board.c file is being
> removed in
> +The main change is that the arch/<arch>/lib/board.c file is removed in
> favour of common/board_f.c (for pre-relocation init) and
> common/board_r.c
> (for post-relocation init).
>
> @@ -36,55 +29,6 @@ fields which are common to all architectures.
> Architecture-specific fields
> have been moved to separate structures.
>
>
> -Supported Architectures
> -------------------------
> -
> -If you are unlucky then your architecture may not support generic
> board.
> -The following architectures are supported now:
> -
> - arc
> - arm
> - avr32
> - blackfin
> - m68k
> - microblaze
> - mips
> - nios2
> - powerpc
> - sandbox
> - x86
> -
> -If your architecture is not supported, you need to select
> -HAVE_GENERIC_BOARD in arch/Kconfig
> -and test it with a suitable board, as follows.
> -
> -
> -Adding Support for your Board
> ------------------------------
> -
> -To enable generic board for your board, define
> CONFIG_SYS_GENERIC_BOARD in
> -your board config header file.
> -
> -Test that U-Boot still functions correctly on your board, and fix any
> -problems you find. Don't be surprised if there are no problems -
> generic
> -board has had a reasonable amount of testing with common boards.
> -
> -
> -DeadLine
> ---------
> -
> -Please don't take this the wrong way - there is no intent to make your
> life
> -miserable, and we have the greatest respect and admiration for U-Boot
> users.
> -However, with any migration there has to be a period where the old way
> is
> -deprecated and removed. Every patch to the deprecated code introduces
> a
> -potential breakage in the new unused code. Therefore:
> -
> -Boards or architectures not converted over to general board by the
> -end of 2014 may be forcibly changed over (potentially causing run-time
> -breakage) or removed.
> -
> -
> -
> Further Background
> ------------------
>
> @@ -190,3 +134,4 @@ convenience.
>
> Simon Glass, sjg at chromium.org
> March 2014
> +Updated after final removal, May 2016
^ permalink raw reply [flat|nested] 36+ messages in thread
* [U-Boot] [U-Boot, 02/12] Remove/update old generic-board documentation and warning
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 ` Tom Rini
1 sibling, 0 replies; 36+ messages in thread
From: Tom Rini @ 2016-05-30 17:58 UTC (permalink / raw)
To: u-boot
On Sat, May 14, 2016 at 06:49:27PM -0600, Simon Glass wrote:
> Remove the warning from the Makefile, since boards that do not use generic
> board will no longer build. Also update documentation.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Andreas Bie?mann <andreas@biessmann.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160530/75cb9211/attachment.sig>
^ permalink raw reply [flat|nested] 36+ messages in thread
* [U-Boot] [PATCH 03/12] board_f: Don't require CONFIG_SYS_MONITOR_BASE
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-15 0:49 ` [U-Boot] [PATCH 02/12] Remove/update old generic-board documentation and warning Simon Glass
@ 2016-05-15 0:49 ` Simon Glass
2016-05-18 7:33 ` Andreas Bießmann
` (2 more replies)
2016-05-15 0:49 ` [U-Boot] [PATCH 04/12] sh: Fix build errors for generic board Simon Glass
` (8 subsequent siblings)
11 siblings, 3 replies; 36+ messages in thread
From: Simon Glass @ 2016-05-15 0:49 UTC (permalink / raw)
To: u-boot
Allow this to be unset, such that gd->mon_len is invalid. This seems to be
what the sh architecture does.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
common/board_f.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/board_f.c b/common/board_f.c
index 109025a..d405b5b 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -274,7 +274,7 @@ static int setup_mon_len(void)
gd->mon_len = CONFIG_SYS_MONITOR_LEN;
#elif defined(CONFIG_NDS32)
gd->mon_len = (ulong)(&__bss_end) - (ulong)(&_start);
-#else
+#elif defined(CONFIG_SYS_MONITOR_BASE)
/* TODO: use (ulong)&__bss_end - (ulong)&__text_start; ? */
gd->mon_len = (ulong)&__bss_end - CONFIG_SYS_MONITOR_BASE;
#endif
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 36+ messages in thread* [U-Boot] [PATCH 03/12] board_f: Don't require CONFIG_SYS_MONITOR_BASE
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-30 17:58 ` [U-Boot] [U-Boot, " Tom Rini
2 siblings, 0 replies; 36+ messages in thread
From: Andreas Bießmann @ 2016-05-18 7:33 UTC (permalink / raw)
To: u-boot
Hi Simon,
On 2016-05-15 02:49, Simon Glass wrote:
> Allow this to be unset, such that gd->mon_len is invalid. This seems to
> be
> what the sh architecture does.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> common/board_f.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/common/board_f.c b/common/board_f.c
> index 109025a..d405b5b 100644
> --- a/common/board_f.c
> +++ b/common/board_f.c
> @@ -274,7 +274,7 @@ static int setup_mon_len(void)
> gd->mon_len = CONFIG_SYS_MONITOR_LEN;
> #elif defined(CONFIG_NDS32)
> gd->mon_len = (ulong)(&__bss_end) - (ulong)(&_start);
> -#else
> +#elif defined(CONFIG_SYS_MONITOR_BASE)
> /* TODO: use (ulong)&__bss_end - (ulong)&__text_start; ? */
> gd->mon_len = (ulong)&__bss_end - CONFIG_SYS_MONITOR_BASE;
before this produced an compile error for undefiend
CONFIG_SYS_MONITOR_BASE, now it will be silently ignored. Why not leave
the else case and use the TODO statement instead?
At best we should equalize the linker files and remove the whole
ifdiffery here.
Andreas
^ permalink raw reply [flat|nested] 36+ messages in thread
* [U-Boot] [PATCH 03/12] board_f: Don't require CONFIG_SYS_MONITOR_BASE
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
2 siblings, 1 reply; 36+ messages in thread
From: Andreas Bießmann @ 2016-05-18 7:34 UTC (permalink / raw)
To: u-boot
Hi Simon,
On 2016-05-15 02:49, Simon Glass wrote:
> Allow this to be unset, such that gd->mon_len is invalid. This seems to
> be
> what the sh architecture does.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> common/board_f.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/common/board_f.c b/common/board_f.c
> index 109025a..d405b5b 100644
> --- a/common/board_f.c
> +++ b/common/board_f.c
> @@ -274,7 +274,7 @@ static int setup_mon_len(void)
> gd->mon_len = CONFIG_SYS_MONITOR_LEN;
> #elif defined(CONFIG_NDS32)
> gd->mon_len = (ulong)(&__bss_end) - (ulong)(&_start);
> -#else
> +#elif defined(CONFIG_SYS_MONITOR_BASE)
> /* TODO: use (ulong)&__bss_end - (ulong)&__text_start; ? */
> gd->mon_len = (ulong)&__bss_end - CONFIG_SYS_MONITOR_BASE;
before this produced an compile error for undefiend
CONFIG_SYS_MONITOR_BASE, now it will be silently ignored. Why not leave
the else case and use the TODO statement instead?
At best we should equalize the linker files and remove the whole
ifdiffery here.
Andreas
^ permalink raw reply [flat|nested] 36+ messages in thread
* [U-Boot] [PATCH 03/12] board_f: Don't require CONFIG_SYS_MONITOR_BASE
2016-05-18 7:34 ` Andreas Bießmann
@ 2016-05-19 3:59 ` Simon Glass
0 siblings, 0 replies; 36+ messages in thread
From: Simon Glass @ 2016-05-19 3:59 UTC (permalink / raw)
To: u-boot
Hi Andreas,
On 18 May 2016 at 01:34, Andreas Bie?mann <andreas@biessmann.org> wrote:
> Hi Simon,
>
> On 2016-05-15 02:49, Simon Glass wrote:
>>
>> Allow this to be unset, such that gd->mon_len is invalid. This seems to be
>> what the sh architecture does.
>>
>> Signed-off-by: Simon Glass <sjg@chromium.org>
>> ---
>>
>> common/board_f.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/common/board_f.c b/common/board_f.c
>> index 109025a..d405b5b 100644
>> --- a/common/board_f.c
>> +++ b/common/board_f.c
>> @@ -274,7 +274,7 @@ static int setup_mon_len(void)
>> gd->mon_len = CONFIG_SYS_MONITOR_LEN;
>> #elif defined(CONFIG_NDS32)
>> gd->mon_len = (ulong)(&__bss_end) - (ulong)(&_start);
>> -#else
>> +#elif defined(CONFIG_SYS_MONITOR_BASE)
>> /* TODO: use (ulong)&__bss_end - (ulong)&__text_start; ? */
>> gd->mon_len = (ulong)&__bss_end - CONFIG_SYS_MONITOR_BASE;
>
>
> before this produced an compile error for undefiend CONFIG_SYS_MONITOR_BASE,
> now it will be silently ignored. Why not leave the else case and use the
> TODO statement instead?
Yes that seems better. I'm a bit tired of the complexity here. Perhaps
I should add #error for the #else case?
> At best we should equalize the linker files and remove the whole ifdiffery
> here.
Yes that needs to be done. More people should contribute to this sort
of clean-up. It's a bit tedious but not super-hard.
Regards,
Simon
^ permalink raw reply [flat|nested] 36+ messages in thread
* [U-Boot] [U-Boot, 03/12] board_f: Don't require CONFIG_SYS_MONITOR_BASE
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-30 17:58 ` Tom Rini
2 siblings, 0 replies; 36+ messages in thread
From: Tom Rini @ 2016-05-30 17:58 UTC (permalink / raw)
To: u-boot
On Sat, May 14, 2016 at 06:49:28PM -0600, Simon Glass wrote:
> Allow this to be unset, such that gd->mon_len is invalid. This seems to be
> what the sh architecture does.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160530/fce89834/attachment.sig>
^ permalink raw reply [flat|nested] 36+ messages in thread
* [U-Boot] [PATCH 04/12] sh: Fix build errors for generic board
2016-05-15 0:49 [U-Boot] [PATCH 00/12] Drop old pre-generic-board code Simon Glass
` (2 preceding siblings ...)
2016-05-15 0:49 ` [U-Boot] [PATCH 03/12] board_f: Don't require CONFIG_SYS_MONITOR_BASE Simon Glass
@ 2016-05-15 0:49 ` 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
` (7 subsequent siblings)
11 siblings, 1 reply; 36+ messages in thread
From: Simon Glass @ 2016-05-15 0:49 UTC (permalink / raw)
To: u-boot
This includes the following fixes:
- Define needed __init_end symbol - see initr_reloc_global_data()
- Drop SH-specific struct bd_info
- Add an empty relocate_code() function
This prevents build errors with generic board, but the code will still need
work. Perhaps this is a better alternative than deleting the code.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
arch/sh/cpu/sh2/cpu.c | 6 ++++++
arch/sh/cpu/sh2/start.S | 7 ++++---
arch/sh/cpu/sh3/cpu.c | 6 ++++++
arch/sh/cpu/sh3/start.S | 7 ++++---
arch/sh/cpu/sh4/cpu.c | 6 ++++++
arch/sh/cpu/sh4/start.S | 7 ++++---
arch/sh/cpu/u-boot.lds | 1 +
arch/sh/include/asm/u-boot.h | 12 ++----------
board/renesas/sh7752evb/u-boot.lds | 1 +
board/renesas/sh7753evb/u-boot.lds | 1 +
board/renesas/sh7757lcr/u-boot.lds | 1 +
11 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/arch/sh/cpu/sh2/cpu.c b/arch/sh/cpu/sh2/cpu.c
index a2f856f..9a93cf5 100644
--- a/arch/sh/cpu/sh2/cpu.c
+++ b/arch/sh/cpu/sh2/cpu.c
@@ -83,3 +83,9 @@ int dcache_status(void)
{
return 0;
}
+
+void relocate_code(ulong start_addr_sp, gd_t *new_gd, ulong relocaaddr)
+{
+ /* TODO(sh maintainer): Implement this */
+ while (1);
+}
diff --git a/arch/sh/cpu/sh2/start.S b/arch/sh/cpu/sh2/start.S
index ebf731a..6171edc 100644
--- a/arch/sh/cpu/sh2/start.S
+++ b/arch/sh/cpu/sh2/start.S
@@ -46,8 +46,9 @@ _init:
mov.l ._gd_init, r13 /* global data */
mov.l ._stack_init, r15 /* stack */
- mov.l ._sh_generic_init, r0
- jsr @r0
+ #TODO(sh maintainer): Fix this up to call the correct code
+ #mov.l ._sh_generic_init, r0
+ #jsr @r0
nop
loop:
@@ -62,4 +63,4 @@ loop:
._bss_end: .long bss_end
._gd_init: .long (_sh_start - GENERATED_GBL_DATA_SIZE)
._stack_init: .long (_sh_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
-._sh_generic_init: .long sh_generic_init
+#._sh_generic_init: .long sh_generic_init
diff --git a/arch/sh/cpu/sh3/cpu.c b/arch/sh/cpu/sh3/cpu.c
index ea0006a..494f908 100644
--- a/arch/sh/cpu/sh3/cpu.c
+++ b/arch/sh/cpu/sh3/cpu.c
@@ -66,3 +66,9 @@ int dcache_status(void)
{
return 0;
}
+
+void relocate_code(ulong start_addr_sp, gd_t *new_gd, ulong relocaaddr)
+{
+ /* TODO(sh maintainer): Implement this */
+ while (1);
+}
diff --git a/arch/sh/cpu/sh3/start.S b/arch/sh/cpu/sh3/start.S
index 7a934e2..9ed7198 100644
--- a/arch/sh/cpu/sh3/start.S
+++ b/arch/sh/cpu/sh3/start.S
@@ -45,8 +45,9 @@ _sh_start:
mov.l ._gd_init, r13 /* global data */
mov.l ._stack_init, r15 /* stack */
- mov.l ._sh_generic_init, r0
- jsr @r0
+ #TODO(sh maintainer): Fix this up to call the correct code
+ #mov.l ._sh_generic_init, r0
+ #jsr @r0
nop
loop:
@@ -61,4 +62,4 @@ loop:
._bss_end: .long bss_end
._gd_init: .long (_sh_start - GENERATED_GBL_DATA_SIZE)
._stack_init: .long (_sh_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
-._sh_generic_init: .long sh_generic_init
+#._sh_generic_init: .long sh_generic_init
diff --git a/arch/sh/cpu/sh4/cpu.c b/arch/sh/cpu/sh4/cpu.c
index e8ee0a4..de90ca7 100644
--- a/arch/sh/cpu/sh4/cpu.c
+++ b/arch/sh/cpu/sh4/cpu.c
@@ -75,3 +75,9 @@ int cpu_eth_init(bd_t *bis)
#endif
return 0;
}
+
+void relocate_code(ulong start_addr_sp, gd_t *new_gd, ulong relocaaddr)
+{
+ /* TODO(sh maintainer): Implement this */
+ while (1);
+}
diff --git a/arch/sh/cpu/sh4/start.S b/arch/sh/cpu/sh4/start.S
index 21644b5..77fc221 100644
--- a/arch/sh/cpu/sh4/start.S
+++ b/arch/sh/cpu/sh4/start.S
@@ -42,8 +42,9 @@ _sh_start:
mov.l ._gd_init, r13 /* global data */
mov.l ._stack_init, r15 /* stack */
- mov.l ._sh_generic_init, r0
- jsr @r0
+ #TODO(sh maintainer): Fix this up to call the correct code
+ #mov.l ._sh_generic_init, r0
+ #jsr @r0
nop
loop:
@@ -58,4 +59,4 @@ loop:
._bss_end: .long bss_end
._gd_init: .long (_sh_start - GENERATED_GBL_DATA_SIZE)
._stack_init: .long (_sh_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
-._sh_generic_init: .long sh_generic_init
+#._sh_generic_init: .long sh_generic_init
diff --git a/arch/sh/cpu/u-boot.lds b/arch/sh/cpu/u-boot.lds
index 30c7a9d..78611c2 100644
--- a/arch/sh/cpu/u-boot.lds
+++ b/arch/sh/cpu/u-boot.lds
@@ -67,6 +67,7 @@ SECTIONS
KEEP(*(SORT(.u_boot_list*)));
}
+ PROVIDE (__init_end = .);
PROVIDE (reloc_dst_end = .);
/* _reloc_dst_end = .; */
diff --git a/arch/sh/include/asm/u-boot.h b/arch/sh/include/asm/u-boot.h
index ea37c24..716d8e9 100644
--- a/arch/sh/include/asm/u-boot.h
+++ b/arch/sh/include/asm/u-boot.h
@@ -12,16 +12,8 @@
#ifndef __ASM_SH_U_BOOT_H_
#define __ASM_SH_U_BOOT_H_
-typedef struct bd_info {
- unsigned long bi_memstart; /* start of DRAM memory */
- phys_size_t bi_memsize; /* size of DRAM memory in bytes */
- unsigned long bi_flashstart; /* start of FLASH memory */
- unsigned long bi_flashsize; /* size of FLASH memory */
- unsigned long bi_flashoffset; /* reserved area for startup monitor */
- unsigned long bi_sramstart; /* start of SRAM memory */
- unsigned long bi_sramsize; /* size of SRAM memory */
- unsigned long bi_boot_params; /* where this board expects params */
-} bd_t;
+/* Use the generic board which requires a unified bd_info */
+#include <asm-generic/u-boot.h>
/* For image.h:image_check_target_arch() */
#define IH_ARCH_DEFAULT IH_ARCH_SH
diff --git a/board/renesas/sh7752evb/u-boot.lds b/board/renesas/sh7752evb/u-boot.lds
index 053df64..6cd4056 100644
--- a/board/renesas/sh7752evb/u-boot.lds
+++ b/board/renesas/sh7752evb/u-boot.lds
@@ -65,6 +65,7 @@ SECTIONS
KEEP(*(SORT(.u_boot_list*)));
}
+ PROVIDE (__init_end = .);
PROVIDE (reloc_dst_end = .);
/* _reloc_dst_end = .; */
diff --git a/board/renesas/sh7753evb/u-boot.lds b/board/renesas/sh7753evb/u-boot.lds
index 053df64..6cd4056 100644
--- a/board/renesas/sh7753evb/u-boot.lds
+++ b/board/renesas/sh7753evb/u-boot.lds
@@ -65,6 +65,7 @@ SECTIONS
KEEP(*(SORT(.u_boot_list*)));
}
+ PROVIDE (__init_end = .);
PROVIDE (reloc_dst_end = .);
/* _reloc_dst_end = .; */
diff --git a/board/renesas/sh7757lcr/u-boot.lds b/board/renesas/sh7757lcr/u-boot.lds
index 4027fe3..d701367 100644
--- a/board/renesas/sh7757lcr/u-boot.lds
+++ b/board/renesas/sh7757lcr/u-boot.lds
@@ -66,6 +66,7 @@ SECTIONS
KEEP(*(SORT(.u_boot_list*)));
}
+ PROVIDE (__init_end = .);
PROVIDE (reloc_dst_end = .);
/* _reloc_dst_end = .; */
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 36+ messages in thread* [U-Boot] [PATCH 05/12] sh: Drop the arch-specific board init
2016-05-15 0:49 [U-Boot] [PATCH 00/12] Drop old pre-generic-board code Simon Glass
` (3 preceding siblings ...)
2016-05-15 0:49 ` [U-Boot] [PATCH 04/12] sh: Fix build errors for generic board Simon Glass
@ 2016-05-15 0:49 ` 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
` (6 subsequent siblings)
11 siblings, 1 reply; 36+ messages in thread
From: Simon Glass @ 2016-05-15 0:49 UTC (permalink / raw)
To: u-boot
It is well past the deadline for conversion to generic board init. Remove
the old code.
Please test this and perhaps send a follow-up patch if needed.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
arch/sh/include/asm/config.h | 2 +
arch/sh/lib/Makefile | 1 -
arch/sh/lib/board.c | 189 -------------------------------------------
3 files changed, 2 insertions(+), 190 deletions(-)
delete mode 100644 arch/sh/lib/board.c
diff --git a/arch/sh/include/asm/config.h b/arch/sh/include/asm/config.h
index cd29734..dd1329e 100644
--- a/arch/sh/include/asm/config.h
+++ b/arch/sh/include/asm/config.h
@@ -7,4 +7,6 @@
#ifndef _ASM_CONFIG_H_
#define _ASM_CONFIG_H_
+#define CONFIG_SYS_GENERIC_BOARD
+
#endif
diff --git a/arch/sh/lib/Makefile b/arch/sh/lib/Makefile
index f7ae4f8..c5cf89f 100644
--- a/arch/sh/lib/Makefile
+++ b/arch/sh/lib/Makefile
@@ -6,7 +6,6 @@
#
-obj-y += board.o
obj-$(CONFIG_CMD_BOOTM) += bootm.o
ifeq ($(CONFIG_CPU_SH2),y)
obj-y += time_sh2.o
diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c
deleted file mode 100644
index 69cdca3..0000000
--- a/arch/sh/lib/board.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright (C) 2007, 2008, 2010
- * Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#include <common.h>
-#include <command.h>
-#include <console.h>
-#include <malloc.h>
-#include <stdio_dev.h>
-#include <version.h>
-#include <watchdog.h>
-#include <net.h>
-#include <mmc.h>
-#include <environment.h>
-
-#ifdef CONFIG_BITBANGMII
-#include <miiphy.h>
-#endif
-
-DECLARE_GLOBAL_DATA_PTR;
-
-extern int cpu_init(void);
-extern int board_init(void);
-extern int dram_init(void);
-extern int timer_init(void);
-
-unsigned long monitor_flash_len = CONFIG_SYS_MONITOR_LEN;
-
-#ifndef CONFIG_SYS_NO_FLASH
-static int sh_flash_init(void)
-{
- gd->bd->bi_flashsize = flash_init();
-
- if (gd->bd->bi_flashsize >= (1024 * 1024))
- printf("Flash: %ldMB\n", gd->bd->bi_flashsize / (1024*1024));
- else
- printf("Flash: %ldKB\n", gd->bd->bi_flashsize / 1024);
-
- return 0;
-}
-#endif /* CONFIG_SYS_NO_FLASH */
-
-#if defined(CONFIG_CMD_NAND)
-# include <nand.h>
-# define INIT_FUNC_NAND_INIT nand_init,
-#else
-# define INIT_FUNC_NAND_INIT
-#endif /* CONFIG_CMD_NAND */
-
-#if defined(CONFIG_WATCHDOG)
-extern int watchdog_init(void);
-extern int watchdog_disable(void);
-# undef INIT_FUNC_WATCHDOG_INIT
-# define INIT_FUNC_WATCHDOG_INIT watchdog_init,
-# define WATCHDOG_DISABLE watchdog_disable
-#else
-# define INIT_FUNC_WATCHDOG_INIT
-# define WATCHDOG_DISABLE
-#endif /* CONFIG_WATCHDOG */
-
-#if defined(CONFIG_CMD_IDE)
-# include <ide.h>
-# define INIT_FUNC_IDE_INIT ide_init,
-#else
-# define INIT_FUNC_IDE_INIT
-#endif /* CONFIG_CMD_IDE */
-
-#if defined(CONFIG_PCI)
-#include <pci.h>
-static int sh_pci_init(void)
-{
- pci_init();
- return 0;
-}
-# define INIT_FUNC_PCI_INIT sh_pci_init,
-#else
-# define INIT_FUNC_PCI_INIT
-#endif /* CONFIG_PCI */
-
-static int sh_mem_env_init(void)
-{
- mem_malloc_init(CONFIG_SYS_TEXT_BASE - GENERATED_GBL_DATA_SIZE -
- CONFIG_SYS_MALLOC_LEN, CONFIG_SYS_MALLOC_LEN - 16);
- env_relocate();
- jumptable_init();
- return 0;
-}
-
-#if defined(CONFIG_CMD_MMC)
-static int sh_mmc_init(void)
-{
- puts("MMC: ");
- mmc_initialize(gd->bd);
- return 0;
-}
-#endif
-
-typedef int (init_fnc_t) (void);
-
-init_fnc_t *init_sequence[] =
-{
- cpu_init, /* basic cpu dependent setup */
- board_init, /* basic board dependent setup */
- interrupt_init, /* set up exceptions */
- env_init, /* event init */
- serial_init, /* SCIF init */
- INIT_FUNC_WATCHDOG_INIT /* watchdog init */
- console_init_f,
- display_options,
- checkcpu,
- checkboard, /* Check support board */
- dram_init, /* SDRAM init */
- timer_init, /* SuperH Timer (TCNT0 only) init */
- sh_mem_env_init,
-#ifndef CONFIG_SYS_NO_FLASH
- sh_flash_init, /* Flash memory init*/
-#endif
- INIT_FUNC_NAND_INIT/* Flash memory (NAND) init */
- INIT_FUNC_PCI_INIT /* PCI init */
- stdio_init,
- console_init_r,
- interrupt_init,
-#ifdef CONFIG_BOARD_LATE_INIT
- board_late_init,
-#endif
-#if defined(CONFIG_CMD_MMC)
- sh_mmc_init,
-#endif
- NULL /* Terminate this list */
-};
-
-void sh_generic_init(void)
-{
- bd_t *bd;
- init_fnc_t **init_fnc_ptr;
-
- memset(gd, 0, GENERATED_GBL_DATA_SIZE);
-
- gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */
-
- gd->bd = (bd_t *)(gd + 1); /* At end of global data */
- gd->baudrate = CONFIG_BAUDRATE;
-
- gd->cpu_clk = CONFIG_SYS_CLK_FREQ;
-
- bd = gd->bd;
- bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
- bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
-#ifndef CONFIG_SYS_NO_FLASH
- bd->bi_flashstart = CONFIG_SYS_FLASH_BASE;
-#endif
-#if defined(CONFIG_SYS_SRAM_BASE) && defined(CONFIG_SYS_SRAM_SIZE)
- bd->bi_sramstart = CONFIG_SYS_SRAM_BASE;
- bd->bi_sramsize = CONFIG_SYS_SRAM_SIZE;
-#endif
-
- for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
- WATCHDOG_RESET();
- if ((*init_fnc_ptr) () != 0)
- hang();
- }
-
-#ifdef CONFIG_WATCHDOG
- /* disable watchdog if environment is set */
- {
- char *s = getenv("watchdog");
- if (s != NULL)
- if (strncmp(s, "off", 3) == 0)
- WATCHDOG_DISABLE();
- }
-#endif /* CONFIG_WATCHDOG*/
-
-
-#ifdef CONFIG_BITBANGMII
- bb_miiphy_init();
-#endif
-#if defined(CONFIG_CMD_NET)
- puts("Net: ");
- eth_initialize();
-#endif /* CONFIG_CMD_NET */
-
- while (1) {
- WATCHDOG_RESET();
- main_loop();
- }
-}
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 36+ messages in thread* [U-Boot] [PATCH 06/12] avr32: Drop unused code in u-boot.h
2016-05-15 0:49 [U-Boot] [PATCH 00/12] Drop old pre-generic-board code Simon Glass
` (4 preceding siblings ...)
2016-05-15 0:49 ` [U-Boot] [PATCH 05/12] sh: Drop the arch-specific board init Simon Glass
@ 2016-05-15 0:49 ` 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
` (5 subsequent siblings)
11 siblings, 2 replies; 36+ messages in thread
From: Simon Glass @ 2016-05-15 0:49 UTC (permalink / raw)
To: u-boot
Since generic board init is enabled, this is not used. Drop it.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
arch/avr32/include/asm/u-boot.h | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/arch/avr32/include/asm/u-boot.h b/arch/avr32/include/asm/u-boot.h
index 8b047ec..7d48e9a 100644
--- a/arch/avr32/include/asm/u-boot.h
+++ b/arch/avr32/include/asm/u-boot.h
@@ -6,28 +6,8 @@
#ifndef __ASM_U_BOOT_H__
#define __ASM_U_BOOT_H__ 1
-#ifdef CONFIG_SYS_GENERIC_BOARD
/* Use the generic board which requires a unified bd_info */
#include <asm-generic/u-boot.h>
-#else
-
-typedef struct bd_info {
- unsigned char bi_phy_id[4];
- unsigned long bi_board_number;
- void *bi_boot_params;
- struct {
- unsigned long start;
- unsigned long size;
- } bi_dram[CONFIG_NR_DRAM_BANKS];
- unsigned long bi_flashstart;
- unsigned long bi_flashsize;
- unsigned long bi_flashoffset;
-} bd_t;
-
-#define bi_memstart bi_dram[0].start
-#define bi_memsize bi_dram[0].size
-
-#endif
/* For image.h:image_check_target_arch() */
#define IH_ARCH_DEFAULT IH_ARCH_AVR32
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 36+ messages in thread* [U-Boot] [PATCH 06/12] avr32: Drop unused code in u-boot.h
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
1 sibling, 0 replies; 36+ messages in thread
From: Andreas Bießmann @ 2016-05-18 7:23 UTC (permalink / raw)
To: u-boot
On 2016-05-15 02:49, Simon Glass wrote:
> Since generic board init is enabled, this is not used. Drop it.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Andreas Bie?mann <andreas@biessmann.org>
> ---
>
> arch/avr32/include/asm/u-boot.h | 20 --------------------
> 1 file changed, 20 deletions(-)
>
> diff --git a/arch/avr32/include/asm/u-boot.h
> b/arch/avr32/include/asm/u-boot.h
> index 8b047ec..7d48e9a 100644
> --- a/arch/avr32/include/asm/u-boot.h
> +++ b/arch/avr32/include/asm/u-boot.h
> @@ -6,28 +6,8 @@
> #ifndef __ASM_U_BOOT_H__
> #define __ASM_U_BOOT_H__ 1
>
> -#ifdef CONFIG_SYS_GENERIC_BOARD
> /* Use the generic board which requires a unified bd_info */
> #include <asm-generic/u-boot.h>
> -#else
> -
> -typedef struct bd_info {
> - unsigned char bi_phy_id[4];
> - unsigned long bi_board_number;
> - void *bi_boot_params;
> - struct {
> - unsigned long start;
> - unsigned long size;
> - } bi_dram[CONFIG_NR_DRAM_BANKS];
> - unsigned long bi_flashstart;
> - unsigned long bi_flashsize;
> - unsigned long bi_flashoffset;
> -} bd_t;
> -
> -#define bi_memstart bi_dram[0].start
> -#define bi_memsize bi_dram[0].size
> -
> -#endif
>
> /* For image.h:image_check_target_arch() */
> #define IH_ARCH_DEFAULT IH_ARCH_AVR32
^ permalink raw reply [flat|nested] 36+ messages in thread* [U-Boot] [U-Boot,06/12] avr32: Drop unused code in u-boot.h
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 ` Tom Rini
1 sibling, 0 replies; 36+ messages in thread
From: Tom Rini @ 2016-05-30 17:58 UTC (permalink / raw)
To: u-boot
On Sat, May 14, 2016 at 06:49:31PM -0600, Simon Glass wrote:
> Since generic board init is enabled, this is not used. Drop it.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Acked-by: Andreas Bie?mann <andreas@biessmann.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160530/b9772c11/attachment.sig>
^ permalink raw reply [flat|nested] 36+ messages in thread
* [U-Boot] [PATCH 07/12] m68k: Drop unused code in u-boot.h
2016-05-15 0:49 [U-Boot] [PATCH 00/12] Drop old pre-generic-board code Simon Glass
` (5 preceding siblings ...)
2016-05-15 0:49 ` [U-Boot] [PATCH 06/12] avr32: Drop unused code in u-boot.h Simon Glass
@ 2016-05-15 0:49 ` 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
` (4 subsequent siblings)
11 siblings, 2 replies; 36+ messages in thread
From: Simon Glass @ 2016-05-15 0:49 UTC (permalink / raw)
To: u-boot
Since generic board init is enabled, this is not used. Drop it.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
arch/m68k/include/asm/u-boot.h | 39 ---------------------------------------
1 file changed, 39 deletions(-)
diff --git a/arch/m68k/include/asm/u-boot.h b/arch/m68k/include/asm/u-boot.h
index 911c0d3..8203844 100644
--- a/arch/m68k/include/asm/u-boot.h
+++ b/arch/m68k/include/asm/u-boot.h
@@ -14,47 +14,8 @@
#ifndef __U_BOOT_H__
#define __U_BOOT_H__
-/*
- * Board information passed to Linux kernel from U-Boot
- *
- * include/asm-ppc/u-boot.h
- */
-
-#ifdef CONFIG_SYS_GENERIC_BOARD
/* Use the generic board which requires a unified bd_info */
#include <asm-generic/u-boot.h>
-#else
-
-#ifndef __ASSEMBLY__
-
-typedef struct bd_info {
- unsigned long bi_memstart; /* start of DRAM memory */
- phys_size_t bi_memsize; /* size of DRAM memory in bytes */
- unsigned long bi_flashstart; /* start of FLASH memory */
- unsigned long bi_flashsize; /* size of FLASH memory */
- unsigned long bi_flashoffset; /* reserved area for startup monitor */
- unsigned long bi_sramstart; /* start of SRAM memory */
- unsigned long bi_sramsize; /* size of SRAM memory */
- unsigned long bi_mbar_base; /* base of internal registers */
- unsigned long bi_bootflags; /* boot / reboot flag (for LynxOS) */
- unsigned long bi_boot_params; /* where this board expects params */
- unsigned short bi_ethspeed; /* Ethernet speed in Mbps */
- unsigned long bi_intfreq; /* Internal Freq, in MHz */
- unsigned long bi_busfreq; /* Bus Freq, in MHz */
-#ifdef CONFIG_PCI
- unsigned long bi_pcifreq; /* pci Freq in MHz */
-#endif
-#ifdef CONFIG_EXTRA_CLOCK
- unsigned long bi_inpfreq; /* input Freq in MHz */
- unsigned long bi_vcofreq; /* vco Freq in MHz */
- unsigned long bi_flbfreq; /* Flexbus Freq in MHz */
-#endif
-} bd_t;
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* !CONFIG_SYS_GENERIC_BOARD */
-
/* For image.h:image_check_target_arch() */
#define IH_ARCH_DEFAULT IH_ARCH_M68K
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 36+ messages in thread* [U-Boot] [PATCH 07/12] m68k: Drop unused code in u-boot.h
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
1 sibling, 0 replies; 36+ messages in thread
From: Angelo Dureghello @ 2016-05-17 20:42 UTC (permalink / raw)
To: u-boot
On 15/05/2016 02:49, Simon Glass wrote:
> Since generic board init is enabled, this is not used. Drop it.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> arch/m68k/include/asm/u-boot.h | 39 ---------------------------------------
> 1 file changed, 39 deletions(-)
>
Acked-by: Angelo Dureghello <angelo@sysam.it>
^ permalink raw reply [flat|nested] 36+ messages in thread
* [U-Boot] [U-Boot,07/12] m68k: Drop unused code in u-boot.h
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 ` Tom Rini
1 sibling, 0 replies; 36+ messages in thread
From: Tom Rini @ 2016-05-30 17:58 UTC (permalink / raw)
To: u-boot
On Sat, May 14, 2016 at 06:49:32PM -0600, Simon Glass wrote:
> Since generic board init is enabled, this is not used. Drop it.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Acked-by: Angelo Dureghello <angelo@sysam.it>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160530/4fcffe7f/attachment.sig>
^ permalink raw reply [flat|nested] 36+ messages in thread
* [U-Boot] [PATCH 08/12] mips: Drop unused code in u-boot.h
2016-05-15 0:49 [U-Boot] [PATCH 00/12] Drop old pre-generic-board code Simon Glass
` (6 preceding siblings ...)
2016-05-15 0:49 ` [U-Boot] [PATCH 07/12] m68k: " Simon Glass
@ 2016-05-15 0:49 ` 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
` (3 subsequent siblings)
11 siblings, 2 replies; 36+ messages in thread
From: Simon Glass @ 2016-05-15 0:49 UTC (permalink / raw)
To: u-boot
Since generic board init is enabled, this is not used. Drop it.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
arch/mips/include/asm/u-boot.h | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/arch/mips/include/asm/u-boot.h b/arch/mips/include/asm/u-boot.h
index 4909a2a..af03e8d 100644
--- a/arch/mips/include/asm/u-boot.h
+++ b/arch/mips/include/asm/u-boot.h
@@ -15,25 +15,9 @@
#ifndef _U_BOOT_H_
#define _U_BOOT_H_ 1
-#ifdef CONFIG_SYS_GENERIC_BOARD
-
/* Use the generic board which requires a unified bd_info */
#include <asm-generic/u-boot.h>
-#else /* !CONFIG_SYS_GENERIC_BOARD */
-
-typedef struct bd_info {
- unsigned long bi_arch_number; /* unique id for this board */
- unsigned long bi_boot_params; /* where this board expects params */
- unsigned long bi_memstart; /* start of DRAM memory */
- phys_size_t bi_memsize; /* size of DRAM memory in bytes */
- unsigned long bi_flashstart; /* start of FLASH memory */
- unsigned long bi_flashsize; /* size of FLASH memory */
- unsigned long bi_flashoffset; /* reserved area for startup monitor */
-} bd_t;
-
-#endif /* !CONFIG_SYS_GENERIC_BOARD */
-
/* For image.h:image_check_target_arch() */
#define IH_ARCH_DEFAULT IH_ARCH_MIPS
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 36+ messages in thread* [U-Boot] [PATCH 08/12] mips: Drop unused code in u-boot.h
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
1 sibling, 0 replies; 36+ messages in thread
From: Daniel Schwierzeck @ 2016-05-18 9:58 UTC (permalink / raw)
To: u-boot
Am 15.05.2016 um 02:49 schrieb Simon Glass:
> Since generic board init is enabled, this is not used. Drop it.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
> ---
>
> arch/mips/include/asm/u-boot.h | 16 ----------------
> 1 file changed, 16 deletions(-)
>
> diff --git a/arch/mips/include/asm/u-boot.h b/arch/mips/include/asm/u-boot.h
> index 4909a2a..af03e8d 100644
> --- a/arch/mips/include/asm/u-boot.h
> +++ b/arch/mips/include/asm/u-boot.h
> @@ -15,25 +15,9 @@
> #ifndef _U_BOOT_H_
> #define _U_BOOT_H_ 1
>
> -#ifdef CONFIG_SYS_GENERIC_BOARD
> -
> /* Use the generic board which requires a unified bd_info */
> #include <asm-generic/u-boot.h>
>
> -#else /* !CONFIG_SYS_GENERIC_BOARD */
> -
> -typedef struct bd_info {
> - unsigned long bi_arch_number; /* unique id for this board */
> - unsigned long bi_boot_params; /* where this board expects params */
> - unsigned long bi_memstart; /* start of DRAM memory */
> - phys_size_t bi_memsize; /* size of DRAM memory in bytes */
> - unsigned long bi_flashstart; /* start of FLASH memory */
> - unsigned long bi_flashsize; /* size of FLASH memory */
> - unsigned long bi_flashoffset; /* reserved area for startup monitor */
> -} bd_t;
> -
> -#endif /* !CONFIG_SYS_GENERIC_BOARD */
> -
> /* For image.h:image_check_target_arch() */
> #define IH_ARCH_DEFAULT IH_ARCH_MIPS
>
>
--
- Daniel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160518/b738f5db/attachment-0001.sig>
^ permalink raw reply [flat|nested] 36+ messages in thread* [U-Boot] [U-Boot,08/12] mips: Drop unused code in u-boot.h
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 ` Tom Rini
1 sibling, 0 replies; 36+ messages in thread
From: Tom Rini @ 2016-05-30 17:59 UTC (permalink / raw)
To: u-boot
On Sat, May 14, 2016 at 06:49:33PM -0600, Simon Glass wrote:
> Since generic board init is enabled, this is not used. Drop it.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Acked-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160530/35ceff48/attachment.sig>
^ permalink raw reply [flat|nested] 36+ messages in thread
* [U-Boot] [PATCH 09/12] powerpc: Drop unused code related to generic board
2016-05-15 0:49 [U-Boot] [PATCH 00/12] Drop old pre-generic-board code Simon Glass
` (7 preceding siblings ...)
2016-05-15 0:49 ` [U-Boot] [PATCH 08/12] mips: " Simon Glass
@ 2016-05-15 0:49 ` 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
` (2 subsequent siblings)
11 siblings, 2 replies; 36+ messages in thread
From: Simon Glass @ 2016-05-15 0:49 UTC (permalink / raw)
To: u-boot
Since generic board init is enabled, this is not used. Drop it.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
arch/powerpc/cpu/mpc5xxx/start.S | 3 +-
arch/powerpc/cpu/ppc4xx/cpu_init.c | 7 ---
arch/powerpc/cpu/ppc4xx/start.S | 4 --
arch/powerpc/include/asm/u-boot.h | 104 -------------------------------------
arch/powerpc/lib/Makefile | 5 --
5 files changed, 1 insertion(+), 122 deletions(-)
diff --git a/arch/powerpc/cpu/mpc5xxx/start.S b/arch/powerpc/cpu/mpc5xxx/start.S
index 54793f0..b4c5543 100644
--- a/arch/powerpc/cpu/mpc5xxx/start.S
+++ b/arch/powerpc/cpu/mpc5xxx/start.S
@@ -83,8 +83,7 @@ _start:
* This function is called when the platform is build with SPL
* support from the main (full-blown) U-Boot. And the GD needs
* to get cleared (again) so that the following generic
- * board support code, defined via CONFIG_SYS_GENERIC_BOARD,
- * initializes all variables correctly.
+ * board support code initializes all variables correctly.
*/
mr r3, r2 /* parameter 1: GD pointer */
li r4,0 /* parameter 2: value to fill */
diff --git a/arch/powerpc/cpu/ppc4xx/cpu_init.c b/arch/powerpc/cpu/ppc4xx/cpu_init.c
index 5f5c720..4013a0c 100644
--- a/arch/powerpc/cpu/ppc4xx/cpu_init.c
+++ b/arch/powerpc/cpu/ppc4xx/cpu_init.c
@@ -449,13 +449,6 @@ cpu_init_f (void)
mtdcr(PLB4A1_ACR, (mfdcr(PLB4A1_ACR) & ~PLB4Ax_ACR_RDP_MASK) |
PLB4Ax_ACR_RDP_4DEEP);
#endif /* CONFIG_440SP/SPE || CONFIG_460EX/GT || CONFIG_405EX */
-
-#ifndef CONFIG_SYS_GENERIC_BOARD
- gd = (gd_t *)(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_GBL_DATA_OFFSET);
-
- /* Clear initial global data */
- memset((void *)gd, 0, sizeof(gd_t));
-#endif
}
/*
diff --git a/arch/powerpc/cpu/ppc4xx/start.S b/arch/powerpc/cpu/ppc4xx/start.S
index 137afce..b432b18 100644
--- a/arch/powerpc/cpu/ppc4xx/start.S
+++ b/arch/powerpc/cpu/ppc4xx/start.S
@@ -760,7 +760,6 @@ _start:
#endif
bl cpu_init_f /* run low-level CPU init code (from Flash) */
-#ifdef CONFIG_SYS_GENERIC_BOARD
mr r3, r1
bl board_init_f_alloc_reserve
mr r1, r3
@@ -768,7 +767,6 @@ _start:
li r0,0
stwu r0, -4(r1)
stwu r0, -4(r1)
-#endif
li r3, 0
bl board_init_f
/* NOTREACHED - board_init_f() does not return */
@@ -1037,14 +1035,12 @@ _start:
GET_GOT /* initialize GOT access */
bl cpu_init_f /* run low-level CPU init code (from Flash) */
-#ifdef CONFIG_SYS_GENERIC_BOARD
mr r3, r1
bl board_init_f_alloc_reserve
mr r1, r3
bl board_init_f_init_reserve
stwu r0, -4(r1)
stwu r0, -4(r1)
-#endif
li r3, 0
bl board_init_f /* run first part of init code (from Flash) */
/* NOTREACHED - board_init_f() does not return */
diff --git a/arch/powerpc/include/asm/u-boot.h b/arch/powerpc/include/asm/u-boot.h
index a61e998..74b6202 100644
--- a/arch/powerpc/include/asm/u-boot.h
+++ b/arch/powerpc/include/asm/u-boot.h
@@ -14,112 +14,8 @@
#ifndef __U_BOOT_H__
#define __U_BOOT_H__
-/*
- * Board information passed to Linux kernel from U-Boot
- *
- * include/asm-ppc/u-boot.h
- */
-
-#ifdef CONFIG_SYS_GENERIC_BOARD
/* Use the generic board which requires a unified bd_info */
#include <asm-generic/u-boot.h>
-#else
-
-#ifndef __ASSEMBLY__
-
-typedef struct bd_info {
- unsigned long bi_memstart; /* start of DRAM memory */
- phys_size_t bi_memsize; /* size of DRAM memory in bytes */
- unsigned long bi_flashstart; /* start of FLASH memory */
- unsigned long bi_flashsize; /* size of FLASH memory */
- unsigned long bi_flashoffset; /* reserved area for startup monitor */
- unsigned long bi_sramstart; /* start of SRAM memory */
- unsigned long bi_sramsize; /* size of SRAM memory */
-#if defined(CONFIG_5xx) || defined(CONFIG_8xx) || defined(CONFIG_MPC8260) \
- || defined(CONFIG_E500) || defined(CONFIG_MPC86xx)
- unsigned long bi_immr_base; /* base of IMMR register */
-#endif
-#if defined(CONFIG_MPC5xxx)
- unsigned long bi_mbar_base; /* base of internal registers */
-#endif
-#if defined(CONFIG_MPC83xx)
- unsigned long bi_immrbar;
-#endif
- unsigned long bi_bootflags; /* boot / reboot flag (Unused) */
- unsigned long bi_ip_addr; /* IP Address */
- unsigned char bi_enetaddr[6]; /* OLD: see README.enetaddr */
- unsigned short bi_ethspeed; /* Ethernet speed in Mbps */
- unsigned long bi_intfreq; /* Internal Freq, in MHz */
- unsigned long bi_busfreq; /* Bus Freq, in MHz */
-#if defined(CONFIG_CPM2)
- unsigned long bi_cpmfreq; /* CPM_CLK Freq, in MHz */
- unsigned long bi_brgfreq; /* BRG_CLK Freq, in MHz */
- unsigned long bi_sccfreq; /* SCC_CLK Freq, in MHz */
- unsigned long bi_vco; /* VCO Out from PLL, in MHz */
-#endif
-#if defined(CONFIG_MPC512X)
- unsigned long bi_ipsfreq; /* IPS Bus Freq, in MHz */
-#endif /* CONFIG_MPC512X */
-#if defined(CONFIG_MPC5xxx)
- unsigned long bi_ipbfreq; /* IPB Bus Freq, in MHz */
- unsigned long bi_pcifreq; /* PCI Bus Freq, in MHz */
-#endif
-#if defined(CONFIG_405) || \
- defined(CONFIG_405GP) || \
- defined(CONFIG_405EP) || \
- defined(CONFIG_405EZ) || \
- defined(CONFIG_405EX) || \
- defined(CONFIG_440)
- unsigned char bi_s_version[4]; /* Version of this structure */
- unsigned char bi_r_version[32]; /* Version of the ROM (AMCC) */
- unsigned int bi_procfreq; /* CPU (Internal) Freq, in Hz */
- unsigned int bi_plb_busfreq; /* PLB Bus speed, in Hz */
- unsigned int bi_pci_busfreq; /* PCI Bus speed, in Hz */
- unsigned char bi_pci_enetaddr[6]; /* PCI Ethernet MAC address */
-#endif
-
-#ifdef CONFIG_HAS_ETH1
- unsigned char bi_enet1addr[6]; /* OLD: see README.enetaddr */
-#endif
-#ifdef CONFIG_HAS_ETH2
- unsigned char bi_enet2addr[6]; /* OLD: see README.enetaddr */
-#endif
-#ifdef CONFIG_HAS_ETH3
- unsigned char bi_enet3addr[6]; /* OLD: see README.enetaddr */
-#endif
-#ifdef CONFIG_HAS_ETH4
- unsigned char bi_enet4addr[6]; /* OLD: see README.enetaddr */
-#endif
-#ifdef CONFIG_HAS_ETH5
- unsigned char bi_enet5addr[6]; /* OLD: see README.enetaddr */
-#endif
-
-#if defined(CONFIG_405GP) || defined(CONFIG_405EP) || \
- defined(CONFIG_405EZ) || defined(CONFIG_440GX) || \
- defined(CONFIG_440EP) || defined(CONFIG_440GR) || \
- defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \
- defined(CONFIG_460EX) || defined(CONFIG_460GT)
- unsigned int bi_opbfreq; /* OPB clock in Hz */
- int bi_iic_fast[2]; /* Use fast i2c mode */
-#endif
-#if defined(CONFIG_4xx)
-#if defined(CONFIG_440GX) || \
- defined(CONFIG_460EX) || defined(CONFIG_460GT)
- int bi_phynum[4]; /* Determines phy mapping */
- int bi_phymode[4]; /* Determines phy mode */
-#elif defined(CONFIG_405EP) || defined(CONFIG_405EX) || defined(CONFIG_440)
- int bi_phynum[2]; /* Determines phy mapping */
- int bi_phymode[2]; /* Determines phy mode */
-#else
- int bi_phynum[1]; /* Determines phy mapping */
- int bi_phymode[1]; /* Determines phy mode */
-#endif
-#endif /* defined(CONFIG_4xx) */
-} bd_t;
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* !CONFIG_SYS_GENERIC_BOARD */
/* For image.h:image_check_target_arch() */
#define IH_ARCH_DEFAULT IH_ARCH_PPC
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 05b22bb..3c97476 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -29,11 +29,6 @@ obj-y += ticks.o
obj-y += reloc.o
obj-$(CONFIG_BAT_RW) += bat_rw.o
-ifndef CONFIG_SPL_BUILD
-ifndef CONFIG_SYS_GENERIC_BOARD
-obj-y += board.o
-endif
-endif
obj-$(CONFIG_CMD_BOOTM) += bootm.o
obj-y += cache.o
obj-y += extable.o
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 36+ messages in thread* [U-Boot] [U-Boot, 09/12] powerpc: Drop unused code related to generic board
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 ` Tom Rini
2016-05-30 17:59 ` Tom Rini
1 sibling, 0 replies; 36+ messages in thread
From: Tom Rini @ 2016-05-30 17:59 UTC (permalink / raw)
To: u-boot
On Sat, May 14, 2016 at 06:49:34PM -0600, Simon Glass wrote:
> Since generic board init is enabled, this is not used. Drop it.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160530/df3f4bcc/attachment.sig>
^ permalink raw reply [flat|nested] 36+ messages in thread
* [U-Boot] [U-Boot, 09/12] powerpc: Drop unused code related to generic board
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
1 sibling, 0 replies; 36+ messages in thread
From: Tom Rini @ 2016-05-30 17:59 UTC (permalink / raw)
To: u-boot
On Sat, May 14, 2016 at 06:49:34PM -0600, Simon Glass wrote:
> Since generic board init is enabled, this is not used. Drop it.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160530/f9464949/attachment.sig>
^ permalink raw reply [flat|nested] 36+ messages in thread
* [U-Boot] [PATCH 10/12] Drop use of CONFIG_SYS_GENERIC_BOARD in U-Boot
2016-05-15 0:49 [U-Boot] [PATCH 00/12] Drop old pre-generic-board code Simon Glass
` (8 preceding siblings ...)
2016-05-15 0:49 ` [U-Boot] [PATCH 09/12] powerpc: Drop unused code related to generic board Simon Glass
@ 2016-05-15 0:49 ` Simon Glass
2016-05-18 7:39 ` Andreas Bießmann
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-15 0:49 ` [U-Boot] [PATCH 12/12] Drop HAVE_GENERIC_BOARD and SYS_GENERIC_BOARD options Simon Glass
11 siblings, 2 replies; 36+ messages in thread
From: Simon Glass @ 2016-05-15 0:49 UTC (permalink / raw)
To: 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>
---
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
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 36+ messages in thread* [U-Boot] [PATCH 10/12] Drop use of CONFIG_SYS_GENERIC_BOARD in U-Boot
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
2016-05-30 17:59 ` [U-Boot] [U-Boot, " Tom Rini
1 sibling, 0 replies; 36+ messages in thread
From: Andreas Bießmann @ 2016-05-18 7:39 UTC (permalink / raw)
To: u-boot
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
^ permalink raw reply [flat|nested] 36+ messages in thread* [U-Boot] [U-Boot, 10/12] Drop use of CONFIG_SYS_GENERIC_BOARD in U-Boot
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
@ 2016-05-30 17:59 ` Tom Rini
1 sibling, 0 replies; 36+ messages in thread
From: Tom Rini @ 2016-05-30 17:59 UTC (permalink / raw)
To: u-boot
On Sat, May 14, 2016 at 06:49:35PM -0600, 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>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160530/1b516e1b/attachment.sig>
^ permalink raw reply [flat|nested] 36+ messages in thread
* [U-Boot] [PATCH 11/12] Drop references to CONFIG_SYS_GENERIC_BOARD in config files
2016-05-15 0:49 [U-Boot] [PATCH 00/12] Drop old pre-generic-board code Simon Glass
` (9 preceding siblings ...)
2016-05-15 0:49 ` [U-Boot] [PATCH 10/12] Drop use of CONFIG_SYS_GENERIC_BOARD in U-Boot Simon Glass
@ 2016-05-15 0:49 ` 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
11 siblings, 1 reply; 36+ messages in thread
From: Simon Glass @ 2016-05-15 0:49 UTC (permalink / raw)
To: u-boot
This option is no longer used so need not be enabled.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
arch/sh/include/asm/config.h | 2 --
include/configs/gr_cpci_ax2000.h | 1 -
include/configs/gr_ep2s60.h | 1 -
include/configs/gr_xc3s_1500.h | 1 -
include/configs/grsim.h | 1 -
include/configs/grsim_leon2.h | 1 -
include/configs/openrisc-generic.h | 2 --
7 files changed, 9 deletions(-)
diff --git a/arch/sh/include/asm/config.h b/arch/sh/include/asm/config.h
index dd1329e..cd29734 100644
--- a/arch/sh/include/asm/config.h
+++ b/arch/sh/include/asm/config.h
@@ -7,6 +7,4 @@
#ifndef _ASM_CONFIG_H_
#define _ASM_CONFIG_H_
-#define CONFIG_SYS_GENERIC_BOARD
-
#endif
diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h
index f3361d0..e6b7953 100644
--- a/include/configs/gr_cpci_ax2000.h
+++ b/include/configs/gr_cpci_ax2000.h
@@ -14,7 +14,6 @@
#ifndef __CONFIG_H__
#define __CONFIG_H__
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/*
diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h
index 94eb7ac..956c0e2 100644
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -15,7 +15,6 @@
#ifndef __CONFIG_H__
#define __CONFIG_H__
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/*
diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h
index dcb72c9..908d545 100644
--- a/include/configs/gr_xc3s_1500.h
+++ b/include/configs/gr_xc3s_1500.h
@@ -13,7 +13,6 @@
#ifndef __CONFIG_H__
#define __CONFIG_H__
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/*
diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index 3e81f0d..6a88901 100644
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -13,7 +13,6 @@
#ifndef __CONFIG_H__
#define __CONFIG_H__
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/*
diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index ab1e11d..0ebded6 100644
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -12,7 +12,6 @@
#ifndef __CONFIG_H__
#define __CONFIG_H__
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/*
diff --git a/include/configs/openrisc-generic.h b/include/configs/openrisc-generic.h
index 14e44b0..913256a 100644
--- a/include/configs/openrisc-generic.h
+++ b/include/configs/openrisc-generic.h
@@ -10,8 +10,6 @@
/*
* BOARD/CPU
*/
-#define CONFIG_SYS_GENERIC_BOARD
-
#define CONFIG_SYS_CLK_FREQ 50000000
#define CONFIG_SYS_RESET_ADDR 0x00000100
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 36+ messages in thread* [U-Boot] [PATCH 12/12] Drop HAVE_GENERIC_BOARD and SYS_GENERIC_BOARD options
2016-05-15 0:49 [U-Boot] [PATCH 00/12] Drop old pre-generic-board code Simon Glass
` (10 preceding siblings ...)
2016-05-15 0:49 ` [U-Boot] [PATCH 11/12] Drop references to CONFIG_SYS_GENERIC_BOARD in config files Simon Glass
@ 2016-05-15 0:49 ` Simon Glass
2016-05-17 20:45 ` Angelo Dureghello
` (2 more replies)
11 siblings, 3 replies; 36+ messages in thread
From: Simon Glass @ 2016-05-15 0:49 UTC (permalink / raw)
To: u-boot
These are no longer used. The migration is complete. Drop these options.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
arch/Kconfig | 32 --------------------------------
1 file changed, 32 deletions(-)
diff --git a/arch/Kconfig b/arch/Kconfig
index ec12013..566f044 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -1,13 +1,6 @@
config CREATE_ARCH_SYMLINK
bool
-config HAVE_GENERIC_BOARD
- bool
-
-config SYS_GENERIC_BOARD
- bool
- depends on HAVE_GENERIC_BOARD
-
choice
prompt "Architecture select"
default SANDBOX
@@ -15,57 +8,39 @@ choice
config ARC
bool "ARC architecture"
select HAVE_PRIVATE_LIBGCC
- select HAVE_GENERIC_BOARD
- select SYS_GENERIC_BOARD
select SUPPORT_OF_CONTROL
config ARM
bool "ARM architecture"
select CREATE_ARCH_SYMLINK
select HAVE_PRIVATE_LIBGCC if !ARM64
- select HAVE_GENERIC_BOARD
- select SYS_GENERIC_BOARD
select SUPPORT_OF_CONTROL
config AVR32
bool "AVR32 architecture"
select CREATE_ARCH_SYMLINK
- select HAVE_GENERIC_BOARD
- select SYS_GENERIC_BOARD
config BLACKFIN
bool "Blackfin architecture"
- select HAVE_GENERIC_BOARD
- select SYS_GENERIC_BOARD
config M68K
bool "M68000 architecture"
select HAVE_PRIVATE_LIBGCC
- select HAVE_GENERIC_BOARD
- select SYS_GENERIC_BOARD
config MICROBLAZE
bool "MicroBlaze architecture"
- select HAVE_GENERIC_BOARD
- select SYS_GENERIC_BOARD
select SUPPORT_OF_CONTROL
config MIPS
bool "MIPS architecture"
select HAVE_PRIVATE_LIBGCC
- select HAVE_GENERIC_BOARD
- select SYS_GENERIC_BOARD
select SUPPORT_OF_CONTROL
config NDS32
bool "NDS32 architecture"
- select HAVE_GENERIC_BOARD
- select SYS_GENERIC_BOARD
config NIOS2
bool "Nios II architecture"
- select HAVE_GENERIC_BOARD
- select SYS_GENERIC_BOARD
select SUPPORT_OF_CONTROL
select OF_CONTROL
select DM
@@ -77,14 +52,10 @@ config OPENRISC
config PPC
bool "PowerPC architecture"
select HAVE_PRIVATE_LIBGCC
- select HAVE_GENERIC_BOARD
- select SYS_GENERIC_BOARD
select SUPPORT_OF_CONTROL
config SANDBOX
bool "Sandbox"
- select HAVE_GENERIC_BOARD
- select SYS_GENERIC_BOARD
select SUPPORT_OF_CONTROL
select DM
select DM_SPI_FLASH
@@ -99,15 +70,12 @@ config SH
config SPARC
bool "SPARC architecture"
- select HAVE_GENERIC_BOARD
select CREATE_ARCH_SYMLINK
config X86
bool "x86 architecture"
select CREATE_ARCH_SYMLINK
select HAVE_PRIVATE_LIBGCC
- select HAVE_GENERIC_BOARD
- select SYS_GENERIC_BOARD
select SUPPORT_OF_CONTROL
select DM
select DM_SERIAL
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 36+ messages in thread* [U-Boot] [PATCH 12/12] Drop HAVE_GENERIC_BOARD and SYS_GENERIC_BOARD options
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
2 siblings, 0 replies; 36+ messages in thread
From: Angelo Dureghello @ 2016-05-17 20:45 UTC (permalink / raw)
To: u-boot
On 15/05/2016 02:49, Simon Glass wrote:
> These are no longer used. The migration is complete. Drop these options.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> arch/Kconfig | 32 --------------------------------
> 1 file changed, 32 deletions(-)
Acked-by: Angelo Dureghello <angelo@sysam.it>
^ permalink raw reply [flat|nested] 36+ messages in thread
* [U-Boot] [PATCH 12/12] Drop HAVE_GENERIC_BOARD and SYS_GENERIC_BOARD options
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
2 siblings, 0 replies; 36+ messages in thread
From: Andreas Bießmann @ 2016-05-18 8:37 UTC (permalink / raw)
To: u-boot
On 2016-05-15 02:49, Simon Glass wrote:
> These are no longer used. The migration is complete. Drop these
> options.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Andreas Bie?mann <andreas@biessmann.org>
> ---
>
> arch/Kconfig | 32 --------------------------------
> 1 file changed, 32 deletions(-)
>
> diff --git a/arch/Kconfig b/arch/Kconfig
> index ec12013..566f044 100644
> --- a/arch/Kconfig
> +++ b/arch/Kconfig
> @@ -1,13 +1,6 @@
> config CREATE_ARCH_SYMLINK
> bool
>
> -config HAVE_GENERIC_BOARD
> - bool
> -
> -config SYS_GENERIC_BOARD
> - bool
> - depends on HAVE_GENERIC_BOARD
> -
> choice
> prompt "Architecture select"
> default SANDBOX
> @@ -15,57 +8,39 @@ choice
> config ARC
> bool "ARC architecture"
> select HAVE_PRIVATE_LIBGCC
> - select HAVE_GENERIC_BOARD
> - select SYS_GENERIC_BOARD
> select SUPPORT_OF_CONTROL
>
> config ARM
> bool "ARM architecture"
> select CREATE_ARCH_SYMLINK
> select HAVE_PRIVATE_LIBGCC if !ARM64
> - select HAVE_GENERIC_BOARD
> - select SYS_GENERIC_BOARD
> select SUPPORT_OF_CONTROL
>
> config AVR32
> bool "AVR32 architecture"
> select CREATE_ARCH_SYMLINK
> - select HAVE_GENERIC_BOARD
> - select SYS_GENERIC_BOARD
>
> config BLACKFIN
> bool "Blackfin architecture"
> - select HAVE_GENERIC_BOARD
> - select SYS_GENERIC_BOARD
>
> config M68K
> bool "M68000 architecture"
> select HAVE_PRIVATE_LIBGCC
> - select HAVE_GENERIC_BOARD
> - select SYS_GENERIC_BOARD
>
> config MICROBLAZE
> bool "MicroBlaze architecture"
> - select HAVE_GENERIC_BOARD
> - select SYS_GENERIC_BOARD
> select SUPPORT_OF_CONTROL
>
> config MIPS
> bool "MIPS architecture"
> select HAVE_PRIVATE_LIBGCC
> - select HAVE_GENERIC_BOARD
> - select SYS_GENERIC_BOARD
> select SUPPORT_OF_CONTROL
>
> config NDS32
> bool "NDS32 architecture"
> - select HAVE_GENERIC_BOARD
> - select SYS_GENERIC_BOARD
>
> config NIOS2
> bool "Nios II architecture"
> - select HAVE_GENERIC_BOARD
> - select SYS_GENERIC_BOARD
> select SUPPORT_OF_CONTROL
> select OF_CONTROL
> select DM
> @@ -77,14 +52,10 @@ config OPENRISC
> config PPC
> bool "PowerPC architecture"
> select HAVE_PRIVATE_LIBGCC
> - select HAVE_GENERIC_BOARD
> - select SYS_GENERIC_BOARD
> select SUPPORT_OF_CONTROL
>
> config SANDBOX
> bool "Sandbox"
> - select HAVE_GENERIC_BOARD
> - select SYS_GENERIC_BOARD
> select SUPPORT_OF_CONTROL
> select DM
> select DM_SPI_FLASH
> @@ -99,15 +70,12 @@ config SH
>
> config SPARC
> bool "SPARC architecture"
> - select HAVE_GENERIC_BOARD
> select CREATE_ARCH_SYMLINK
>
> config X86
> bool "x86 architecture"
> select CREATE_ARCH_SYMLINK
> select HAVE_PRIVATE_LIBGCC
> - select HAVE_GENERIC_BOARD
> - select SYS_GENERIC_BOARD
> select SUPPORT_OF_CONTROL
> select DM
> select DM_SERIAL
^ permalink raw reply [flat|nested] 36+ messages in thread
* [U-Boot] [U-Boot, 12/12] Drop HAVE_GENERIC_BOARD and SYS_GENERIC_BOARD options
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 ` Tom Rini
2 siblings, 0 replies; 36+ messages in thread
From: Tom Rini @ 2016-05-30 17:59 UTC (permalink / raw)
To: u-boot
On Sat, May 14, 2016 at 06:49:37PM -0600, Simon Glass wrote:
> These are no longer used. The migration is complete. Drop these options.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Acked-by: Angelo Dureghello <angelo@sysam.it>
> Acked-by: Andreas Bie?mann <andreas@biessmann.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160530/37dc19d5/attachment.sig>
^ permalink raw reply [flat|nested] 36+ messages in thread