diff options
| author | Paul Burton <paul.burton@imgtec.com> | 2014-04-07 10:11:22 +0100 |
|---|---|---|
| committer | Daniel Schwierzeck <daniel.schwierzeck@gmail.com> | 2014-04-20 13:16:43 +0200 |
| commit | 9f0868fffb81ff6533d579b902058eb4f2669d40 (patch) | |
| tree | a13a45b4ab279afd4e3a8bf4070ebd7b0ee43d4e | |
| parent | 6dc9bacea58db97e55bcb3ed2e00d5ca66a615d9 (diff) | |
MIPS: allow use of generic board
This patch allows MIPS boards to make use of generic board, replacing
arch/mips/lib/board.c with common/board_{f,r}.c and struct bd_info with
the asm-generic version.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
| -rw-r--r-- | arch/mips/config.mk | 2 | ||||
| -rw-r--r-- | arch/mips/include/asm/u-boot.h | 9 | ||||
| -rw-r--r-- | arch/mips/lib/Makefile | 2 |
3 files changed, 13 insertions, 0 deletions
diff --git a/arch/mips/config.mk b/arch/mips/config.mk index 42a806252b..f4a234adbc 100644 --- a/arch/mips/config.mk +++ b/arch/mips/config.mk @@ -27,6 +27,8 @@ ENDIANNESS ?= -EB PLATFORM_CPPFLAGS += -DCONFIG_MIPS -D__MIPS__ +__HAVE_ARCH_GENERIC_BOARD := y + # # From Linux arch/mips/Makefile # diff --git a/arch/mips/include/asm/u-boot.h b/arch/mips/include/asm/u-boot.h index 985d7d808a..0eb170ded8 100644 --- a/arch/mips/include/asm/u-boot.h +++ b/arch/mips/include/asm/u-boot.h @@ -15,6 +15,13 @@ #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 int bi_baudrate; /* serial console baudrate */ unsigned long bi_arch_number; /* unique id for this board */ @@ -26,6 +33,8 @@ typedef struct bd_info { 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 diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile index 88ef1c59ab..e483e86f6b 100644 --- a/arch/mips/lib/Makefile +++ b/arch/mips/lib/Makefile @@ -5,7 +5,9 @@ # SPDX-License-Identifier: GPL-2.0+ # +ifndef CONFIG_SYS_GENERIC_BOARD obj-y += board.o +endif obj-y += io.o obj-$(CONFIG_CMD_BOOTM) += bootm.o |