mbox

[U-Boot,PULL] u-boot-avr32/master -> u-boot/master

Message ID 1424118307-8154-1-git-send-email-andreas.devel@googlemail.com
State Accepted
Delegated to: Tom Rini
Headers show

Pull-request

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

Message

Andreas Bießmann Feb. 16, 2015, 8:25 p.m. UTC 
Hi Tom,

finally generic board support for avr32!

The following changes since commit bd2a4888b123713adec271d6c8040ca9f609aa2f:

  sunxi: configs/sunxi-common.h: Enable CONFIG_CMD_PART (2015-02-11 19:43:45 -0500)

are available in the git repository at:

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

for you to fetch changes up to 4d3dada78ec402dc51e4198dda316301e0d99f35:

  atstk1002: enable generic board (2015-02-16 21:21:26 +0100)

----------------------------------------------------------------
Andreas Bießmann (11):
      avr32: use dlmalloc for DMA buffers
      avr32: rename cpu_init() -> arch_cpu_init()
      avr32: factor out cpu_mmc_init()
      avr32: rename mmu.h definitions
      avr32: convert to dram_init()
      avr32: use generic gd->start_addr_sp
      common/board_f: factor out reserve_stacks
      common/board_r: allocate bootparams
      avr32: add generic board support
      grasshopper: enable generic board
      atstk1002: enable generic board

 arch/arm/lib/Makefile                        |    1 +
 arch/arm/lib/stack.c                         |   42 +++++++++++++
 arch/avr32/config.mk                         |    3 +
 arch/avr32/cpu/Makefile                      |    1 +
 arch/avr32/cpu/at32ap700x/mmu.c              |    8 +--
 arch/avr32/cpu/cpu.c                         |    2 +-
 arch/avr32/cpu/exception.c                   |    6 +-
 arch/avr32/cpu/mmc.c                         |   16 +++++
 arch/avr32/cpu/u-boot.lds                    |    2 +
 arch/avr32/include/asm/arch-at32ap700x/mmu.h |    6 +-
 arch/avr32/include/asm/config.h              |    1 +
 arch/avr32/include/asm/dma-mapping.h         |    7 ++-
 arch/avr32/include/asm/global_data.h         |    1 -
 arch/avr32/include/asm/u-boot.h              |   10 ++++
 arch/avr32/lib/Makefile                      |    3 +
 arch/avr32/lib/board.c                       |   83 ++++----------------------
 arch/avr32/lib/dram_init.c                   |   17 ++++++
 arch/avr32/lib/interrupts.c                  |    5 ++
 arch/powerpc/lib/Makefile                    |    1 +
 arch/powerpc/lib/stack.c                     |   31 ++++++++++
 board/atmel/atngw100/atngw100.c              |   32 +++-------
 board/atmel/atngw100mkii/atngw100mkii.c      |   39 ++++--------
 board/atmel/atstk1000/atstk1000.c            |   33 +++-------
 board/earthlcd/favr-32-ezkit/favr-32-ezkit.c |   33 +++-------
 board/in-circuit/grasshopper/grasshopper.c   |   32 +++-------
 board/mimc/mimc200/mimc200.c                 |   38 ++++--------
 board/miromico/hammerhead/hammerhead.c       |   32 +++-------
 common/board_f.c                             |   46 ++++----------
 common/board_r.c                             |   28 ++++++++-
 common/cmd_bdinfo.c                          |    4 +-
 include/asm-generic/u-boot.h                 |    4 ++
 include/common.h                             |   18 ++++++
 include/configs/atngw100.h                   |    1 -
 include/configs/atngw100mkii.h               |    1 -
 include/configs/atstk1002.h                  |    5 +-
 include/configs/atstk1006.h                  |    1 -
 include/configs/favr-32-ezkit.h              |    1 -
 include/configs/grasshopper.h                |    5 +-
 include/configs/hammerhead.h                 |    1 -
 include/configs/mimc200.h                    |    1 -
 40 files changed, 294 insertions(+), 307 deletions(-)
 create mode 100644 arch/arm/lib/stack.c
 create mode 100644 arch/avr32/cpu/mmc.c
 create mode 100644 arch/avr32/lib/dram_init.c
 create mode 100644 arch/powerpc/lib/stack.c

Comments

Tom Rini Feb. 17, 2015, 3:12 p.m. UTC | #1 
On Mon, Feb 16, 2015 at 09:25:06PM +0100, Andreas Bießmann wrote:

> Hi Tom,
> 
> finally generic board support for avr32!
> 
> The following changes since commit bd2a4888b123713adec271d6c8040ca9f609aa2f:
> 
>   sunxi: configs/sunxi-common.h: Enable CONFIG_CMD_PART (2015-02-11 19:43:45 -0500)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-avr32.git master
> 
> for you to fetch changes up to 4d3dada78ec402dc51e4198dda316301e0d99f35:
> 
>   atstk1002: enable generic board (2015-02-16 21:21:26 +0100)
> 

NAK, sorry.  This breaks MIPS:
+   malta
+(malta) common/cmd_bdinfo.c: In function 'do_bdinfo':
+(malta) common/cmd_bdinfo.c:328:34: error: 'bd_t' has no member named 'bi_dram'
+(malta) common/cmd_bdinfo.c:329:32: error: 'bd_t' has no member named 'bi_dram'
+(malta) make[2]: *** [common/cmd_bdinfo.o] Error 1
+(malta) make[1]: *** [common] Error 2
+(malta) make: *** [sub-make] Error 2

And it bisected down to:
09bf969d927f73b083101fabb77e5130bec3eec1 is the first bad commit
commit 09bf969d927f73b083101fabb77e5130bec3eec1
Author: Andreas Bießmann <andreas.devel@googlemail.com>
Date:   Fri Feb 6 23:06:48 2015 +0100

    avr32: add generic board support

    Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Andreas Bießmann Feb. 17, 2015, 3:48 p.m. UTC | #2 
Hi Tom,

On 02/17/2015 04:12 PM, Tom Rini wrote:
> On Mon, Feb 16, 2015 at 09:25:06PM +0100, Andreas Bießmann wrote:
> 
>> Hi Tom,
>>
>> finally generic board support for avr32!
>>
>> The following changes since commit bd2a4888b123713adec271d6c8040ca9f609aa2f:
>>
>>   sunxi: configs/sunxi-common.h: Enable CONFIG_CMD_PART (2015-02-11 19:43:45 -0500)
>>
>> are available in the git repository at:
>>
>>   git://git.denx.de/u-boot-avr32.git master
>>
>> for you to fetch changes up to 4d3dada78ec402dc51e4198dda316301e0d99f35:
>>
>>   atstk1002: enable generic board (2015-02-16 21:21:26 +0100)
>>
> 
> NAK, sorry.  This breaks MIPS:
> +   malta
> +(malta) common/cmd_bdinfo.c: In function 'do_bdinfo':
> +(malta) common/cmd_bdinfo.c:328:34: error: 'bd_t' has no member named 'bi_dram'
> +(malta) common/cmd_bdinfo.c:329:32: error: 'bd_t' has no member named 'bi_dram'
> +(malta) make[2]: *** [common/cmd_bdinfo.o] Error 1
> +(malta) make[1]: *** [common] Error 2
> +(malta) make: *** [sub-make] Error 2
> 

Ouch, my fault. The change was misaligned by 14 lines. The MIPS and the
AVR32 part looks almost the same in this section. I'll send a fixed PR
this evening.

> And it bisected down to:
> 09bf969d927f73b083101fabb77e5130bec3eec1 is the first bad commit
> commit 09bf969d927f73b083101fabb77e5130bec3eec1
> Author: Andreas Bießmann <andreas.devel@googlemail.com>
> Date:   Fri Feb 6 23:06:48 2015 +0100
> 
>     avr32: add generic board support
> 
>     Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
>
Tom Rini Feb. 17, 2015, 4:08 p.m. UTC | #3 
On Tue, Feb 17, 2015 at 04:48:36PM +0100, Andreas Bießmann wrote:
> Hi Tom,
> 
> On 02/17/2015 04:12 PM, Tom Rini wrote:
> > On Mon, Feb 16, 2015 at 09:25:06PM +0100, Andreas Bießmann wrote:
> > 
> >> Hi Tom,
> >>
> >> finally generic board support for avr32!
> >>
> >> The following changes since commit bd2a4888b123713adec271d6c8040ca9f609aa2f:
> >>
> >>   sunxi: configs/sunxi-common.h: Enable CONFIG_CMD_PART (2015-02-11 19:43:45 -0500)
> >>
> >> are available in the git repository at:
> >>
> >>   git://git.denx.de/u-boot-avr32.git master
> >>
> >> for you to fetch changes up to 4d3dada78ec402dc51e4198dda316301e0d99f35:
> >>
> >>   atstk1002: enable generic board (2015-02-16 21:21:26 +0100)
> >>
> > 
> > NAK, sorry.  This breaks MIPS:
> > +   malta
> > +(malta) common/cmd_bdinfo.c: In function 'do_bdinfo':
> > +(malta) common/cmd_bdinfo.c:328:34: error: 'bd_t' has no member named 'bi_dram'
> > +(malta) common/cmd_bdinfo.c:329:32: error: 'bd_t' has no member named 'bi_dram'
> > +(malta) make[2]: *** [common/cmd_bdinfo.o] Error 1
> > +(malta) make[1]: *** [common] Error 2
> > +(malta) make: *** [sub-make] Error 2
> 
> Ouch, my fault. The change was misaligned by 14 lines. The MIPS and the
> AVR32 part looks almost the same in this section. I'll send a fixed PR
> this evening.

Great, thanks!