[U-Boot] Please pull u-boot-staging/trini at ti.com

Albert ARIBAUD albert.u.boot at aribaud.net
Thu Aug 30 09:44:54 CEST 2012


Hi Tom,

On Sat, 18 Aug 2012 13:53:16 -0700, Tom Rini <trini at ti.com> wrote:

> On Sat, Aug 18, 2012 at 07:15:56AM -0700, Tom Rini wrote:
> > On Sat, Aug 18, 2012 at 08:28:55AM +0200, Albert ARIBAUD wrote:
> > > Hi Tom,
> > > 
> > > On Fri, 17 Aug 2012 14:52:01 -0700, Tom Rini <trini at ti.com> wrote:
> > > 
> > > > Hello,
> > > > 
> > > > This replaces my previous pull-request and is new warning free
> > > > on MAKEALL -a arm for ELDK4.2/5.1/5.2.1.
> > > > 
> > > > The following changes since commit
> > > > 4d3c95f5ea7c737a21cd6b9c59435ee693b3f127:
> > > > 
> > > >   zfs: Add ZFS filesystem support (2012-08-09 23:42:20 +0200)
> > > > 
> > > > are available in the git repository at:
> > > > 
> > > >   git://git.denx.de/u-boot-staging trini at ti.com
> > > > 
> > > > for you to fetch changes up to
> > > > 5d26e4de33fab7b132e8a8036ac54176f537d79f:
> > > > 
> > > >   ARM: add Raspberry Pi model B board, using BCM2835 SoC
> > > > (2012-08-15 09:43:47 -0700)
> > > > 
> > > > ----------------------------------------------------------------
> > > > John Rigby (1):
> > > >       u8500: Separating mmc config parameters from driver
> > > > 
> > > > Mathieu J. Poirier (10):
> > > >       snowball: Add support for ux500 based snowball board
> > > >       u8500: Moving prcmu to cpu directory
> > > >       snowball: Adding architecture dependent initialisation
> > > >       snowball: Adding CPU clock initialisation
> > > >       snowball: Moving to ux500.v2 addess scheme for PRCMU
> > > > access snowball: applying power to LAN and GBF controllers
> > > >       u8500: Moving processor-specific functions to cpu area.
> > > >       u8500: Enabling power to MMC device on AB8500 V2
> > > >       armv7: Adding cpu specific cache managmenent
> > > >       snowball: Adding board specific cache cleanup routine
> > > > 
> > > > Stephen Warren (4):
> > > >       README: fix references to config_cmd_default.h
> > > >       ARM: arm1176: enable instruction cache in arch_cpu_init()
> > > >       ARM: add basic support for the Broadcom BCM2835 SoC
> > > >       ARM: add Raspberry Pi model B board, using BCM2835 SoC
> > > > 
> > > >  MAINTAINERS                                        |    8 +
> > > >  README                                             |    4 +-
> > > >  arch/arm/cpu/arm1176/bcm2835/Makefile              |   37 +
> > > >  arch/arm/cpu/arm1176/bcm2835/config.mk             |   19 +
> > > >  arch/arm/cpu/arm1176/bcm2835/lowlevel_init.S       |   19 +
> > > >  arch/arm/cpu/arm1176/bcm2835/reset.c               |   35 +
> > > >  arch/arm/cpu/arm1176/bcm2835/timer.c               |   55 ++
> > > >  arch/arm/cpu/arm1176/cpu.c                         |    7 +
> > > >  arch/arm/cpu/armv7/cpu.c                           |    8 +
> > > >  arch/arm/cpu/armv7/u8500/Makefile                  |    2 +-
> > > >  arch/arm/cpu/armv7/u8500/clock.c                   |   34 +
> > > >  arch/arm/cpu/armv7/u8500/cpu.c                     |  192 +++++
> > > >  .../arm/cpu/armv7}/u8500/prcmu.c                   |  128 +++-
> > > >  arch/arm/include/asm/arch-bcm2835/gpio.h           |   66 ++
> > > >  arch/arm/include/asm/arch-bcm2835/timer.h          |   37 +
> > > >  arch/arm/include/asm/arch-bcm2835/wdog.h           |   36 +
> > > >  arch/arm/include/asm/arch-u8500/clock.h            |    5 +-
> > > >  arch/arm/include/asm/arch-u8500/db8500_gpio.h      |   42 ++
> > > >  arch/arm/include/asm/arch-u8500/db8500_pincfg.h    |  170 +++++
> > > >  arch/arm/include/asm/arch-u8500/hardware.h         |   33 +-
> > > >  .../arm/include/asm/arch-u8500/prcmu.h             |   35 +-
> > > >  arch/arm/include/asm/arch-u8500/sys_proto.h        |    1 +
> > > >  board/armltd/vexpress/ca9x4_ct_vxp.c               |   21 +-
> > > >  board/raspberrypi/rpi_b/Makefile                   |   34 +
> > > >  board/raspberrypi/rpi_b/rpi_b.c                    |   34 +
> > > >  board/st-ericsson/snowball/Makefile                |   49 ++
> > > >  board/st-ericsson/snowball/db8500_pins.h           |  745
> > > > ++++++++++++++++++++
> > > > board/st-ericsson/snowball/snowball.c              |  348
> > > > +++++++++ board/st-ericsson/u8500/Makefile
> > > > |    2 +- board/st-ericsson/u8500/u8500_href.c               |
> > > > 100 +-- boards.cfg                                         |
> > > > 2 + drivers/gpio/Makefile                              |    2 +
> > > > drivers/gpio/bcm2835_gpio.c                        |   89 +++
> > > > drivers/gpio/db8500_gpio.c                         |  221 ++++++
> > > > drivers/mmc/arm_pl180_mmci.c                       |  131 ++--
> > > > drivers/mmc/arm_pl180_mmci.h                       |   27 +-
> > > > drivers/serial/serial_pl01x.c                      |    2 +
> > > > include/configs/rpi_b.h                            |  104 +++
> > > > include/configs/snowball.h                         |  266
> > > > +++++++ 39 files changed, 2937 insertions(+), 213 deletions(-)
> > > > create mode 100644 arch/arm/cpu/arm1176/bcm2835/Makefile create
> > > > mode 100644 arch/arm/cpu/arm1176/bcm2835/config.mk create mode
> > > > 100644 arch/arm/cpu/arm1176/bcm2835/lowlevel_init.S create mode
> > > > 100644 arch/arm/cpu/arm1176/bcm2835/reset.c create mode 100644
> > > > arch/arm/cpu/arm1176/bcm2835/timer.c create mode 100644
> > > > arch/arm/cpu/armv7/u8500/cpu.c rename {board/st-ericsson =>
> > > > arch/arm/cpu/armv7}/u8500/prcmu.c (58%) create mode 100644
> > > > arch/arm/include/asm/arch-bcm2835/gpio.h create mode 100644
> > > > arch/arm/include/asm/arch-bcm2835/timer.h create mode 100644
> > > > arch/arm/include/asm/arch-bcm2835/wdog.h create mode 100644
> > > > arch/arm/include/asm/arch-u8500/db8500_gpio.h create mode 100644
> > > > arch/arm/include/asm/arch-u8500/db8500_pincfg.h rename
> > > > board/st-ericsson/u8500/prcmu-fw.h =>
> > > > arch/arm/include/asm/arch-u8500/prcmu.h (55%) create mode 100644
> > > > board/raspberrypi/rpi_b/Makefile create mode 100644
> > > > board/raspberrypi/rpi_b/rpi_b.c create mode 100644
> > > > board/st-ericsson/snowball/Makefile create mode 100644
> > > > board/st-ericsson/snowball/db8500_pins.h create mode 100644
> > > > board/st-ericsson/snowball/snowball.c create mode 100644
> > > > drivers/gpio/bcm2835_gpio.c create mode 100644
> > > > drivers/gpio/db8500_gpio.c create mode 100644
> > > > include/configs/rpi_b.h create mode 100644
> > > > include/configs/snowball.h
> > > 
> > > Are you sure you want me to only pull the top 15 patches of
> > > u-boot-staging/trini at ti.com, but not the tens of ones that that
> > > are below it in u-boot-staging/master? These are nowhere else,
> > > especially not in u-boot/master, so I am wondering why your your
> > > request takes staging/master as its base.
> > 
> > I don't see any patches like that.  And I did a quick re-confirm of
> > what is in trini at ti.com and that's what I want to replace the
> > commits in u-boot-arm/master from before.
> 
> To be clear, u-boot-staging/trini at ti.com is based on a somewhat older,
> but not top of tree u-boot/master than what u-boot-arm is based on
> today.  I think your local u-boot/master is out of date.
> http://git.denx.de/?p=u-boot.git;a=commit;h=4d3c95f5ea7c737a21cd6b9c59435ee693b3f127
> is what my branch is on top of.

Top 15 patches ("snowball: Add support for ux500 based snowball
board" to "ARM: add Raspberry Pi model B board, using BCM2835 SoC")
applied to u-boot-arm/master, resulting in the total number of boards
built rising up from 314 to 315.

Please make sure this is what you wanted.

Thanks and apologies for the time it took!

Amicalement,
-- 
Albert.


More information about the U-Boot mailing list