Hi Tom, On Mon, Apr 22, 2013 at 7:11 AM, Tom Rini <[email protected]> wrote: > On Mon, Apr 22, 2013 at 10:03:10AM -0400, Tom Rini wrote: >> On Sat, Apr 20, 2013 at 11:42:38AM -0700, Simon Glass wrote: >> >> > Add generic board support for sandbox. >> [snip] >> > diff --git a/arch/sandbox/include/asm/u-boot.h >> > b/arch/sandbox/include/asm/u-boot.h >> > index de8120a..7b93acb 100644 >> > --- a/arch/sandbox/include/asm/u-boot.h >> > +++ b/arch/sandbox/include/asm/u-boot.h >> > @@ -36,6 +36,11 @@ >> > #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 >> >> You're converting the whole arch here, so just drop the >> non-CONFIG_SYS_GENERIC_BOARD code? >> >> [snip] >> > diff --git a/arch/sandbox/lib/Makefile b/arch/sandbox/lib/Makefile >> > index fbe579b..b1ae168 100644 >> > --- a/arch/sandbox/lib/Makefile >> > +++ b/arch/sandbox/lib/Makefile >> > @@ -27,7 +27,9 @@ include $(TOPDIR)/config.mk >> > >> > LIB = $(obj)lib$(ARCH).o >> > >> > +ifndef CONFIG_SYS_GENERIC_BOARD >> > COBJS-y += board.o >> > +endif >> >> Then board.c goes away too. > > In short, squash 3/4/5 into one patch.
OK I have done this and resent this one combined patch as v4. Regards, Simon _______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot
