redonkable
/
remarkable-uboot
1
0
Fork 0
Code Releases Activity

generic-board: move __HAVE_ARCH_GENERIC_BOARD to Kconfig 

Move the option to Kconfig renaming it to CONFIG_HAVE_GENERIC_BOARD.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Alexey Brodkin <abrodkin@synopsys.com>
utp
Masahiro Yamada 2015-03-19 19:42:51 +09:00 committed by Tom Rini
parent 5f9eb22075
commit 0a12e6872e
15 changed files with 25 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1163,7 +1163,7 @@ prepare2: prepare3 outputmakefile
prepare1: prepare2 $(version_h) $(timestamp_h) \ prepare1: prepare2 $(version_h) $(timestamp_h) \
include/config/auto.conf include/config/auto.conf
ifeq ($(__HAVE_ARCH_GENERIC_BOARD),) ifeq ($(CONFIG_HAVE_GENERIC_BOARD),)
ifeq ($(CONFIG_SYS_GENERIC_BOARD),y) ifeq ($(CONFIG_SYS_GENERIC_BOARD),y)
@echo >&2 " Your architecture does not support generic board." @echo >&2 " Your architecture does not support generic board."
@echo >&2 " Please undefine CONFIG_SYS_GENERIC_BOARD in your board config file." @echo >&2 " Please undefine CONFIG_SYS_GENERIC_BOARD in your board config file."

6
README
View File

@ -4190,9 +4190,9 @@ Configuration Settings:
to this new framework over time. Defining this will disable the to this new framework over time. Defining this will disable the
arch/foo/lib/board.c file and use common/board_f.c and arch/foo/lib/board.c file and use common/board_f.c and
common/board_r.c instead. To use this option your architecture common/board_r.c instead. To use this option your architecture
must support it (i.e. must define __HAVE_ARCH_GENERIC_BOARD in must support it (i.e. must select HAVE_GENERIC_BOARD in arch/Kconfig).
its config.mk file). If you find problems enabling this option on If you find problems enabling this option on your board please report
your board please report the problem and send patches! the problem and send patches!
- CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC (OMAP only) - CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC (OMAP only)
This is set by OMAP boards for the max time that reset should This is set by OMAP boards for the max time that reset should

14
arch/Kconfig
View File

@ -1,3 +1,6 @@
config HAVE_GENERIC_BOARD
bool
choice choice
prompt "Architecture select" prompt "Architecture select"
default SANDBOX default SANDBOX
@ -5,34 +8,42 @@ choice
config ARC config ARC
bool "ARC architecture" bool "ARC architecture"
select HAVE_PRIVATE_LIBGCC select HAVE_PRIVATE_LIBGCC
select HAVE_GENERIC_BOARD
config ARM config ARM
bool "ARM architecture" bool "ARM architecture"
select HAVE_PRIVATE_LIBGCC select HAVE_PRIVATE_LIBGCC
select HAVE_GENERIC_BOARD
select SUPPORT_OF_CONTROL select SUPPORT_OF_CONTROL
config AVR32 config AVR32
bool "AVR32 architecture" bool "AVR32 architecture"
select HAVE_GENERIC_BOARD
config BLACKFIN config BLACKFIN
bool "Blackfin architecture" bool "Blackfin architecture"
select HAVE_GENERIC_BOARD
config M68K config M68K
bool "M68000 architecture" bool "M68000 architecture"
select HAVE_GENERIC_BOARD
config MICROBLAZE config MICROBLAZE
bool "MicroBlaze architecture" bool "MicroBlaze architecture"
select HAVE_GENERIC_BOARD
select SUPPORT_OF_CONTROL select SUPPORT_OF_CONTROL
config MIPS config MIPS
bool "MIPS architecture" bool "MIPS architecture"
select HAVE_PRIVATE_LIBGCC select HAVE_PRIVATE_LIBGCC
select HAVE_GENERIC_BOARD
config NDS32 config NDS32
bool "NDS32 architecture" bool "NDS32 architecture"
config NIOS2 config NIOS2
bool "Nios II architecture" bool "Nios II architecture"
select HAVE_GENERIC_BOARD
config OPENRISC config OPENRISC
bool "OpenRISC architecture" bool "OpenRISC architecture"
@ -40,10 +51,12 @@ config OPENRISC
config PPC config PPC
bool "PowerPC architecture" bool "PowerPC architecture"
select HAVE_PRIVATE_LIBGCC select HAVE_PRIVATE_LIBGCC
select HAVE_GENERIC_BOARD
select SUPPORT_OF_CONTROL select SUPPORT_OF_CONTROL
config SANDBOX config SANDBOX
bool "Sandbox" bool "Sandbox"
select HAVE_GENERIC_BOARD
select SUPPORT_OF_CONTROL select SUPPORT_OF_CONTROL
config SH config SH
@ -56,6 +69,7 @@ config SPARC
config X86 config X86
bool "x86 architecture" bool "x86 architecture"
select HAVE_PRIVATE_LIBGCC select HAVE_PRIVATE_LIBGCC
select HAVE_GENERIC_BOARD
select SUPPORT_OF_CONTROL select SUPPORT_OF_CONTROL
endchoice endchoice

3
arch/arc/config.mk
View File

@ -57,6 +57,3 @@ LDFLAGS_FINAL += -pie
# Load address for standalone apps # Load address for standalone apps
CONFIG_STANDALONE_LOAD_ADDR ?= 0x82000000 CONFIG_STANDALONE_LOAD_ADDR ?= 0x82000000
# Support generic board on ARC
__HAVE_ARCH_GENERIC_BOARD := y

3
arch/arm/config.mk
View File

@ -19,9 +19,6 @@ PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections \
PLATFORM_RELFLAGS += $(call cc-option, -msoft-float) \ PLATFORM_RELFLAGS += $(call cc-option, -msoft-float) \
$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,))
# Support generic board on ARM
__HAVE_ARCH_GENERIC_BOARD := y
PLATFORM_CPPFLAGS += -D__ARM__ PLATFORM_CPPFLAGS += -D__ARM__
# Choose between ARM/Thumb instruction sets # Choose between ARM/Thumb instruction sets

3
arch/avr32/config.mk
View File

@ -9,9 +9,6 @@ ifeq ($(CROSS_COMPILE),)
CROSS_COMPILE := avr32-linux- CROSS_COMPILE := avr32-linux-
endif endif
# avr32 has generic board support
__HAVE_ARCH_GENERIC_BOARD := y
CONFIG_STANDALONE_LOAD_ADDR ?= 0x00000000 CONFIG_STANDALONE_LOAD_ADDR ?= 0x00000000
PLATFORM_RELFLAGS += -ffixed-r5 -fPIC -mno-init-got -mrelax PLATFORM_RELFLAGS += -ffixed-r5 -fPIC -mno-init-got -mrelax

3
arch/blackfin/config.mk
View File

@ -20,9 +20,6 @@ CONFIG_BFIN_CPU := $(strip $(CONFIG_BFIN_CPU:"%"=%))
endif endif
CONFIG_BFIN_BOOT_MODE := $(strip $(CONFIG_BFIN_BOOT_MODE:"%"=%)) CONFIG_BFIN_BOOT_MODE := $(strip $(CONFIG_BFIN_BOOT_MODE:"%"=%))
# Support generic board on Blackfin
__HAVE_ARCH_GENERIC_BOARD := y
PLATFORM_RELFLAGS += -ffixed-P3 -fomit-frame-pointer -mno-fdpic PLATFORM_RELFLAGS += -ffixed-P3 -fomit-frame-pointer -mno-fdpic
LDFLAGS_FINAL += --gc-sections LDFLAGS_FINAL += --gc-sections

3
arch/m68k/config.mk
View File

@ -11,9 +11,6 @@ endif
CONFIG_STANDALONE_LOAD_ADDR ?= 0x20000 CONFIG_STANDALONE_LOAD_ADDR ?= 0x20000
# Support generic board on m68k
__HAVE_ARCH_GENERIC_BOARD := y
PLATFORM_CPPFLAGS += -D__M68K__ PLATFORM_CPPFLAGS += -D__M68K__
PLATFORM_LDFLAGS += -n PLATFORM_LDFLAGS += -n
PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections

1
arch/microblaze/config.mk
View File

@ -19,4 +19,3 @@ PLATFORM_CPPFLAGS += -ffixed-r31 -D__microblaze__
ifeq ($(CONFIG_SPL_BUILD),) ifeq ($(CONFIG_SPL_BUILD),)
PLATFORM_CPPFLAGS += -fPIC PLATFORM_CPPFLAGS += -fPIC
endif endif
__HAVE_ARCH_GENERIC_BOARD := y

2
arch/mips/config.mk
View File

@ -43,8 +43,6 @@ PLATFORM_CPPFLAGS += $(cpuflags-y)
PLATFORM_CPPFLAGS += -D__MIPS__ PLATFORM_CPPFLAGS += -D__MIPS__
__HAVE_ARCH_GENERIC_BOARD := y
# #
# From Linux arch/mips/Makefile # From Linux arch/mips/Makefile
# #

2
arch/nios2/config.mk
View File

@ -17,5 +17,3 @@ PLATFORM_CPPFLAGS += -G0
LDFLAGS_FINAL += --gc-sections LDFLAGS_FINAL += --gc-sections
PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
__HAVE_ARCH_GENERIC_BOARD := y

3
arch/powerpc/config.mk
View File

@ -18,9 +18,6 @@ PLATFORM_RELFLAGS += -fpic -mrelocatable -ffunction-sections \
PLATFORM_CPPFLAGS += -D__powerpc__ -ffixed-r2 -m32 PLATFORM_CPPFLAGS += -D__powerpc__ -ffixed-r2 -m32
PLATFORM_LDFLAGS += -m32 -melf32ppclinux PLATFORM_LDFLAGS += -m32 -melf32ppclinux
# Support generic board on PPC
__HAVE_ARCH_GENERIC_BOARD := y
# #
# When cross-compiling on NetBSD, we have to define __PPC__ or else we # 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 # will pick up a va_list declaration that is incompatible with the

3
arch/sandbox/config.mk
View File

@ -16,9 +16,6 @@ PLATFORM_CPPFLAGS += $(shell sdl-config --cflags)
endif endif
endif endif
# Support generic board on sandbox
__HAVE_ARCH_GENERIC_BOARD := y
cmd_u-boot__ = $(CC) -o $@ -T u-boot.lds \ cmd_u-boot__ = $(CC) -o $@ -T u-boot.lds \
-Wl,--start-group $(u-boot-main) -Wl,--end-group \ -Wl,--start-group $(u-boot-main) -Wl,--end-group \
$(PLATFORM_LIBS) -Wl,-Map -Wl,u-boot.map $(PLATFORM_LIBS) -Wl,-Map -Wl,u-boot.map

3
arch/x86/config.mk
View File

@ -17,9 +17,6 @@ PLATFORM_CPPFLAGS += $(PF_CPPFLAGS_X86)
PLATFORM_CPPFLAGS += -fno-dwarf2-cfi-asm PLATFORM_CPPFLAGS += -fno-dwarf2-cfi-asm
PLATFORM_CPPFLAGS += -march=i386 -m32 PLATFORM_CPPFLAGS += -march=i386 -m32
# Support generic board on x86
__HAVE_ARCH_GENERIC_BOARD := y
PLATFORM_RELFLAGS += -ffunction-sections -fvisibility=hidden PLATFORM_RELFLAGS += -ffunction-sections -fvisibility=hidden
PLATFORM_LDFLAGS += --emit-relocs -Bsymbolic -Bsymbolic-functions -m elf_i386 PLATFORM_LDFLAGS += --emit-relocs -Bsymbolic -Bsymbolic-functions -m elf_i386

12
doc/README.generic-board
View File

@ -44,16 +44,18 @@ The following architectures are supported now:
arc arc
arm arm
avr32
blackfin
m68k
microblaze
mips mips
nios2
powerpc powerpc
sandbox sandbox
x86 x86
If your architecture is not supported, you need to adjust your If your architecture is not supported, you need to select
arch/<arch>/config.mk file to include: HAVE_GENERIC_BOARD in arch/Kconfig
__HAVE_ARCH_GENERIC_BOARD := y
and test it with a suitable board, as follows. and test it with a suitable board, as follows.