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>

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>
Simon Glass · Tom Rini
1 parent 86cfb6bdec
Showing 4 changed files with 19 additions and 0 deletions Side-by-side Diff
arch/x86/config.mk
arch/x86/include/asm/u-boot.h
arch/x86/lib/Makefile
common/board_r.c
@@ -36,6 +36,9 @@
 PLATFORM_CPPFLAGS += -fno-dwarf2-cfi-asm
 PLATFORM_CPPFLAGS += -DREALMODE_BASE=0x7c0
  
+# Support generic board on x86
+__HAVE_ARCH_GENERIC_BOARD := y
+
 PLATFORM_RELFLAGS += -ffunction-sections -fvisibility=hidden
  
 PLATFORM_LDFLAGS += --emit-relocs -Bsymbolic -Bsymbolic-functions
@@ -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 */
@@ -59,6 +66,10 @@
 		ulong size;
 	}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
@@ -25,7 +25,10 @@
  
 LIB	= $(obj)lib$(ARCH).o
  
+ifeq ($(CONFIG_SYS_GENERIC_BOARD),)
 COBJS-y	+= board.o
+endif
+
 COBJS-y	+= bootm.o
 COBJS-y	+= cmd_boot.o
 COBJS-y	+= gcc.o
@@ -507,11 +507,13 @@
 #endif
  
 /* enable exceptions */
+#ifdef CONFIG_ARM
 static int initr_enable_interrupts(void)
 {
 	enable_interrupts();
 	return 0;
 }
+#endif
  
 #ifdef CONFIG_CMD_NET
 static int initr_ethaddr(void)
...	...	@@ -36,6 +36,9 @@
36	36	PLATFORM_CPPFLAGS += -fno-dwarf2-cfi-asm
37	37	PLATFORM_CPPFLAGS += -DREALMODE_BASE=0x7c0
38	38
	39	+# Support generic board on x86
	40	+__HAVE_ARCH_GENERIC_BOARD := y
	41	+
39	42	PLATFORM_RELFLAGS += -ffunction-sections -fvisibility=hidden
40	43
41	44	PLATFORM_LDFLAGS += --emit-relocs -Bsymbolic -Bsymbolic-functions
...	...	@@ -39,6 +39,13 @@
39	39	#include <config.h>
40	40	#include <compiler.h>
41	41
	42	+#ifdef CONFIG_SYS_GENERIC_BOARD
	43	+/* Use the generic board which requires a unified bd_info */
	44	+#include <asm-generic/u-boot.h>
	45	+#else
	46	+
	47	+#ifndef __ASSEMBLY__
	48	+
42	49	typedef struct bd_info {
43	50	unsigned long bi_memstart; /* start of DRAM memory */
44	51	phys_size_t bi_memsize; /* size of DRAM memory in bytes */
...	...	@@ -59,6 +66,10 @@
59	66	ulong size;
60	67	}bi_dram[CONFIG_NR_DRAM_BANKS];
61	68	} bd_t;
	69	+
	70	+#endif /* __ASSEMBLY__ */
	71	+
	72	+#endif /* !CONFIG_SYS_GENERIC_BOARD */
62	73
63	74	/* For image.h:image_check_target_arch() */
64	75	#define IH_ARCH_DEFAULT IH_ARCH_I386
...	...	@@ -25,7 +25,10 @@
25	25
26	26	LIB = $(obj)lib$(ARCH).o
27	27
	28	+ifeq ($(CONFIG_SYS_GENERIC_BOARD),)
28	29	COBJS-y += board.o
	30	+endif
	31	+
29	32	COBJS-y += bootm.o
30	33	COBJS-y += cmd_boot.o
31	34	COBJS-y += gcc.o
...	...	@@ -507,11 +507,13 @@
507	507	#endif
508	508
509	509	/* enable exceptions */
	510	+#ifdef CONFIG_ARM
510	511	static int initr_enable_interrupts(void)
511	512	{
512	513	enable_interrupts();
513	514	return 0;
514	515	}
	516	+#endif
515	517
516	518	#ifdef CONFIG_CMD_NET
517	519	static int initr_ethaddr(void)