summaryrefslogtreecommitdiff
path: root/arch/x86/include
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2013-03-11 07:40:13 +0000
committerTom Rini <trini@ti.com>2013-03-15 16:14:00 -0400
commite424c15c1f4ef8a084120f111d95da60676ba1cc (patch)
tree6e709c7576dc6a66c623d9784b22963d42e81f36 /arch/x86/include
parent86cfb6bdecc3a312a939bbd89560f500f45193c3 (diff)
downloadu-boot-imx-e424c15c1f4ef8a084120f111d95da60676ba1cc.zip
u-boot-imx-e424c15c1f4ef8a084120f111d95da60676ba1cc.tar.gz
u-boot-imx-e424c15c1f4ef8a084120f111d95da60676ba1cc.tar.bz2
x86: Enable generic board support
This enables generic board support so that x86 boards can define CONFIG_SYS_GENERIC_BOARD. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/u-boot.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/x86/include/asm/u-boot.h b/arch/x86/include/asm/u-boot.h
index 2f45c7b..df759fa 100644
--- a/arch/x86/include/asm/u-boot.h
+++ b/arch/x86/include/asm/u-boot.h
@@ -39,6 +39,13 @@
#include <config.h>
#include <compiler.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 */
@@ -60,6 +67,10 @@ typedef struct bd_info {
}bi_dram[CONFIG_NR_DRAM_BANKS];
} bd_t;
+#endif /* __ASSEMBLY__ */
+
+#endif /* !CONFIG_SYS_GENERIC_BOARD */
+
/* For image.h:image_check_target_arch() */
#define IH_ARCH_DEFAULT IH_ARCH_I386