On Fri, Mar 8, 2013 at 8:45 PM, Simon Glass <[email protected]> wrote: > This enables generic board support so that ARM boards can define > CONFIG_SYS_GENERIC_BOARD. > > Signed-off-by: Simon Glass <[email protected]> > --- > Changes in v8: > - Define __HAVE_ARCH_GENERIC_BOARD in ARM's config.mk > > Changes in v7: None > Changes in v6: None > Changes in v5: None > Changes in v4: None > Changes in v3: None > Changes in v2: None > > arch/arm/config.mk | 3 +++ > arch/arm/include/asm/u-boot.h | 9 +++++++++ > arch/arm/lib/Makefile | 3 +++ > 3 files changed, 15 insertions(+) > > diff --git a/arch/arm/config.mk b/arch/arm/config.mk > index 24b9d7c..a0c89b7 100644 > --- a/arch/arm/config.mk > +++ b/arch/arm/config.mk > @@ -31,6 +31,9 @@ CONFIG_STANDALONE_LOAD_ADDR = 0xc100000 > endif > endif > > +# Support generic board on ARM > +__HAVE_ARCH_GENERIC_BOARD := y > + > PLATFORM_CPPFLAGS += -DCONFIG_ARM -D__ARM__ > > # Choose between ARM/Thumb instruction sets > diff --git a/arch/arm/include/asm/u-boot.h b/arch/arm/include/asm/u-boot.h > index 2ba98bc..8e7e27b 100644 > --- a/arch/arm/include/asm/u-boot.h > +++ b/arch/arm/include/asm/u-boot.h > @@ -36,6 +36,12 @@ > #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 > + > +#ifndef __ASSEMBLY__ > typedef struct bd_info { > unsigned int bi_baudrate; /* serial console baudrate */ > ulong bi_arch_number; /* unique id for this board */ > @@ -49,6 +55,9 @@ typedef struct bd_info { > ulong size; > } bi_dram[CONFIG_NR_DRAM_BANKS]; > } bd_t; > +#endif > + > +#endif /* nCONFIG_SYS_GENERIC_BOARD */
Typo? > /* For image.h:image_check_target_arch() */ > #define IH_ARCH_DEFAULT IH_ARCH_ARM > diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile > index 57111af..24c7e7a 100644 > --- a/arch/arm/lib/Makefile > +++ b/arch/arm/lib/Makefile > @@ -39,7 +39,10 @@ GLCOBJS += div0.o > SOBJS-y += crt0.o > > ifndef CONFIG_SPL_BUILD > +ifndef CONFIG_SYS_GENERIC_BOARD > COBJS-y += board.o > +endif > + > COBJS-y += bootm.o > COBJS-$(CONFIG_SYS_L2_PL310) += cache-pl310.o > SOBJS-$(CONFIG_USE_ARCH_MEMSET) += memset.o > -- > 1.8.1.3 > > _______________________________________________ > U-Boot mailing list > [email protected] > http://lists.denx.de/mailman/listinfo/u-boot -- Otavio Salvador O.S. Systems E-mail: [email protected] http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br _______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot
