Skip to contentSkip to conversation

u-boot-atmel/master -> u-boot-arm/master

GIT PULL Andreas Bießmann 2 participants 2 messages Jun 14, 2014 – Jun 24, 2014

lore
Share & tools
lore
#0 lore raw

Dear Albert Aribaud,

please pull these changes from u-boot-atmel/master into u-boot-arm/master.

This request contains one avr32 related patch which is required to get the macb change compile clean. Therefore this one is included here rather than going through u-boot-avr32.

The following changes since commit 0a26e1d6c394aacbf1153977b7348d1dff85db3f:

arm: fix a double-definition error of _start symbol (2014-06-09 10:36:40 +0200)

are available in the git repository at:

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

for you to fetch changes up to 6dbeb893c4a7668d0098318d6668ccf59bfbfdea:

arm: ethernut5: convert to generic board (2014-06-14 18:13:15 +0200)

----------------------------------------------------------------
Andreas Bie?mann (2):
avr32: migrate cache functions
macb: make checkpatch clean

Tim Schendekehl (1):
arm: ethernut5: convert to generic board

Wu, Josh (3):
net: macb: enable dcache in macb
video: atmel_hlcdfb: enable dcache support
ARMv7: at91: enable ICache and DCache.

 arch/arm/cpu/armv7/at91/cpu.c                      |    2 +
 arch/avr32/cpu/cache.c                             |   20 ++--
 .../avr32/include/asm/arch-at32ap700x/cacheflush.h |    2 -
 arch/avr32/include/asm/dma-mapping.h               |    6 +-
 arch/avr32/lib/board.c                             |    4 +-
 drivers/net/macb.c                                 |  113 +++++++++++++++-----
 drivers/video/atmel_hlcdfb.c                       |    6 ++
 include/configs/ethernut5.h                        |    2 +
 8 files changed, 110 insertions(+), 45 deletions(-)
#1 lore raw

Hi Andreas,

Quoted 34 lines · Andreas Bie?mann

Dear Albert Aribaud,

please pull these changes from u-boot-atmel/master into u-boot-arm/master.

This request contains one avr32 related patch which is required to get the macb change compile clean. Therefore this one is included here rather than going through u-boot-avr32.

The following changes since commit 0a26e1d6c394aacbf1153977b7348d1dff85db3f:

arm: fix a double-definition error of _start symbol (2014-06-09 10:36:40 +0200)

are available in the git repository at:

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

for you to fetch changes up to 6dbeb893c4a7668d0098318d6668ccf59bfbfdea:

arm: ethernut5: convert to generic board (2014-06-14 18:13:15 +0200)

----------------------------------------------------------------
Andreas Bie?mann (2):
avr32: migrate cache functions
macb: make checkpatch clean

Tim Schendekehl (1):
arm: ethernut5: convert to generic board

Wu, Josh (3):
net: macb: enable dcache in macb
video: atmel_hlcdfb: enable dcache support
ARMv7: at91: enable ICache and DCache.

Quoted 9 lines
 arch/arm/cpu/armv7/at91/cpu.c                      |    2 +
 arch/avr32/cpu/cache.c                             |   20 ++--
 .../avr32/include/asm/arch-at32ap700x/cacheflush.h |    2 -
 arch/avr32/include/asm/dma-mapping.h               |    6 +-
 arch/avr32/lib/board.c                             |    4 +-
 drivers/net/macb.c                                 |  113 +++++++++++++++-----
 drivers/video/atmel_hlcdfb.c                       |    6 ++
 include/configs/ethernut5.h                        |    2 +
 8 files changed, 110 insertions(+), 45 deletions(-)

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

Amicalement,

Signature · 1 line
Albert.