Patchwork [U-Boot,PULL,REQUEST] u-boot-atmel/master

login
register
mail settings
Submitter Reinhard Meyer
Date Aug. 3, 2011, 10:45 a.m.
Message ID <1312368313-32160-1-git-send-email-u-boot@emk-elektronik.de>
Download mbox
Permalink /patch/108102/
State Accepted
Delegated to: Reinhard Meyer
Headers show

Pull-request

git://git.denx.de/u-boot-atmel.git master

Comments

Reinhard Meyer - Aug. 3, 2011, 10:45 a.m.
Dear Albert,

those "bug fix" patches bring the number of "broken" at91 boards down to 10.
I hope this can be brought down even more before -rc1, but what has been done so
far should be mainlined as soon as possible:)

The Patch "avr32: add grasshopper (ICnova AP7000) board" was submitted before the
merge window was closed, so it can go in as well.

Best Regards,
Reinhard

The following changes since commit 49df40a25f44b261183a790a8e4ccfef8c6c66e5:

  Merge git://git.denx.de/u-boot-arm into master-arm (2011-08-03 08:03:52 +0000)

are available in the git repository at:

  git://git.denx.de/u-boot-atmel.git master

Andreas Bießmann (8):
      ARM: remove obsolete at91rm9200
      MAKEALL: remove obsolete at91rm9200 soc
      a/a/c/arm920t/cpu.c: remove CONFIG_AT91_LEGACY warning
      README.at91-soc: remove AT91(RM9200) joining notice
      net/eth.c: drop obsolete at91rm9200 support
      README: fix arm920t/at91 path
      a/a/c/arm920t/at91/reset.c: drop obsolete CONFIG_AT91RM9200_USART
      avr32: add grasshopper (ICnova AP7000) board

Asen Dimov (1):
      AT91: change common at91sam9261 files to compile with new scheme

Reinhard Meyer (3):
      AT91: fix mistake in at91sam9260_devices.c(spi1_hw_init)
      MAKEALL: remove AT91 boards that are in boards.cfg
      AT91/SPI: fix atmel_dataflash_spi.c to allow building without warnings

Xu, Hong (6):
      AT91: Makes AT91SAM9RL SoC build correctly against u-boot-atmel/master
      AT91: Makes AT91SAM9RL-EK build correctly against u-boot-atmel/master
      AT91: SoC fix at91sam9261_matrix.h
      AT91: Board fix for AT91SAM9261-EK
      AT91: Makes AT91SAM9263 SoC build correctly against u-boot-atmel/master
      AT91: Makes AT91SAM9263-EK build correctly against u-boot-atmel/master

 MAINTAINERS                                        |    1 +
 MAKEALL                                            |    7 -
 Makefile                                           |   54 --
 README                                             |    2 +-
 arch/arm/cpu/arm920t/at91/reset.c                  |    4 -
 arch/arm/cpu/arm920t/at91rm9200/bcm5221.c          |  232 ------
 arch/arm/cpu/arm920t/at91rm9200/dm9161.c           |  225 ------
 arch/arm/cpu/arm920t/at91rm9200/ether.c            |  316 --------
 arch/arm/cpu/arm920t/at91rm9200/i2c.c              |  192 -----
 arch/arm/cpu/arm920t/at91rm9200/ks8721.c           |  249 ------
 arch/arm/cpu/arm920t/at91rm9200/lowlevel_init.S    |  169 ----
 arch/arm/cpu/arm920t/at91rm9200/lxt972.c           |  192 -----
 arch/arm/cpu/arm920t/at91rm9200/reset.c            |   71 --
 arch/arm/cpu/arm920t/at91rm9200/spi.c              |  152 ----
 arch/arm/cpu/arm920t/at91rm9200/timer.c            |  142 ----
 arch/arm/cpu/arm920t/at91rm9200/usb.c              |   53 --
 arch/arm/cpu/arm920t/cpu.c                         |    4 -
 arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c  |    2 +-
 arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c  |   76 +-
 arch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c  |   38 +-
 arch/arm/cpu/arm926ejs/at91/at91sam9rl_devices.c   |   74 +-
 arch/arm/cpu/arm926ejs/at91/lowlevel_init.S        |    2 +-
 arch/arm/include/asm/arch-at91/at91_spi.h          |    2 +-
 arch/arm/include/asm/arch-at91/at91sam9261.h       |    3 +-
 .../arm/include/asm/arch-at91/at91sam9261_matrix.h |   77 +-
 arch/arm/include/asm/arch-at91/at91sam9263.h       |   13 +
 .../arm/include/asm/arch-at91/at91sam9263_matrix.h |  146 +---
 arch/arm/include/asm/arch-at91/at91sam9rl.h        |  185 +++---
 arch/arm/include/asm/arch-at91/at91sam9rl_matrix.h |  121 +--
 arch/arm/include/asm/arch-at91rm9200/AT91RM9200.h  |  812 --------------------
 arch/arm/include/asm/arch-at91rm9200/hardware.h    |   75 --
 board/atmel/at91sam9261ek/at91sam9261ek.c          |  136 ++--
 board/atmel/at91sam9261ek/config.mk                |    1 -
 board/atmel/at91sam9261ek/led.c                    |    7 +-
 board/atmel/at91sam9263ek/at91sam9263ek.c          |   56 +-
 board/atmel/at91sam9263ek/config.mk                |    1 -
 board/atmel/at91sam9263ek/led.c                    |   23 +-
 board/atmel/at91sam9rlek/at91sam9rlek.c            |   73 ++-
 board/atmel/at91sam9rlek/config.mk                 |    1 -
 board/atmel/at91sam9rlek/led.c                     |    6 +-
 .../in-circuit/grasshopper}/Makefile               |   29 +-
 board/in-circuit/grasshopper/grasshopper.c         |  112 +++
 boards.cfg                                         |   14 +
 doc/README.at91-soc                                |   22 -
 drivers/spi/atmel_dataflash_spi.c                  |   16 +-
 include/configs/at91sam9261ek.h                    |  133 ++--
 include/configs/at91sam9263ek.h                    |   83 ++-
 include/configs/at91sam9rlek.h                     |   85 ++-
 include/configs/grasshopper.h                      |  198 +++++
 net/eth.c                                          |    4 -
 50 files changed, 1015 insertions(+), 3676 deletions(-)
 delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/bcm5221.c
 delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/dm9161.c
 delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/ether.c
 delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/i2c.c
 delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/ks8721.c
 delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/lowlevel_init.S
 delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/lxt972.c
 delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/reset.c
 delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/spi.c
 delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/timer.c
 delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/usb.c
 delete mode 100644 arch/arm/include/asm/arch-at91rm9200/AT91RM9200.h
 delete mode 100644 arch/arm/include/asm/arch-at91rm9200/hardware.h
 delete mode 100644 board/atmel/at91sam9261ek/config.mk
 delete mode 100644 board/atmel/at91sam9263ek/config.mk
 delete mode 100644 board/atmel/at91sam9rlek/config.mk
 rename {arch/arm/cpu/arm920t/at91rm9200 => board/in-circuit/grasshopper}/Makefile (73%)
 create mode 100644 board/in-circuit/grasshopper/grasshopper.c
 create mode 100644 include/configs/grasshopper.h
Reinhard Meyer - Aug. 3, 2011, 10:53 a.m.
Dear Albert,
> 
> those "bug fix" patches bring the number of "broken" at91 boards down to 10.
> I hope this can be brought down even more before -rc1, but what has been done so
> far should be mainlined as soon as possible:)
> 
> The Patch "avr32: add grasshopper (ICnova AP7000) board" was submitted before the
> merge window was closed, so it can go in as well.
> 
> Best Regards,
> Reinhard

[snip]

>  rename {arch/arm/cpu/arm920t/at91rm9200 => board/in-circuit/grasshopper}/Makefile (73%)

An interesting bug in "git request-pull". If you look at the commits,
clearly one Makefile is _deleted_, and later the other is _created_...

Amusement,
Reinhard
Albert ARIBAUD - Aug. 3, 2011, 11:05 a.m.
Hi Reinhard,

On 03/08/2011 12:53, Reinhard Meyer wrote:
> Dear Albert,
>>
>> those "bug fix" patches bring the number of "broken" at91 boards down to 10.
>> I hope this can be brought down even more before -rc1, but what has been done so
>> far should be mainlined as soon as possible:)
>>
>> The Patch "avr32: add grasshopper (ICnova AP7000) board" was submitted before the
>> merge window was closed, so it can go in as well.
>>
>> Best Regards,
>> Reinhard
>
> [snip]
>
>>   rename {arch/arm/cpu/arm920t/at91rm9200 =>  board/in-circuit/grasshopper}/Makefile (73%)
>
> An interesting bug in "git request-pull". If you look at the commits,
> clearly one Makefile is _deleted_, and later the other is _created_...

Renames/moves are not tracked as such, they are more detectd by git, 
based on create+delete+similarity. Since the makefiles are quite 
similar, git thinks this is a rename/move. Not a bug, a feature. :)

> Amusement,

:)

> Reinhard

I've pulled the changes in and am running a MAKEALL to make sure things 
are correct before I update u-boot-arm, at which point I'll do a first 
pull req for ARM so that we get this mainlined in rc1 -- board removal 
and other patches will be in a subsequent pull req.

Amicalement,
Albert ARIBAUD - Aug. 3, 2011, 1:15 p.m.
Hi Reinhard,

On 03/08/2011 12:45, Reinhard Meyer wrote:
> Dear Albert,
>
> those "bug fix" patches bring the number of "broken" at91 boards down to 10.
> I hope this can be brought down even more before -rc1, but what has been done so
> far should be mainlined as soon as possible:)
>
> The Patch "avr32: add grasshopper (ICnova AP7000) board" was submitted before the
> merge window was closed, so it can go in as well.
>
> Best Regards,
> Reinhard
>
> The following changes since commit 49df40a25f44b261183a790a8e4ccfef8c6c66e5:
>
>    Merge git://git.denx.de/u-boot-arm into master-arm (2011-08-03 08:03:52 +0000)
>
> are available in the git repository at:
>
>    git://git.denx.de/u-boot-atmel.git master
>
> Andreas Bießmann (8):
>        ARM: remove obsolete at91rm9200
>        MAKEALL: remove obsolete at91rm9200 soc
>        a/a/c/arm920t/cpu.c: remove CONFIG_AT91_LEGACY warning
>        README.at91-soc: remove AT91(RM9200) joining notice
>        net/eth.c: drop obsolete at91rm9200 support
>        README: fix arm920t/at91 path
>        a/a/c/arm920t/at91/reset.c: drop obsolete CONFIG_AT91RM9200_USART
>        avr32: add grasshopper (ICnova AP7000) board
>
> Asen Dimov (1):
>        AT91: change common at91sam9261 files to compile with new scheme
>
> Reinhard Meyer (3):
>        AT91: fix mistake in at91sam9260_devices.c(spi1_hw_init)
>        MAKEALL: remove AT91 boards that are in boards.cfg
>        AT91/SPI: fix atmel_dataflash_spi.c to allow building without warnings
>
> Xu, Hong (6):
>        AT91: Makes AT91SAM9RL SoC build correctly against u-boot-atmel/master
>        AT91: Makes AT91SAM9RL-EK build correctly against u-boot-atmel/master
>        AT91: SoC fix at91sam9261_matrix.h
>        AT91: Board fix for AT91SAM9261-EK
>        AT91: Makes AT91SAM9263 SoC build correctly against u-boot-atmel/master
>        AT91: Makes AT91SAM9263-EK build correctly against u-boot-atmel/master
>
>   MAINTAINERS                                        |    1 +
>   MAKEALL                                            |    7 -
>   Makefile                                           |   54 --
>   README                                             |    2 +-
>   arch/arm/cpu/arm920t/at91/reset.c                  |    4 -
>   arch/arm/cpu/arm920t/at91rm9200/bcm5221.c          |  232 ------
>   arch/arm/cpu/arm920t/at91rm9200/dm9161.c           |  225 ------
>   arch/arm/cpu/arm920t/at91rm9200/ether.c            |  316 --------
>   arch/arm/cpu/arm920t/at91rm9200/i2c.c              |  192 -----
>   arch/arm/cpu/arm920t/at91rm9200/ks8721.c           |  249 ------
>   arch/arm/cpu/arm920t/at91rm9200/lowlevel_init.S    |  169 ----
>   arch/arm/cpu/arm920t/at91rm9200/lxt972.c           |  192 -----
>   arch/arm/cpu/arm920t/at91rm9200/reset.c            |   71 --
>   arch/arm/cpu/arm920t/at91rm9200/spi.c              |  152 ----
>   arch/arm/cpu/arm920t/at91rm9200/timer.c            |  142 ----
>   arch/arm/cpu/arm920t/at91rm9200/usb.c              |   53 --
>   arch/arm/cpu/arm920t/cpu.c                         |    4 -
>   arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c  |    2 +-
>   arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c  |   76 +-
>   arch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c  |   38 +-
>   arch/arm/cpu/arm926ejs/at91/at91sam9rl_devices.c   |   74 +-
>   arch/arm/cpu/arm926ejs/at91/lowlevel_init.S        |    2 +-
>   arch/arm/include/asm/arch-at91/at91_spi.h          |    2 +-
>   arch/arm/include/asm/arch-at91/at91sam9261.h       |    3 +-
>   .../arm/include/asm/arch-at91/at91sam9261_matrix.h |   77 +-
>   arch/arm/include/asm/arch-at91/at91sam9263.h       |   13 +
>   .../arm/include/asm/arch-at91/at91sam9263_matrix.h |  146 +---
>   arch/arm/include/asm/arch-at91/at91sam9rl.h        |  185 +++---
>   arch/arm/include/asm/arch-at91/at91sam9rl_matrix.h |  121 +--
>   arch/arm/include/asm/arch-at91rm9200/AT91RM9200.h  |  812 --------------------
>   arch/arm/include/asm/arch-at91rm9200/hardware.h    |   75 --
>   board/atmel/at91sam9261ek/at91sam9261ek.c          |  136 ++--
>   board/atmel/at91sam9261ek/config.mk                |    1 -
>   board/atmel/at91sam9261ek/led.c                    |    7 +-
>   board/atmel/at91sam9263ek/at91sam9263ek.c          |   56 +-
>   board/atmel/at91sam9263ek/config.mk                |    1 -
>   board/atmel/at91sam9263ek/led.c                    |   23 +-
>   board/atmel/at91sam9rlek/at91sam9rlek.c            |   73 ++-
>   board/atmel/at91sam9rlek/config.mk                 |    1 -
>   board/atmel/at91sam9rlek/led.c                     |    6 +-
>   .../in-circuit/grasshopper}/Makefile               |   29 +-
>   board/in-circuit/grasshopper/grasshopper.c         |  112 +++
>   boards.cfg                                         |   14 +
>   doc/README.at91-soc                                |   22 -
>   drivers/spi/atmel_dataflash_spi.c                  |   16 +-
>   include/configs/at91sam9261ek.h                    |  133 ++--
>   include/configs/at91sam9263ek.h                    |   83 ++-
>   include/configs/at91sam9rlek.h                     |   85 ++-
>   include/configs/grasshopper.h                      |  198 +++++
>   net/eth.c                                          |    4 -
>   50 files changed, 1015 insertions(+), 3676 deletions(-)
>   delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/bcm5221.c
>   delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/dm9161.c
>   delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/ether.c
>   delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/i2c.c
>   delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/ks8721.c
>   delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/lowlevel_init.S
>   delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/lxt972.c
>   delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/reset.c
>   delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/spi.c
>   delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/timer.c
>   delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/usb.c
>   delete mode 100644 arch/arm/include/asm/arch-at91rm9200/AT91RM9200.h
>   delete mode 100644 arch/arm/include/asm/arch-at91rm9200/hardware.h
>   delete mode 100644 board/atmel/at91sam9261ek/config.mk
>   delete mode 100644 board/atmel/at91sam9263ek/config.mk
>   delete mode 100644 board/atmel/at91sam9rlek/config.mk
>   rename {arch/arm/cpu/arm920t/at91rm9200 =>  board/in-circuit/grasshopper}/Makefile (73%)
>   create mode 100644 board/in-circuit/grasshopper/grasshopper.c
>   create mode 100644 include/configs/grasshopper.h

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

Overall ARM builds (./MAKEALL arm) went from 199 boards built, 119 with 
warnings or errors before applying, to 201 boards, 97 with warnings or 
errors once applied.

Amicalement,
Reinhard Meyer - Aug. 3, 2011, 1:35 p.m.
Dear Albert,

> Overall ARM builds (./MAKEALL arm) went from 199 boards
> built, 119 with warnings or errors before applying, to 201 boards,
 > 97 with warnings or errors once applied.

When boards were defined in the MAKEALL apparently only one variant
was built and counted, whereas in boards.cfg every variant is built.

Amongst that 199 some Atmel boards had been in MAKEALL *and* boards.cfg
Removing those duplicates but getting more variants tested leads to
that increase of 2.

On a side note one should make sure that boards are not left in
MAKEALL when they are moved from Makefile to boards.cfg. Otherwise
one gets them counted as broken although there is no error or
warning message seen.

Best Regards,
Reinhard
Albert ARIBAUD - Aug. 3, 2011, 2:45 p.m.
Hi Reinhard,

On 03/08/2011 15:35, Reinhard Meyer wrote:
> Dear Albert,
>
>> Overall ARM builds (./MAKEALL arm) went from 199 boards
>> built, 119 with warnings or errors before applying, to 201 boards,
>  > 97 with warnings or errors once applied.
>
> When boards were defined in the MAKEALL apparently only one variant
> was built and counted, whereas in boards.cfg every variant is built.
>
> Amongst that 199 some Atmel boards had been in MAKEALL *and* boards.cfg
> Removing those duplicates but getting more variants tested leads to
> that increase of 2.
>
> On a side note one should make sure that boards are not left in
> MAKEALL when they are moved from Makefile to boards.cfg. Otherwise
> one gets them counted as broken although there is no error or
> warning message seen.

You do well to point this out -- I've just applied a patch that adds 
boards to MAKEALL, but haven't throughly checked boards.cfg, and some 
boards are there as well.

> Best Regards,
> Reinhard
>
>


Amicalement,