From: Tom Rix <tom@bumblecow.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] arm/master merged
Date: Sun, 11 Oct 2009 14:00:15 -0500 [thread overview]
Message-ID: <4AD22B3F.40608@bumblecow.com> (raw)
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
next reply other threads:[~2009-10-11 19:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-11 19:00 Tom Rix [this message]
2009-10-12 7:31 ` [U-Boot] arm/master merged 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4AD22B3F.40608@bumblecow.com \
--to=tom@bumblecow.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.