Skip to contentSkip to conversation

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

GIT PULL Andreas Bießmann 2 participants 2 messages Feb 7, 2015 – Feb 10, 2015

lore
Share & tools
lore
#0 lore raw

Hi Tom,

I have some atmel changes posted way before the MW has closed. Sorry for the delay, there will be some more patches to process next few days.

The following changes since commit 7f641d53bbb3a426a3bfb132d8346153e86a9d08:

Merge branch 'master' of git://git.denx.de/u-boot-ubi (2015-02-04 13:30:00 -0500)

are available in the git repository at:

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

for you to fetch changes up to 657006a1c46f11784757f9437ffaaa5e0c4dea72:

arm, at91: taurus remove MACH_TYPE definitions in config file (2015-02-07 23:43:24 +0100)

----------------------------------------------------------------
Bo Shen (14):
ARM: atmel: clock: make it possible to configure HMX32
ARM: atmel: sama5: add bus matrix header file
ARM: atmel: sama5: add sfr register header file
ARM: atmel: spl: add weak bus matrix init function
ARM: atmel: spl: add saic to aic redirect function
ARM: atmel: spl: can not disable osc for sama5d4
ARM: atmel: sama5d4: add matrix1 base addr definition
ARM: atmel: sama5d4: add bus matrix init function
ARM: atmel: sama5d4: add interrupt redirect function
ARM: atmel: sama5d4: can access DDR in interleave mode
ARM: atmel: sama5d4: build related file when enable SPL
ARM: atmel: sama5d4ek: enable SPL support
ARM: atmel: sama5d4_xplained: enable spl support
ARM: atmel: cleanup: remove at91cap9 related code

Heiko Schocher (6):
arm, at91, wdt: do not disable WDT in SPL common/board_f: add at91 wdt
arm, at91, wdt: make timeout configurable
arm, at91, taurus: enable WDT
arm, at91: add reset controller status register arm, at91: taurus remove MACH_TYPE definitions in config file

Wu, Josh (5):
mtd: atmel_nand: according to pmecc version to perform 0xff page correction
ARM: at91: mmc portA support is only for at91sam9g20ek_2mmc board
ARM: at91: sama5d3_xplained: save environment in a FAT file in MMC card
ARM: at91: sama5d3xek: save enviroment as a FAT file in MMC card
ARM: at91: at91sam9x5: save environment to a FAT file in MMC card

 README                                           |    3 +
 arch/arm/Kconfig                                 |    2 +
 arch/arm/cpu/arm926ejs/at91/Makefile             |    1 -
 arch/arm/cpu/arm926ejs/at91/at91cap9_devices.c   |  189 ----------------------
 arch/arm/cpu/armv7/at91/clock.c                  |    8 +
 arch/arm/cpu/armv7/at91/sama5d4_devices.c        |   47 ++++++
 arch/arm/cpu/at91-common/Makefile                |    1 +
 arch/arm/cpu/at91-common/mpddrc.c                |    2 +-
 arch/arm/cpu/at91-common/spl.c                   |    4 +
 arch/arm/cpu/at91-common/spl_atmel.c             |   16 ++
 arch/arm/include/asm/arch-at91/at91_common.h     |    1 +
 arch/arm/include/asm/arch-at91/at91_pmc.h        |    9 +-
 arch/arm/include/asm/arch-at91/at91_rstc.h       |    2 +
 arch/arm/include/asm/arch-at91/at91cap9.h        |   78 ---------
 arch/arm/include/asm/arch-at91/at91cap9_matrix.h |  129 ---------------
 arch/arm/include/asm/arch-at91/at91sam9_matrix.h |    2 -
 arch/arm/include/asm/arch-at91/hardware.h        |    2 -
 arch/arm/include/asm/arch-at91/sama5_matrix.h    |   37 +++++
 arch/arm/include/asm/arch-at91/sama5_sfr.h       |   38 +++++
 arch/arm/include/asm/arch-at91/sama5d4.h         |    2 +
 board/atmel/sama5d4_xplained/sama5d4_xplained.c  |   85 ++++++++++
 board/atmel/sama5d4ek/sama5d4ek.c                |   85 ++++++++++
 common/board_f.c                                 |    2 +-
 configs/at91sam9g20ek_2mmc_defconfig             |    3 +
 configs/at91sam9g20ek_mmc_defconfig              |    3 -
 configs/sama5d4_xplained_mmc_defconfig           |    1 +
 configs/sama5d4_xplained_nandflash_defconfig     |    1 +
 configs/sama5d4_xplained_spiflash_defconfig      |    1 +
 configs/sama5d4ek_mmc_defconfig                  |    1 +
 configs/sama5d4ek_nandflash_defconfig            |    1 +
 configs/sama5d4ek_spiflash_defconfig             |    1 +
 drivers/mtd/nand/atmel_nand.c                    |    9 ++
 drivers/mtd/nand/atmel_nand_ecc.h                |   20 +++
 drivers/video/atmel_lcdfb.c                      |    2 +-
 drivers/watchdog/at91sam9_wdt.c                  |    4 +
 include/configs/at91sam9260ek.h                  |    6 +-
 include/configs/at91sam9x5ek.h                   |   11 +-
 include/configs/sama5d3_xplained.h               |    9 +-
 include/configs/sama5d3xek.h                     |   10 +-
 include/configs/sama5d4_xplained.h               |   56 +++++++
 include/configs/sama5d4ek.h                      |   56 +++++++
 include/configs/taurus.h                         |    9 +-
 42 files changed, 518 insertions(+), 431 deletions(-)
 delete mode 100644 arch/arm/cpu/arm926ejs/at91/at91cap9_devices.c
 delete mode 100644 arch/arm/include/asm/arch-at91/at91cap9.h
 delete mode 100644 arch/arm/include/asm/arch-at91/at91cap9_matrix.h
 create mode 100644 arch/arm/include/asm/arch-at91/sama5_matrix.h
 create mode 100644 arch/arm/include/asm/arch-at91/sama5_sfr.h
 create mode 100644 configs/at91sam9g20ek_2mmc_defconfig
 delete mode 100644 configs/at91sam9g20ek_mmc_defconfig
#1 lore raw
Quoted 9 lines · Andreas Bie?mann

Hi Tom,

I have some atmel changes posted way before the MW has closed. Sorry for the delay, there will be some more patches to process next few days.

The following changes since commit 7f641d53bbb3a426a3bfb132d8346153e86a9d08:

Merge branch 'master' of git://git.denx.de/u-boot-ubi (2015-02-04 13:30:00 -0500)

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 657006a1c46f11784757f9437ffaaa5e0c4dea72:

arm, at91: taurus remove MACH_TYPE definitions in config file (2015-02-07 23:43:24 +0100)

Applied to u-boot/master (note there's some warnings about spl_nor.c atm), 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/20150210/eceaa739/attachment.sig>