* [U-Boot] arm/master merged
@ 2009-10-11 19:00 Tom Rix
2009-10-12 7:31 ` Simon Kagstrom
2009-10-12 8:15 ` [U-Boot] [PATCH] fix cpuat91 compile warning Eric Benard
0 siblings, 2 replies; 9+ messages in thread
From: Tom Rix @ 2009-10-11 19:00 UTC (permalink / raw)
To: u-boot
I have merged arm/next into arm/master.
There are new warnings in
CPU9260 , CONFIG_SYS_64BIT_VSPRINTF
CPU9G20 , CONFIG_SYS_64BIT_VSPRINTF
GPUAT91 , CONFIG_NET_MULTI,
davinci_dm355evm , CONFIG_SYS_64BIT_VSPRINTF, generic_set_bit
I have ack-ed patches for these..
openrd_base , kwgbe_init breaking strict aliasing rules
Fixes for these
devkit8000
omap3_beagle
omap3_evm
omap3_overo
omap3_pandora
omap3_zoom1
omap3_zoom2
Thanks for all the good submissions
Tom
For the curious, here is the output from the merge
git merge t-next
Updating 1d96cfe..617da90
Fast forward
MAINTAINERS | 10 +
MAKEALL | 6 +-
Makefile | 17 +
board/Marvell/mv88f6281gtw_ge/config.mk | 3 +
board/Marvell/mv88f6281gtw_ge/kwbimage.cfg | 165 +++++++
board/Marvell/openrd_base/Makefile | 56 +++
board/Marvell/openrd_base/config.mk | 33 ++
board/Marvell/openrd_base/kwbimage.cfg | 168 +++++++
board/Marvell/openrd_base/openrd_base.c | 160 +++++++
board/Marvell/openrd_base/openrd_base.h | 46 ++
board/Marvell/rd6281a/config.mk | 3 +
board/Marvell/rd6281a/kwbimage.cfg | 167 +++++++
board/davinci/dm365evm/dm365evm.c | 44 ++-
board/esd/meesc/meesc.c | 65 +++-
board/eukrea/cpu9260/Makefile | 59 +++
board/eukrea/cpu9260/config.mk | 1 +
board/eukrea/cpu9260/cpu9260.c | 220 +++++++++
board/eukrea/cpu9260/led.c | 153 +++++++
board/eukrea/cpuat91/Makefile | 50 +++
board/eukrea/cpuat91/config.mk | 1 +
board/eukrea/cpuat91/cpuat91.c | 81 ++++
board/logicpd/zoom1/zoom1.h | 164 ++++----
board/logicpd/zoom2/zoom2.h | 188 ++++----
board/overo/overo.c | 59 +++
board/overo/overo.h | 645
++++++++++++++--------------
board/pandora/pandora.h | 662
++++++++++++++--------------
board/ti/beagle/beagle.h | 640
++++++++++++++--------------
board/ti/evm/evm.h | 662
++++++++++++++--------------
board/timll/devkit8000/devkit8000.h | 628
+++++++++++++-------------
cpu/arm920t/at91rm9200/Makefile | 5 +-
cpu/arm920t/at91rm9200/ks8721.c | 249 +++++++++++
cpu/arm926ejs/at91/lowlevel_init.S | 3 +-
cpu/arm926ejs/davinci/Makefile | 1 +
cpu/arm926ejs/davinci/dm646x.c | 41 ++
cpu/arm926ejs/kirkwood/cpu.c | 1 +
cpu/arm_cortexa8/cpu.c | 2 +-
cpu/arm_cortexa8/omap3/Makefile | 2 +-
cpu/arm_cortexa8/omap3/board.c | 2 +-
cpu/arm_cortexa8/omap3/cache.S | 191 ++++++++
cpu/arm_cortexa8/omap3/cache.c | 95 ----
cpu/arm_cortexa8/start.S | 85 ----
drivers/mmc/omap3_mmc.c | 48 +--
drivers/net/smc911x.c | 14 +-
drivers/net/smc911x.h | 7 +-
include/asm-arm/arch-davinci/emac_defs.h | 4 +-
include/asm-arm/arch-davinci/gpio_defs.h | 53 +++
include/asm-arm/arch-davinci/hardware.h | 11 +
include/asm-arm/arch-davinci/nand_defs.h | 2 +-
include/asm-arm/arch-omap3/mmc.h | 7 +
include/asm-arm/arch-omap3/omap3.h | 2 +
include/asm-arm/arch-omap3/sys_proto.h | 2 +-
include/configs/cpu9260.h | 453 +++++++++++++++++++
include/configs/cpuat91.h | 228 ++++++++++
include/configs/davinci_dm355evm.h | 26 +-
include/configs/davinci_dm365evm.h | 11 +-
include/configs/davinci_dvevm.h | 6 +-
include/configs/davinci_schmoogie.h | 3 +-
include/configs/davinci_sffsdr.h | 3 +-
include/configs/davinci_sonata.h | 3 +-
include/configs/devkit8000.h | 1 +
include/configs/meesc.h | 25 +-
include/configs/omap3_beagle.h | 1 +
include/configs/omap3_evm.h | 1 +
include/configs/omap3_overo.h | 18 +-
include/configs/omap3_pandora.h | 1 +
include/configs/omap3_zoom1.h | 1 +
include/configs/omap3_zoom2.h | 1 +
include/configs/openrd_base.h | 220 +++++++++
include/ks8721.h | 78 ++++
69 files changed, 4988 insertions(+), 2075 deletions(-)
create mode 100644 board/Marvell/mv88f6281gtw_ge/kwbimage.cfg
create mode 100644 board/Marvell/openrd_base/Makefile
create mode 100644 board/Marvell/openrd_base/config.mk
create mode 100644 board/Marvell/openrd_base/kwbimage.cfg
create mode 100644 board/Marvell/openrd_base/openrd_base.c
create mode 100644 board/Marvell/openrd_base/openrd_base.h
create mode 100644 board/Marvell/rd6281a/kwbimage.cfg
create mode 100644 board/eukrea/cpu9260/Makefile
create mode 100644 board/eukrea/cpu9260/config.mk
create mode 100644 board/eukrea/cpu9260/cpu9260.c
create mode 100644 board/eukrea/cpu9260/led.c
create mode 100644 board/eukrea/cpuat91/Makefile
create mode 100644 board/eukrea/cpuat91/config.mk
create mode 100644 board/eukrea/cpuat91/cpuat91.c
create mode 100644 cpu/arm920t/at91rm9200/ks8721.c
create mode 100644 cpu/arm926ejs/davinci/dm646x.c
create mode 100644 cpu/arm_cortexa8/omap3/cache.S
delete mode 100644 cpu/arm_cortexa8/omap3/cache.c
create mode 100644 include/asm-arm/arch-davinci/gpio_defs.h
create mode 100644 include/configs/cpu9260.h
create mode 100644 include/configs/cpuat91.h
create mode 100644 include/configs/openrd_base.h
create mode 100644 include/ks8721.h
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] arm/master merged
2009-10-11 19:00 [U-Boot] arm/master merged Tom Rix
@ 2009-10-12 7:31 ` Simon Kagstrom
2009-10-12 8:15 ` [U-Boot] [PATCH] fix cpuat91 compile warning Eric Benard
1 sibling, 0 replies; 9+ messages in thread
From: Simon Kagstrom @ 2009-10-12 7:31 UTC (permalink / raw)
To: u-boot
On Sun, 11 Oct 2009 14:00:15 -0500
Tom Rix <tom@bumblecow.com> wrote:
> I have merged arm/next into arm/master.
>
> There are new warnings in
> CPU9260 , CONFIG_SYS_64BIT_VSPRINTF
> CPU9G20 , CONFIG_SYS_64BIT_VSPRINTF
> GPUAT91 , CONFIG_NET_MULTI,
> davinci_dm355evm , CONFIG_SYS_64BIT_VSPRINTF, generic_set_bit
> I have ack-ed patches for these..
> openrd_base , kwgbe_init breaking strict aliasing rules
But not "[PATCH v3] arm926ejs: 8-byte align stack to avoid LDRD/STRD
problems"? It would be very nice to have since both sheevaplug and
openrd_base are broken without it.
// Simon
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH] fix cpuat91 compile warning
2009-10-11 19:00 [U-Boot] arm/master merged Tom Rix
2009-10-12 7:31 ` Simon Kagstrom
@ 2009-10-12 8:15 ` Eric Benard
2009-10-12 8:15 ` [U-Boot] [PATCH] fix CPU9260/CPU9G20 compile warnings Eric Benard
` (2 more replies)
1 sibling, 3 replies; 9+ messages in thread
From: Eric Benard @ 2009-10-12 8:15 UTC (permalink / raw)
To: u-boot
main.c: In function 'abortboot':
main.c:122: warning: too few arguments for format
Signed-off-by: Eric Benard <eric@eukrea.com>
---
include/configs/cpuat91.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/configs/cpuat91.h b/include/configs/cpuat91.h
index 0d3acf6..8746f70 100644
--- a/include/configs/cpuat91.h
+++ b/include/configs/cpuat91.h
@@ -189,8 +189,8 @@
#define CONFIG_SILENT_CONSOLE 1
#define CONFIG_AUTOBOOT_KEYED 1
-#define CONFIG_AUTOBOOT_PROMPT \
- "Press SPACE to abort autoboot in %d seconds\n"
+#define CONFIG_AUTOBOOT_PROMPT \
+ "Press SPACE to abort autoboot\n"
#define CONFIG_AUTOBOOT_STOP_STR " "
#define CONFIG_AUTOBOOT_DELAY_STR "d"
--
1.6.0.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH] fix CPU9260/CPU9G20 compile warnings
2009-10-12 8:15 ` [U-Boot] [PATCH] fix cpuat91 compile warning Eric Benard
@ 2009-10-12 8:15 ` Eric Benard
2009-10-12 11:34 ` Tom Rix
2009-10-17 16:00 ` Tom Rix
2009-10-12 11:33 ` [U-Boot] [PATCH] fix cpuat91 compile warning Tom Rix
2009-10-17 15:59 ` Tom Rix
2 siblings, 2 replies; 9+ messages in thread
From: Eric Benard @ 2009-10-12 8:15 UTC (permalink / raw)
To: u-boot
nand_util.c:45:2: warning: #warning Please define CONFIG_SYS_64BIT_VSPRINTF for correct output!
Signed-off-by: Eric Benard <eric@eukrea.com>
---
include/configs/cpu9260.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/include/configs/cpu9260.h b/include/configs/cpu9260.h
index 4ef8566..de8cfb7 100644
--- a/include/configs/cpu9260.h
+++ b/include/configs/cpu9260.h
@@ -295,6 +295,7 @@
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14
#define CONFIG_SYS_NAND_MASK_ALE (1 << 21)
#define CONFIG_SYS_NAND_MASK_CLE (1 << 22)
+#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
/* NOR flash */
#define CONFIG_SYS_FLASH_CFI 1
--
1.6.0.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH] fix cpuat91 compile warning
2009-10-12 8:15 ` [U-Boot] [PATCH] fix cpuat91 compile warning Eric Benard
2009-10-12 8:15 ` [U-Boot] [PATCH] fix CPU9260/CPU9G20 compile warnings Eric Benard
@ 2009-10-12 11:33 ` Tom Rix
2009-10-17 15:59 ` Tom Rix
2 siblings, 0 replies; 9+ messages in thread
From: Tom Rix @ 2009-10-12 11:33 UTC (permalink / raw)
To: u-boot
Eric Benard wrote:
> main.c: In function 'abortboot':
> main.c:122: warning: too few arguments for format
>
> Signed-off-by: Eric Benard <eric@eukrea.com>
> ---
> include/configs/cpuat91.h | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/configs/cpuat91.h b/include/configs/cpuat91.h
> index 0d3acf6..8746f70 100644
> --- a/include/configs/cpuat91.h
> +++ b/include/configs/cpuat91.h
> @@ -189,8 +189,8 @@
> #define CONFIG_SILENT_CONSOLE 1
>
> #define CONFIG_AUTOBOOT_KEYED 1
> -#define CONFIG_AUTOBOOT_PROMPT \
> - "Press SPACE to abort autoboot in %d seconds\n"
> +#define CONFIG_AUTOBOOT_PROMPT \
> + "Press SPACE to abort autoboot\n"
> #define CONFIG_AUTOBOOT_STOP_STR " "
> #define CONFIG_AUTOBOOT_DELAY_STR "d"
>
Thanks for the fix.
Ack
Tom
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH] fix CPU9260/CPU9G20 compile warnings
2009-10-12 8:15 ` [U-Boot] [PATCH] fix CPU9260/CPU9G20 compile warnings Eric Benard
@ 2009-10-12 11:34 ` Tom Rix
2009-10-17 16:00 ` Tom Rix
1 sibling, 0 replies; 9+ messages in thread
From: Tom Rix @ 2009-10-12 11:34 UTC (permalink / raw)
To: u-boot
Eric Benard wrote:
> nand_util.c:45:2: warning: #warning Please define CONFIG_SYS_64BIT_VSPRINTF for correct output!
>
> Signed-off-by: Eric Benard <eric@eukrea.com>
> ---
> include/configs/cpu9260.h | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/include/configs/cpu9260.h b/include/configs/cpu9260.h
> index 4ef8566..de8cfb7 100644
> --- a/include/configs/cpu9260.h
> +++ b/include/configs/cpu9260.h
> @@ -295,6 +295,7 @@
> #define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14
> #define CONFIG_SYS_NAND_MASK_ALE (1 << 21)
> #define CONFIG_SYS_NAND_MASK_CLE (1 << 22)
> +#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
>
> /* NOR flash */
> #define CONFIG_SYS_FLASH_CFI 1
Thanks for the fix.
Ack
Tom
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH] fix cpuat91 compile warning
2009-10-12 8:15 ` [U-Boot] [PATCH] fix cpuat91 compile warning Eric Benard
2009-10-12 8:15 ` [U-Boot] [PATCH] fix CPU9260/CPU9G20 compile warnings Eric Benard
2009-10-12 11:33 ` [U-Boot] [PATCH] fix cpuat91 compile warning Tom Rix
@ 2009-10-17 15:59 ` Tom Rix
2009-10-18 19:58 ` Wolfgang Denk
2 siblings, 1 reply; 9+ messages in thread
From: Tom Rix @ 2009-10-17 15:59 UTC (permalink / raw)
To: u-boot
Eric Benard wrote:
> main.c: In function 'abortboot':
> main.c:122: warning: too few arguments for format
>
> Signed-off-by: Eric Benard <eric@eukrea.com>
> ---
> include/configs/cpuat91.h | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/configs/cpuat91.h b/include/configs/cpuat91.h
> index 0d3acf6..8746f70 100644
> --- a/include/configs/cpuat91.h
> +++ b/include/configs/cpuat91.h
> @@ -189,8 +189,8 @@
> #define CONFIG_SILENT_CONSOLE 1
>
> #define CONFIG_AUTOBOOT_KEYED 1
> -#define CONFIG_AUTOBOOT_PROMPT \
> - "Press SPACE to abort autoboot in %d seconds\n"
> +#define CONFIG_AUTOBOOT_PROMPT \
> + "Press SPACE to abort autoboot\n"
> #define CONFIG_AUTOBOOT_STOP_STR " "
> #define CONFIG_AUTOBOOT_DELAY_STR "d"
>
Eric,
This has been pushed to arm/master-sync
Tom
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH] fix CPU9260/CPU9G20 compile warnings
2009-10-12 8:15 ` [U-Boot] [PATCH] fix CPU9260/CPU9G20 compile warnings Eric Benard
2009-10-12 11:34 ` Tom Rix
@ 2009-10-17 16:00 ` Tom Rix
1 sibling, 0 replies; 9+ messages in thread
From: Tom Rix @ 2009-10-17 16:00 UTC (permalink / raw)
To: u-boot
Eric Benard wrote:
> nand_util.c:45:2: warning: #warning Please define CONFIG_SYS_64BIT_VSPRINTF for correct output!
>
> Signed-off-by: Eric Benard <eric@eukrea.com>
> ---
> include/configs/cpu9260.h | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/include/configs/cpu9260.h b/include/configs/cpu9260.h
> index 4ef8566..de8cfb7 100644
> --- a/include/configs/cpu9260.h
> +++ b/include/configs/cpu9260.h
> @@ -295,6 +295,7 @@
> #define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14
> #define CONFIG_SYS_NAND_MASK_ALE (1 << 21)
> #define CONFIG_SYS_NAND_MASK_CLE (1 << 22)
> +#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
>
> /* NOR flash */
> #define CONFIG_SYS_FLASH_CFI 1
Eric,
This one has also been pushed to arm/master-sync
These patches did kill the compiler warnings
Thanks!
Tom
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH] fix cpuat91 compile warning
2009-10-17 15:59 ` Tom Rix
@ 2009-10-18 19:58 ` Wolfgang Denk
0 siblings, 0 replies; 9+ messages in thread
From: Wolfgang Denk @ 2009-10-18 19:58 UTC (permalink / raw)
To: u-boot
Dear Tom Rix,
In message <4AD9E9E2.801@bumblecow.com> you wrote:
> Eric Benard wrote:
> > main.c: In function 'abortboot':
> > main.c:122: warning: too few arguments for format
> >
> > Signed-off-by: Eric Benard <eric@eukrea.com>
> > ---
> > include/configs/cpuat91.h | 4 ++--
> > 1 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/include/configs/cpuat91.h b/include/configs/cpuat91.h
> > index 0d3acf6..8746f70 100644
> > --- a/include/configs/cpuat91.h
> > +++ b/include/configs/cpuat91.h
> > @@ -189,8 +189,8 @@
> > #define CONFIG_SILENT_CONSOLE 1
> >
> > #define CONFIG_AUTOBOOT_KEYED 1
> > -#define CONFIG_AUTOBOOT_PROMPT \
> > - "Press SPACE to abort autoboot in %d seconds\n"
> > +#define CONFIG_AUTOBOOT_PROMPT \
> > + "Press SPACE to abort autoboot\n"
> > #define CONFIG_AUTOBOOT_STOP_STR " "
> > #define CONFIG_AUTOBOOT_DELAY_STR "d"
> >
> Eric,
> This has been pushed to arm/master-sync
Ah... now I see this patch - but how comes your repository has the
commit message (Subjject line) garbled?
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Far back in the mists of ancient time, in the great and glorious days
of the former Galactic Empire, life was wild, rich and largely tax
free. - Douglas Adams, _The Hitchhiker's Guide to the Galaxy_
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2009-10-18 19:58 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-11 19:00 [U-Boot] arm/master merged Tom Rix
2009-10-12 7:31 ` Simon Kagstrom
2009-10-12 8:15 ` [U-Boot] [PATCH] fix cpuat91 compile warning Eric Benard
2009-10-12 8:15 ` [U-Boot] [PATCH] fix CPU9260/CPU9G20 compile warnings Eric Benard
2009-10-12 11:34 ` Tom Rix
2009-10-17 16:00 ` Tom Rix
2009-10-12 11:33 ` [U-Boot] [PATCH] fix cpuat91 compile warning Tom Rix
2009-10-17 15:59 ` Tom Rix
2009-10-18 19:58 ` Wolfgang Denk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox