Drop old pre-generic-board code

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 <[email protected]>

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 <[email protected]>

---

 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(-)

Makefile +0 -11

index 293fad0..8478019 100644
@@ -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."

Makefile +0 -3

-	@/bin/false
-endif
-endif
 ifeq ($(wildcard $(LDSCRIPT)),)
 	@echo >&2 "  Could not find linker script."
 	@/bin/false

README +0 -7

index 88ff837..2cdfb92 100644
@@ -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).

README +0 -3

-	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

board/sandbox/README.sandbox +0 -1

index fa1842b..9fe3bf1 100644
@@ -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

board/sandbox/README.sandbox +1 -1

-driver model (CONFIG_DM) and associated commands.
+Also sandbox supports driver model (CONFIG_DM) and associated 

commands.

Linux RAW Networking Bridge

doc/README.fdt-control +0 -0

index 29fd56a..2913fcb 100644
@@ -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

doc/README.fdt-control +0 -5

-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?

doc/README.generic-board +0 -3

index 734f1aa..6858c4d 100644
@@ -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

doc/README.generic-board +0 -7

-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

doc/README.generic-board +3 -1

+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).

doc/README.generic-board +0 -0

@@ -36,55 +29,6 @@ fields which are common to all architectures.

Architecture-specific fields
have been moved to separate structures.

doc/README.generic-board +0 -4

-Supported Architectures
-------------------------
-
-If you are unlucky then your architecture may not support generic 

board.

doc/README.generic-board +0 -23

-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

doc/README.generic-board +0 -4

-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

doc/README.generic-board +0 -7

-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

doc/README.generic-board +1 -8

-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

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 <[email protected]>

Reviewed-by Andreas Bie?mann <[email protected]>

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 <[email protected]>

---

 common/board_f.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

common/board_f.c +0 -0

index 109025a..d405b5b 100644

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 <[email protected]>

---

 common/board_f.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

common/board_f.c +0 -0

index 109025a..d405b5b 100644

Hi Simon,

Quoted 19 lines · Simon Glass

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 <[email protected]>

---

 common/board_f.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

common/board_f.c +0 -1

index 109025a..d405b5b 100644
@@ -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

common/board_f.c static int setup_mon_len(void) · line 279

Quoted 3 lines

common/board_f.c +1 -0

+#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.

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 <[email protected]>

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 <[email protected]>

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 <[email protected]>

Since generic board init is enabled, this is not used. Drop it.

Signed-off-by Simon Glass <[email protected]>

---

 arch/avr32/include/asm/u-boot.h | 20 --------------------
 1 file changed, 20 deletions(-)

arch/avr32/include/asm/u-boot.h +0 -20

index 8b047ec..7d48e9a 100644
@@ -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

Since generic board init is enabled, this is not used. Drop it.

Signed-off-by Simon Glass <[email protected]>

Acked-by Andreas Bie?mann <[email protected]>

Since generic board init is enabled, this is not used. Drop it.

Signed-off-by Simon Glass <[email protected]>

---

  arch/m68k/include/asm/u-boot.h | 39 ---------------------------------------
  1 file changed, 39 deletions(-)

Since generic board init is enabled, this is not used. Drop it.

Signed-off-by Simon Glass <[email protected]>

Acked-by Angelo Dureghello <[email protected]>

Since generic board init is enabled, this is not used. Drop it.

Signed-off-by Simon Glass <[email protected]>

---

 arch/mips/include/asm/u-boot.h | 16 ----------------
 1 file changed, 16 deletions(-)

arch/mips/include/asm/u-boot.h +0 -16

index 4909a2a..af03e8d 100644
@@ -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
 

Since generic board init is enabled, this is not used. Drop it.

Signed-off-by Simon Glass <[email protected]>

Acked-by Daniel Schwierzeck <[email protected]>

Since generic board init is enabled, this is not used. Drop it.

Signed-off-by Simon Glass <[email protected]>

Since generic board init is enabled, this is not used. Drop it.

Signed-off-by Simon Glass <[email protected]>

This option is always enabled and is about to be removed. Drop references
to it.

Signed-off-by Simon Glass <[email protected]>

---

 common/Makefile    | 4 ++--
 common/main.c      | 6 ------
 include/watchdog.h | 3 +--
 3 files changed, 3 insertions(+), 10 deletions(-)

common/Makefile +2 -2

index b23f312..c0f16cc 100644
@@ -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
 

common/main.c +0 -6

index 42bbb50..2116a9e 100644
@@ -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 */

include/watchdog.h +1 -2

index 9273fa1..174c894 100644
@@ -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

This option is always enabled and is about to be removed. Drop references to it.

Signed-off-by Simon Glass <[email protected]>

Reviewed-by Andreas Bie?mann <[email protected]>

This option is no longer used so need not be enabled.

Signed-off-by Simon Glass <[email protected]>

These are no longer used. The migration is complete. Drop these options.

Signed-off-by Simon Glass <[email protected]>

---

  arch/Kconfig | 32 --------------------------------
  1 file changed, 32 deletions(-)

These are no longer used. The migration is complete. Drop these options.

Signed-off-by Simon Glass <[email protected]>

---

 arch/Kconfig | 32 --------------------------------
 1 file changed, 32 deletions(-)

arch/Kconfig +0 -32

index ec12013..566f044 100644
@@ -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

These are no longer used. The migration is complete. Drop these options.

Signed-off-by Simon Glass <[email protected]>

Acked-by Angelo Dureghello <[email protected]>

Acked-by Andreas Bie?mann <[email protected]>