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

login
register
mail settings
Submitter Tom Rini
Date Aug. 10, 2012, 4:10 p.m.
Message ID <20120810161021.GG3306@bill-the-cat>
Download mbox
Permalink /patch/176520/
State Changes Requested
Delegated to: Albert ARIBAUD
Headers show

Pull-request

git://git.denx.de/u-boot-staging trini@ti.com

Comments

Tom Rini - Aug. 10, 2012, 4:10 p.m.
Hello Albert and Wolfgang,

To try and ease the backlog of ARM changes, I've taken the liberty of
grabbing the Snowball and Raspberry Pi model B board support patches and
putting them into the staging tree.  Both of these series have been
posted for some time and been reviewed.  Wolfgang, if you would like to
wait for Albert to pick up this request, that's fine.  I just wanted to
make sure the submitters weren't left waiting.  Thanks!

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@ti.com

for you to fetch changes up to bcf2c9ef2877440033e3032fbd597be32728020c:

  ARM: add Raspberry Pi model B board, using BCM2835 SoC (2012-08-10 08:57:29 -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               |   99 +--
 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(+), 212 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
Wolfgang Denk - Aug. 10, 2012, 8:06 p.m.
Dear Tom,

In message <20120810161021.GG3306@bill-the-cat> you wrote:
> 
> To try and ease the backlog of ARM changes, I've taken the liberty of
> grabbing the Snowball and Raspberry Pi model B board support patches and
> putting them into the staging tree.  Both of these series have been
> posted for some time and been reviewed.  Wolfgang, if you would like to
> wait for Albert to pick up this request, that's fine.  I just wanted to
> make sure the submitters weren't left waiting.  Thanks!

Thanks, highly appreciated.

As this contains a lot of ARM, indeed I would like to wait for
Albert's ACK or pulling (whichever he prefers).

Best regards,

Wolfgang Denk
Albert ARIBAUD - Aug. 14, 2012, 12:04 a.m.
Hi Tom,

On Fri, 10 Aug 2012 22:06:59 +0200, Wolfgang Denk <wd@denx.de> wrote:

> Dear Tom,
> 
> In message <20120810161021.GG3306@bill-the-cat> you wrote:
> > 
> > To try and ease the backlog of ARM changes, I've taken the liberty
> > of grabbing the Snowball and Raspberry Pi model B board support
> > patches and putting them into the staging tree.  Both of these
> > series have been posted for some time and been reviewed.  Wolfgang,
> > if you would like to wait for Albert to pick up this request,
> > that's fine.  I just wanted to make sure the submitters weren't
> > left waiting.  Thanks!
> 
> Thanks, highly appreciated.
> 
> As this contains a lot of ARM, indeed I would like to wait for
> Albert's ACK or pulling (whichever he prefers).
> 
> Best regards,
> 
> Wolfgang Denk
> 

Applied to u-boot-arm/master, thanks!

Amicalement,
Albert ARIBAUD - Aug. 14, 2012, 1:06 a.m.
Hi Albert,

On Tue, 14 Aug 2012 02:04:15 +0200, Albert ARIBAUD (U-Boot)
<albert.u.boot@aribaud.net> wrote:

> Hi Tom,
> 
> On Fri, 10 Aug 2012 22:06:59 +0200, Wolfgang Denk <wd@denx.de> wrote:
> 
> > Dear Tom,
> > 
> > In message <20120810161021.GG3306@bill-the-cat> you wrote:
> > > 
> > > To try and ease the backlog of ARM changes, I've taken the liberty
> > > of grabbing the Snowball and Raspberry Pi model B board support
> > > patches and putting them into the staging tree.  Both of these
> > > series have been posted for some time and been reviewed.
> > > Wolfgang, if you would like to wait for Albert to pick up this
> > > request, that's fine.  I just wanted to make sure the submitters
> > > weren't left waiting.  Thanks!
> > 
> > Thanks, highly appreciated.
> > 
> > As this contains a lot of ARM, indeed I would like to wait for
> > Albert's ACK or pulling (whichever he prefers).
> > 
> > Best regards,
> > 
> > Wolfgang Denk
> > 
> 
> Applied to u-boot-arm/master, thanks!

But I might hold this a little, as commit "snowball: Adding
architecture dependent initialisation"
7e2b895eb5aa10890910eed8921d042d13b828c0 seems to play bad with my
stock Ubuntu 12.04 GCC on u8500_href:

uboot@lilith:~/src/u-boot-arm$ git checkout
f917361b988f69ddc0dbe2bd2beb93b296065b70^ HEAD is now at 1b5d8d5...
u8500: Moving prcmu to cpu directory uboot@lilith:~/src/u-boot-arm$
LANG=C ./MAKEALL u8500_href Configuring for u8500_href board...
   text	   data	    bss	    dec
hex	filename 139584	   4408	 221728
365720	  59498	./u-boot

--------------------- SUMMARY ----------------------------
Boards compiled: 1
----------------------------------------------------------
uboot@lilith:~/src/u-boot-arm$ git checkout
f917361b988f69ddc0dbe2bd2beb93b296065b70 Previous HEAD position was
1b5d8d5... u8500: Moving prcmu to cpu directory HEAD is now at
f917361... snowball: Adding architecture dependent initialisation
uboot@lilith:~/src/u-boot-arm$ LANG=C ./MAKEALL u8500_href Configuring
for u8500_href board... text	   data	    bss
dec	    hex	filename 139744	   4408
221696	 365848	  59518	./u-boot u8500_href.c:45:0:
warning: "PRCMU_BASE" redefined [enabled by
default] /home/uboot/src/u-boot-arm/include/asm/arch/prcmu.h:30:0:
note: this is the location of the previous definition

--------------------- SUMMARY ----------------------------
Boards compiled: 1
Boards with warnings but no errors: 1 ( u8500_href )
----------------------------------------------------------

Granted, this is only a warning, but I'd like to see it fixed.

Amicalement,
mathieu.poirier@linaro.org - Aug. 14, 2012, 12:58 p.m.
I will fix this right away.

Mathieu.

On 12-08-13 07:06 PM, Albert ARIBAUD (U-Boot) wrote:
> Hi Albert,
> 
> On Tue, 14 Aug 2012 02:04:15 +0200, Albert ARIBAUD (U-Boot)
> <albert.u.boot@aribaud.net> wrote:
> 
>> Hi Tom,
>>
>> On Fri, 10 Aug 2012 22:06:59 +0200, Wolfgang Denk <wd@denx.de> wrote:
>>
>>> Dear Tom,
>>>
>>> In message <20120810161021.GG3306@bill-the-cat> you wrote:
>>>>
>>>> To try and ease the backlog of ARM changes, I've taken the liberty
>>>> of grabbing the Snowball and Raspberry Pi model B board support
>>>> patches and putting them into the staging tree.  Both of these
>>>> series have been posted for some time and been reviewed.
>>>> Wolfgang, if you would like to wait for Albert to pick up this
>>>> request, that's fine.  I just wanted to make sure the submitters
>>>> weren't left waiting.  Thanks!
>>>
>>> Thanks, highly appreciated.
>>>
>>> As this contains a lot of ARM, indeed I would like to wait for
>>> Albert's ACK or pulling (whichever he prefers).
>>>
>>> Best regards,
>>>
>>> Wolfgang Denk
>>>
>>
>> Applied to u-boot-arm/master, thanks!
> 
> But I might hold this a little, as commit "snowball: Adding
> architecture dependent initialisation"
> 7e2b895eb5aa10890910eed8921d042d13b828c0 seems to play bad with my
> stock Ubuntu 12.04 GCC on u8500_href:
> 
> uboot@lilith:~/src/u-boot-arm$ git checkout
> f917361b988f69ddc0dbe2bd2beb93b296065b70^ HEAD is now at 1b5d8d5...
> u8500: Moving prcmu to cpu directory uboot@lilith:~/src/u-boot-arm$
> LANG=C ./MAKEALL u8500_href Configuring for u8500_href board...
>    text	   data	    bss	    dec
> hex	filename 139584	   4408	 221728
> 365720	  59498	./u-boot
> 
> --------------------- SUMMARY ----------------------------
> Boards compiled: 1
> ----------------------------------------------------------
> uboot@lilith:~/src/u-boot-arm$ git checkout
> f917361b988f69ddc0dbe2bd2beb93b296065b70 Previous HEAD position was
> 1b5d8d5... u8500: Moving prcmu to cpu directory HEAD is now at
> f917361... snowball: Adding architecture dependent initialisation
> uboot@lilith:~/src/u-boot-arm$ LANG=C ./MAKEALL u8500_href Configuring
> for u8500_href board... text	   data	    bss
> dec	    hex	filename 139744	   4408
> 221696	 365848	  59518	./u-boot u8500_href.c:45:0:
> warning: "PRCMU_BASE" redefined [enabled by
> default] /home/uboot/src/u-boot-arm/include/asm/arch/prcmu.h:30:0:
> note: this is the location of the previous definition
> 
> --------------------- SUMMARY ----------------------------
> Boards compiled: 1
> Boards with warnings but no errors: 1 ( u8500_href )
> ----------------------------------------------------------
> 
> Granted, this is only a warning, but I'd like to see it fixed.
> 
> Amicalement,
Tom Rini - Aug. 15, 2012, 4:51 p.m.
On Tue, Aug 14, 2012 at 03:06:17AM +0200, Albert ARIBAUD wrote:
> Hi Albert,
> 
> On Tue, 14 Aug 2012 02:04:15 +0200, Albert ARIBAUD (U-Boot)
> <albert.u.boot@aribaud.net> wrote:
> 
> > Hi Tom,
> > 
> > On Fri, 10 Aug 2012 22:06:59 +0200, Wolfgang Denk <wd@denx.de> wrote:
> > 
> > > Dear Tom,
> > > 
> > > In message <20120810161021.GG3306@bill-the-cat> you wrote:
> > > > 
> > > > To try and ease the backlog of ARM changes, I've taken the liberty
> > > > of grabbing the Snowball and Raspberry Pi model B board support
> > > > patches and putting them into the staging tree.  Both of these
> > > > series have been posted for some time and been reviewed.
> > > > Wolfgang, if you would like to wait for Albert to pick up this
> > > > request, that's fine.  I just wanted to make sure the submitters
> > > > weren't left waiting.  Thanks!
> > > 
> > > Thanks, highly appreciated.
> > > 
> > > As this contains a lot of ARM, indeed I would like to wait for
> > > Albert's ACK or pulling (whichever he prefers).
> > > 
> > > Best regards,
> > > 
> > > Wolfgang Denk
> > > 
> > 
> > Applied to u-boot-arm/master, thanks!
> 
> But I might hold this a little, as commit "snowball: Adding
> architecture dependent initialisation"
> 7e2b895eb5aa10890910eed8921d042d13b828c0 seems to play bad with my
> stock Ubuntu 12.04 GCC on u8500_href:
> 
> uboot@lilith:~/src/u-boot-arm$ git checkout
> f917361b988f69ddc0dbe2bd2beb93b296065b70^ HEAD is now at 1b5d8d5...
> u8500: Moving prcmu to cpu directory uboot@lilith:~/src/u-boot-arm$
> LANG=C ./MAKEALL u8500_href Configuring for u8500_href board...
>    text	   data	    bss	    dec
> hex	filename 139584	   4408	 221728
> 365720	  59498	./u-boot
> 
> --------------------- SUMMARY ----------------------------
> Boards compiled: 1
> ----------------------------------------------------------
> uboot@lilith:~/src/u-boot-arm$ git checkout
> f917361b988f69ddc0dbe2bd2beb93b296065b70 Previous HEAD position was
> 1b5d8d5... u8500: Moving prcmu to cpu directory HEAD is now at
> f917361... snowball: Adding architecture dependent initialisation
> uboot@lilith:~/src/u-boot-arm$ LANG=C ./MAKEALL u8500_href Configuring
> for u8500_href board... text	   data	    bss
> dec	    hex	filename 139744	   4408
> 221696	 365848	  59518	./u-boot u8500_href.c:45:0:
> warning: "PRCMU_BASE" redefined [enabled by
> default] /home/uboot/src/u-boot-arm/include/asm/arch/prcmu.h:30:0:
> note: this is the location of the previous definition
> 
> --------------------- SUMMARY ----------------------------
> Boards compiled: 1
> Boards with warnings but no errors: 1 ( u8500_href )
> ----------------------------------------------------------
> 
> Granted, this is only a warning, but I'd like to see it fixed.

I've taken Mathieu's updated patch and pushed the series again to
u-boot-staging/trini@ti.com.  A git reset --hard
a1cd53c6b6e2e7fbf4ffa20d3548646e4c94efe5 and then pull of my tree will
get things back in shape.  I've done a MAKEALL -s u8500 and it's fine
now and I'm kicking off a -a arm.