Skip to contentSkip to conversation

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

GIT PULL Andreas Bießmann 2 participants 4 messages Aug 21, 2015 – Aug 24, 2015

lore
Share & tools
lore
#0 lore raw

The following changes since commit 8d77576371381ade83de475bb639949b44941e8c:

ARM: davinci: remove support for cam_enc_4xx (2015-08-20 12:55:50 -0400)

are available in the git repository at:

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

for you to fetch changes up to 6e119bc25a27700b71a6340f9c7cd5382d9c6649:

ARM: at91: sama5: update the spi flash mapping (2015-08-21 15:15:28 +0200)

----------------------------------------------------------------
Erik van Luijk (4):
arm: at91: mpddr: allow multiple DDR controllers
arm: at91: at91sam9m10g45ek/corvus remove useless chip select 1 init
arm: at91: pmc: replace the constant with a define in at91_pmc.h
arm: at91: add support for mini-box picosam9g45 board

Heiko Schocher (2):
arm, at91: add axm extensions
taurus: board updates

Wu, Josh (4):
ARM: at91: sama5: move the sd/mmc env config to at91-sama5_common.h
ARM: at91: sama5d3xek: use a $dtb_name to load dtb
ARM: at91: sama5: move the nandflash env config to at91-sama5_common.h
ARM: at91: sama5: update the spi flash mapping

 arch/arm/include/asm/mach-types.h               |   1 +
 arch/arm/mach-at91/Kconfig                      |   6 +
 arch/arm/mach-at91/include/mach/at91_pmc.h      |   1 +
 arch/arm/mach-at91/include/mach/atmel_mpddrc.h  |   6 +-
 arch/arm/mach-at91/mpddrc.c                     |  41 +--
 board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c |  12 +-
 board/atmel/at91sam9n12ek/at91sam9n12ek.c       |   4 +-
 board/atmel/at91sam9x5ek/at91sam9x5ek.c         |   4 +-
 board/atmel/sama5d3_xplained/sama5d3_xplained.c |   4 +-
 board/atmel/sama5d3xek/sama5d3xek.c             |  24 +-
 board/atmel/sama5d4_xplained/sama5d4_xplained.c |   4 +-
 board/atmel/sama5d4ek/sama5d4ek.c               |   4 +-
 board/mini-box/picosam9g45/Kconfig              |  12 +
 board/mini-box/picosam9g45/MAINTAINERS          |   6 +
 board/mini-box/picosam9g45/Makefile             |  19 ++
 board/mini-box/picosam9g45/led.c                |  25 ++
 board/mini-box/picosam9g45/picosam9g45.c        | 354 ++++++++++++++++++++++++
 board/siemens/corvus/board.c                    |  12 +-
 board/siemens/taurus/taurus.c                   | 202 ++++++++++++--
 configs/picosam9g45_defconfig                   |  12 +
 include/configs/at91-sama5_common.h             |  37 +++
 include/configs/at91sam9m10g45ek.h              |   1 -
 include/configs/at91sam9n12ek.h                 |   2 -
 include/configs/at91sam9x5ek.h                  |   2 -
 include/configs/corvus.h                        |   2 -
 include/configs/picosam9g45.h                   | 211 ++++++++++++++
 include/configs/sama5d3_xplained.h              |  19 +-
 include/configs/sama5d3xek.h                    |  33 +--
 include/configs/sama5d4_xplained.h              |  41 +--
 include/configs/sama5d4ek.h                     |  39 +--
 include/configs/taurus.h                        |  79 +++++-
 31 files changed, 1019 insertions(+), 200 deletions(-)
 create mode 100644 board/mini-box/picosam9g45/Kconfig
 create mode 100644 board/mini-box/picosam9g45/MAINTAINERS
 create mode 100644 board/mini-box/picosam9g45/Makefile
 create mode 100644 board/mini-box/picosam9g45/led.c
 create mode 100644 board/mini-box/picosam9g45/picosam9g45.c
 create mode 100644 configs/picosam9g45_defconfig
 create mode 100644 include/configs/picosam9g45.h
#1 lore raw

Sorry Tom,

Quoted 4 lines · Andreas Bie?mann

The following changes since commit 8d77576371381ade83de475bb639949b44941e8c:

ARM: davinci: remove support for cam_enc_4xx (2015-08-20 12:55:50 -0400)

there slipped one wrong commit in. Please forget this PR!

Andreas

Quoted 9 lines

are available in the git repository at:

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

for you to fetch changes up to 6e119bc25a27700b71a6340f9c7cd5382d9c6649:

ARM: at91: sama5: update the spi flash mapping (2015-08-21 15:15:28 +0200)

----------------------------------------------------------------

#2 lore raw

Hi Tom,

this is the corrected PR.

Andreas

The following changes since commit 8d77576371381ade83de475bb639949b44941e8c:

ARM: davinci: remove support for cam_enc_4xx (2015-08-20 12:55:50 -0400)

are available in the git repository at:

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

for you to fetch changes up to 7a53b9544e388ac80bff2a3912865df029de27d0:

ARM: at91: sama5: update the spi flash mapping (2015-08-21 15:47:05 +0200)

----------------------------------------------------------------
Erik van Luijk (4):
arm: at91: mpddr: allow multiple DDR controllers
arm: at91: at91sam9m10g45ek/corvus remove useless chip select 1 init
arm: at91: pmc: replace the constant with a define in at91_pmc.h
arm: at91: add support for mini-box picosam9g45 board

Wu, Josh (4):
ARM: at91: sama5: move the sd/mmc env config to at91-sama5_common.h
ARM: at91: sama5d3xek: use a $dtb_name to load dtb
ARM: at91: sama5: move the nandflash env config to at91-sama5_common.h
ARM: at91: sama5: update the spi flash mapping

 arch/arm/include/asm/mach-types.h               |   1 +
 arch/arm/mach-at91/Kconfig                      |   6 +
 arch/arm/mach-at91/include/mach/at91_pmc.h      |   1 +
 arch/arm/mach-at91/include/mach/atmel_mpddrc.h  |   6 +-
 arch/arm/mach-at91/mpddrc.c                     |  41 +--
 board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c |  12 +-
 board/atmel/at91sam9n12ek/at91sam9n12ek.c       |   4 +-
 board/atmel/at91sam9x5ek/at91sam9x5ek.c         |   4 +-
 board/atmel/sama5d3_xplained/sama5d3_xplained.c |   4 +-
 board/atmel/sama5d3xek/sama5d3xek.c             |  24 +-
 board/atmel/sama5d4_xplained/sama5d4_xplained.c |   4 +-
 board/atmel/sama5d4ek/sama5d4ek.c               |   4 +-
 board/mini-box/picosam9g45/Kconfig              |  12 +
 board/mini-box/picosam9g45/MAINTAINERS          |   6 +
 board/mini-box/picosam9g45/Makefile             |  19 ++
 board/mini-box/picosam9g45/led.c                |  25 ++
 board/mini-box/picosam9g45/picosam9g45.c        | 354 ++++++++++++++++++++++++
 board/siemens/corvus/board.c                    |  12 +-
 configs/picosam9g45_defconfig                   |  12 +
 include/configs/at91-sama5_common.h             |  37 +++
 include/configs/at91sam9m10g45ek.h              |   1 -
 include/configs/at91sam9n12ek.h                 |   2 -
 include/configs/at91sam9x5ek.h                  |   2 -
 include/configs/corvus.h                        |   2 -
 include/configs/picosam9g45.h                   | 211 ++++++++++++++
 include/configs/sama5d3_xplained.h              |  19 +-
 include/configs/sama5d3xek.h                    |  33 +--
 include/configs/sama5d4_xplained.h              |  41 +--
 include/configs/sama5d4ek.h                     |  39 +--
 29 files changed, 763 insertions(+), 175 deletions(-)
 create mode 100644 board/mini-box/picosam9g45/Kconfig
 create mode 100644 board/mini-box/picosam9g45/MAINTAINERS
 create mode 100644 board/mini-box/picosam9g45/Makefile
 create mode 100644 board/mini-box/picosam9g45/led.c
 create mode 100644 board/mini-box/picosam9g45/picosam9g45.c
 create mode 100644 configs/picosam9g45_defconfig
 create mode 100644 include/configs/picosam9g45.h
#3 lore raw
Quoted 10 lines · Andreas Bie?mann

Hi Tom,

this is the corrected PR.

Andreas

The following changes since commit 8d77576371381ade83de475bb639949b44941e8c:

ARM: davinci: remove support for cam_enc_4xx (2015-08-20 12:55:50 -0400)

Quoted 8 lines

are available in the git repository at:

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

for you to fetch changes up to 7a53b9544e388ac80bff2a3912865df029de27d0:

ARM: at91: sama5: update the spi flash mapping (2015-08-21 15:47:05 +0200)

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150824/7a02efaf/attachment.sig>