diff mbox

[U-Boot,v8,13/31] arm: Enable generic board support

Message ID 1362786351-4249-14-git-send-email-sjg@chromium.org
State Superseded, archived
Headers show

Commit Message

Simon Glass March 8, 2013, 11:45 p.m. UTC 
This enables generic board support so that ARM boards can define
CONFIG_SYS_GENERIC_BOARD.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
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(+)

Comments

Otavio Salvador March 9, 2013, 12:31 p.m. UTC | #1 
On Fri, Mar 8, 2013 at 8:45 PM, Simon Glass <sjg@chromium.org> wrote:
> This enables generic board support so that ARM boards can define
> CONFIG_SYS_GENERIC_BOARD.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
> 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
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
Simon Glass March 9, 2013, 6:30 p.m. UTC | #2 
Hi Otavio,

On Sat, Mar 9, 2013 at 4:31 AM, Otavio Salvador <otavio@ossystems.com.br>wrote:

> On Fri, Mar 8, 2013 at 8:45 PM, Simon Glass <sjg@chromium.org> wrote:
> > This enables generic board support so that ARM boards can define
> > CONFIG_SYS_GENERIC_BOARD.
> >
> > Signed-off-by: Simon Glass <sjg@chromium.org>
> > ---
> > 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?
>

The 'n' is intended to mean 'not'. Perhaps I should use ! instead?

Regards,
Simon
Otavio Salvador March 9, 2013, 7:06 p.m. UTC | #3 
On Sat, Mar 9, 2013 at 3:30 PM, Simon Glass <sjg@chromium.org> wrote:
> Hi Otavio,
>
> On Sat, Mar 9, 2013 at 4:31 AM, Otavio Salvador <otavio@ossystems.com.br>
> wrote:
>>
>> On Fri, Mar 8, 2013 at 8:45 PM, Simon Glass <sjg@chromium.org> wrote:
>> > This enables generic board support so that ARM boards can define
>> > CONFIG_SYS_GENERIC_BOARD.
>> >
>> > Signed-off-by: Simon Glass <sjg@chromium.org>
>> > ---
>> > 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?
>
>
> The 'n' is intended to mean 'not'. Perhaps I should use ! instead?

I didn't see this use in rest of code; for me it is fine but something
to think about.
Tom Rini March 10, 2013, 1:27 p.m. UTC | #4 
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 03/09/2013 01:30 PM, Simon Glass wrote:
> Hi Otavio,
> 
> On Sat, Mar 9, 2013 at 4:31 AM, Otavio Salvador
> <otavio@ossystems.com.br <mailto:otavio@ossystems.com.br>> wrote:
> 
> On Fri, Mar 8, 2013 at 8:45 PM, Simon Glass <sjg@chromium.org 
> <mailto:sjg@chromium.org>> wrote:
>> This enables generic board support so that ARM boards can define 
>> CONFIG_SYS_GENERIC_BOARD.
>> 
>> Signed-off-by: Simon Glass <sjg@chromium.org
> <mailto:sjg@chromium.org>>
>> --- Changes in v8: - Define __HAVE_ARCH_GENERIC_BOARD in ARM's
>> config.mk
> <http://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 <http://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 <http://config.mk>
> b/arch/arm/config.mk <http://config.mk>
>> index 24b9d7c..a0c89b7 100644 --- a/arch/arm/config.mk
>> <http://config.mk> +++ b/arch/arm/config.mk <http://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?
> 
> 
> The 'n' is intended to mean 'not'. Perhaps I should use ! instead?

!CONFIG is the style of the rest of the codebase.  Thanks.

- -- 
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJRPIpAAAoJENk4IS6UOR1WvHsP/RxMk8w1XFl6lMmsJysrdwRd
4pGVk1x1LjRpnleo3nJgQIX5e458g6oM7tra0JQ1RvbxNEZhWiJon/P0kun4gTAt
CPzCNZt0JyAXTu/+MyNTALuLMwY30JSzBR6Tg1uTgrfBDcQVOlRkwCwU91oDBeQH
Dbf8KYfBmOoHy3/uLu/JwEAbAOQFxb4VdTaXnwM9Vp4sDX2TiP1gyJVDT668/i07
SSwYiIE022zJKe/MSmiWzXwClUDKoKwFOsv15y+O2Wv5Dr+uSSd6uCj+tUlEBFmP
uhOZPveAbhL2Myhti1j0GkZD/VSeUhHbAXH5OATQRCJHXZGLSsynxgl4fTFK1Mnn
QLcYGyTWGOzba/ytlvSpCfHrQL+dh48bV8Cz3Mvj1iQyZyMRbfC6JMaZu2AFsqvE
vQni+ZhuE4FIBLt7mD3e5aqDM2Z6kijpDk95sU0G6LwcUJW1KeFTnqKxTE8BjNu4
dmFsqpNXSDCkgCGdnOasEfXzGmUMy/DlwWtPxXxa/CnFcxDkrh7to9kWW5xYYrL8
zItHpvLeuZAbzHCtjJsewjCx9QXcZ+jvpSbpjUrCEAM29ifxbKukRBb6chU3XDaN
KJwRIWlhtkTGXEoUmSsurQGPDD2SvDq10wgml1cQoCB9n756IQBVKruFV+dHjdgw
0TybImGlHorgFeZJh8pX
=zX5G
-----END PGP SIGNATURE-----
Simon Glass March 11, 2013, 4:17 p.m. UTC | #5 
Hi Tom,


On Sun, Mar 10, 2013 at 6:27 AM, Tom Rini <trini@ti.com> wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 03/09/2013 01:30 PM, Simon Glass wrote:
> > Hi Otavio,
> >
> > On Sat, Mar 9, 2013 at 4:31 AM, Otavio Salvador
> > <otavio@ossystems.com.br <mailto:otavio@ossystems.com.br>> wrote:
> >
> > On Fri, Mar 8, 2013 at 8:45 PM, Simon Glass <sjg@chromium.org
> > <mailto:sjg@chromium.org>> wrote:
> >> This enables generic board support so that ARM boards can define
> >> CONFIG_SYS_GENERIC_BOARD.
> >>
> >> Signed-off-by: Simon Glass <sjg@chromium.org
> > <mailto:sjg@chromium.org>>
> >> --- Changes in v8: - Define __HAVE_ARCH_GENERIC_BOARD in ARM's
> >> config.mk
> > <http://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 <http://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 <http://config.mk>
> > b/arch/arm/config.mk <http://config.mk>
> >> index 24b9d7c..a0c89b7 100644 --- a/arch/arm/config.mk
> >> <http://config.mk> +++ b/arch/arm/config.mk <http://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?
> >
> >
> > The 'n' is intended to mean 'not'. Perhaps I should use ! instead?
>
> !CONFIG is the style of the rest of the codebase.  Thanks.
>

OK, I will resend the affected patch(es).

Regards,
Simon
diff mbox

Patch

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 */
 
 /* 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