We are introducing a new unified board setup and we want this to be the default. So we need to opt all architectures out first.
Signed-off-by: Simon Glass sjg@chromium.org --- README | 5 +++++ arch/arm/config.mk | 3 +++ arch/avr32/config.mk | 3 +++ arch/blackfin/config.mk | 3 +++ arch/m68k/config.mk | 3 +++ arch/microblaze/config.mk | 3 +++ arch/mips/config.mk | 3 +++ arch/nds32/config.mk | 3 +++ arch/nios2/config.mk | 3 +++ arch/powerpc/config.mk | 3 +++ arch/sandbox/config.mk | 3 +++ arch/sh/config.mk | 3 +++ arch/sparc/config.mk | 3 +++ arch/x86/config.mk | 3 +++ config.mk | 4 ++++ 15 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/README b/README index a076dbf..bf56318 100644 --- a/README +++ b/README @@ -2745,6 +2745,11 @@ Configuration Settings: This makes U-Boot skip relocation for those architectures which don't support it. It is normally defined in arch/xxx/config.mk
+- CONFIG_SYS_LEGACY_BOARD + This selects the legacy architecture-specific board system + instead of the cross-architecture board. It is intended to move + away from this over time. + The following definitions that deal with the placement and management of environment data (variable area); in general, we support the following configurations: diff --git a/arch/arm/config.mk b/arch/arm/config.mk index 45f9dca..31e9ef9 100644 --- a/arch/arm/config.mk +++ b/arch/arm/config.mk @@ -33,6 +33,9 @@ endif
PLATFORM_CPPFLAGS += -DCONFIG_ARM -D__ARM__
+# Move to unified board system later +CONFIG_SYS_LEGACY_BOARD := y + # Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb: PF_CPPFLAGS_ARM := $(call cc-option,-marm,)
diff --git a/arch/avr32/config.mk b/arch/avr32/config.mk index 1995983..07d8a6f 100644 --- a/arch/avr32/config.mk +++ b/arch/avr32/config.mk @@ -34,3 +34,6 @@ LDSCRIPT = $(SRCTREE)/$(CPUDIR)/u-boot.lds
# We use legacy relocation for now CONFIG_SYS_SKIP_RELOC := y + +# Move to unified board system later +CONFIG_SYS_LEGACY_BOARD := y diff --git a/arch/blackfin/config.mk b/arch/blackfin/config.mk index 56047c8..ec7ae4a 100644 --- a/arch/blackfin/config.mk +++ b/arch/blackfin/config.mk @@ -40,6 +40,9 @@ PLATFORM_CPPFLAGS += -DCONFIG_BLACKFIN # Blackfin does not do relocation CONFIG_SYS_SKIP_RELOC := y
+# Move to unified board system later +CONFIG_SYS_LEGACY_BOARD := y + LDFLAGS_FINAL += --gc-sections LDFLAGS += -m elf32bfin PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections diff --git a/arch/m68k/config.mk b/arch/m68k/config.mk index 52bfc81..b5819f1 100644 --- a/arch/m68k/config.mk +++ b/arch/m68k/config.mk @@ -32,3 +32,6 @@ LDFLAGS_FINAL += --gc-sections
# We use legacy relocation for now CONFIG_SYS_SKIP_RELOC := y + +# Move to unified board system later +CONFIG_SYS_LEGACY_BOARD := y diff --git a/arch/microblaze/config.mk b/arch/microblaze/config.mk index 7645f2e..148107d 100644 --- a/arch/microblaze/config.mk +++ b/arch/microblaze/config.mk @@ -32,3 +32,6 @@ PLATFORM_CPPFLAGS += -ffixed-r31 -D__microblaze__
# Microblaze does not do relocation CONFIG_SYS_SKIP_RELOC := y + +# Move to unified board system later +CONFIG_SYS_LEGACY_BOARD := y diff --git a/arch/mips/config.mk b/arch/mips/config.mk index 832b93f..0c7cbd7 100644 --- a/arch/mips/config.mk +++ b/arch/mips/config.mk @@ -27,6 +27,9 @@ CONFIG_STANDALONE_LOAD_ADDR ?= 0x80200000 -T mips.lds
PLATFORM_CPPFLAGS += -DCONFIG_MIPS -D__MIPS__
+# Move to unified board system later +CONFIG_SYS_LEGACY_BOARD := y + # # From Linux arch/mips/Makefile # diff --git a/arch/nds32/config.mk b/arch/nds32/config.mk index 4a4499b..0c18d5b 100644 --- a/arch/nds32/config.mk +++ b/arch/nds32/config.mk @@ -36,3 +36,6 @@ LDFLAGS_u-boot = --gc-sections --relax
# We use legacy relocation for now CONFIG_SYS_SKIP_RELOC := y + +# Move to unified board system later +CONFIG_SYS_LEGACY_BOARD := y diff --git a/arch/nios2/config.mk b/arch/nios2/config.mk index cde7f82..240a4f8 100644 --- a/arch/nios2/config.mk +++ b/arch/nios2/config.mk @@ -34,3 +34,6 @@ PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
# NIOS2 does not do relocation CONFIG_SYS_SKIP_RELOC := y + +# Move to unified board system later +CONFIG_SYS_LEGACY_BOARD := y diff --git a/arch/powerpc/config.mk b/arch/powerpc/config.mk index eba562f..6a4f59e 100644 --- a/arch/powerpc/config.mk +++ b/arch/powerpc/config.mk @@ -29,6 +29,9 @@ PLATFORM_RELFLAGS += -fpic -mrelocatable -ffunction-sections -fdata-sections PLATFORM_CPPFLAGS += -DCONFIG_PPC -D__powerpc__ PLATFORM_LDFLAGS += -n
+# Move to unified board system later +CONFIG_SYS_LEGACY_BOARD := y + # # When cross-compiling on NetBSD, we have to define __PPC__ or else we # will pick up a va_list declaration that is incompatible with the diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk index d71326f..a355f84 100644 --- a/arch/sandbox/config.mk +++ b/arch/sandbox/config.mk @@ -22,3 +22,6 @@ PLATFORM_LIBS += -lrt
# Sandbox does not do relocation CONFIG_SYS_SKIP_RELOC := y + +# Move to unified board system later +CONFIG_SYS_LEGACY_BOARD := y diff --git a/arch/sh/config.mk b/arch/sh/config.mk index 48a7b37..875ad84 100644 --- a/arch/sh/config.mk +++ b/arch/sh/config.mk @@ -34,3 +34,6 @@ LDFLAGS_FINAL = --gc-sections
# SH does not do relocation CONFIG_SYS_SKIP_RELOC := y + +# Move to unified board system later +CONFIG_SYS_LEGACY_BOARD := y diff --git a/arch/sparc/config.mk b/arch/sparc/config.mk index 032659c..8955ba6 100644 --- a/arch/sparc/config.mk +++ b/arch/sparc/config.mk @@ -29,3 +29,6 @@ PLATFORM_CPPFLAGS += -DCONFIG_SPARC -D__sparc__
# Sparc does not do relocation CONFIG_SYS_SKIP_RELOC := y + +# Move to unified board system later +CONFIG_SYS_LEGACY_BOARD := y diff --git a/arch/x86/config.mk b/arch/x86/config.mk index 11f3d18..cb8865a 100644 --- a/arch/x86/config.mk +++ b/arch/x86/config.mk @@ -51,3 +51,6 @@ export USE_PRIVATE_LIBGCC=$(shell dirname $(PREFIXED_LIBGCC))
# We use legacy relocation for now CONFIG_SYS_SKIP_RELOC := y + +# Move to unified board system later +CONFIG_SYS_LEGACY_BOARD := y diff --git a/config.mk b/config.mk index ddaa477..db5b909 100644 --- a/config.mk +++ b/config.mk @@ -206,6 +206,10 @@ ifeq ($(CONFIG_SPL_BUILD),y) CPPFLAGS += -DCONFIG_SPL_BUILD endif
+ifeq ($(CONFIG_SYS_LEGACY_BOARD),y) +CPPFLAGS += -DCONFIG_SYS_LEGACY_BOARD +endif + ifneq ($(RESET_VECTOR_ADDRESS),) CPPFLAGS += -DRESET_VECTOR_ADDRESS=$(RESET_VECTOR_ADDRESS) endif