Skip to contentSkip to conversation

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

GIT PULL New Andreas Bießmann 3 participants 4 messages Mar 20, 2015 – Mar 23, 2015 Arm/Microchip (AT91) SoC support

lore
Share & tools
lore
#0 lore raw

Hi Tom,

I have a few fixes for atmel devices, please pull them into u-boot/master.

There are still some more on my patchwork todo list regarding SPL for armv5 atmel devices. I will check them this weekend and maybe request another pull beginning of next week.

The following changes since commit 052a681bae8ee91c9854089549b20c857d499fd7:

Prepare v2015.04-rc4 (2015-03-17 16:37:48 -0400)

are available in the git repository at:

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

for you to fetch changes up to 8e7a96364bc29073e5246d331a11ce8602d5d6a3:

ARM: atmel: sama5d4: set non-secured for peripherals (2015-03-18 23:36:10 +0100)

----------------------------------------------------------------
Bo Shen (5):
ARM: atmel: sama5d4 xplained: enable mmc power
ARM: atmel: sama5d4 boards: fix spl lds location
ARM: atmel: armv7: move spl lds to armv7 directory
Net: macb: reset GBE bit when fallback checking
ARM: atmel: sama5d4: set non-secured for peripherals

Wu, Josh (4):
ARM: at91: at91sam9rlek: update the default nand flash configs
ARM: at91: at91sam9rlek: add mci support
ARM: at91: at91sam9rlek: add mmc environment configuration
ARM: at91: at91sam9rlek: add hush parser to defconfig

 arch/arm/mach-at91/arm926ejs/at91sam9rl_devices.c |   17 ++++++++
 arch/arm/mach-at91/armv7/sama5d4_devices.c        |    9 ++++
 arch/arm/mach-at91/{ => armv7}/u-boot-spl.lds     |    0
 board/atmel/at91sam9rlek/at91sam9rlek.c           |   10 +++++
 board/atmel/sama5d4_xplained/sama5d4_xplained.c   |    3 ++
 configs/at91sam9rlek_dataflash_defconfig          |    1 +
 configs/at91sam9rlek_mmc_defconfig                |    4 ++
 configs/at91sam9rlek_nandflash_defconfig          |    1 +
 drivers/net/macb.c                                |    2 +-
 include/configs/at91sam9rlek.h                    |   47 +++++++++++++++++----
 include/configs/sama5d3_xplained.h                |    2 +-
 include/configs/sama5d3xek.h                      |    2 +-
 include/configs/sama5d4_xplained.h                |    2 +-
 include/configs/sama5d4ek.h                       |    2 +-
 14 files changed, 89 insertions(+), 13 deletions(-)
 rename arch/arm/mach-at91/{ => armv7}/u-boot-spl.lds (100%)
 create mode 100644 configs/at91sam9rlek_mmc_defconfig
#1 lore raw

PATCH 1/1 at91sam9rlek_mmc_defconfig: Add CONFIG_ARCH_AT91=y

This flag was missing and thus the board was totally being configured wrong.

---
 configs/at91sam9rlek_mmc_defconfig |    1 +
 1 file changed, 1 insertion(+)
configs/at91sam9rlek_mmc_defconfig +1 -0
index 8704140..41a2821 100644
@@ -1,4 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_MMC"
 CONFIG_ARM=y
+CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9RLEK=y
 CONFIG_HUSH_PARSER=y
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 1/1 at91sam9rlek_mmc_defconfig: Add CONFIG_ARCH_AT91=y

Hi, Tom

Thanks for fix this issue in mainline. I forgot to aligned it with mainline defconfig.

Best Regards,
Josh Wu

Quoted 18 lines · Tom Rini

This flag was missing and thus the board was totally being configured wrong.

---
  configs/at91sam9rlek_mmc_defconfig |    1 +
  1 file changed, 1 insertion(+)
configs/at91sam9rlek_mmc_defconfig +1 -0
index 8704140..41a2821 100644
@@ -1,4 +1,5 @@
  CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_MMC"
  CONFIG_ARM=y
+CONFIG_ARCH_AT91=y
  CONFIG_TARGET_AT91SAM9RLEK=y
  CONFIG_HUSH_PARSER=y
#3 lore raw
In reply to Andreas Bießmann
Quoted 12 lines · Andreas Bie?mann

Hi Tom,

I have a few fixes for atmel devices, please pull them into u-boot/master.

There are still some more on my patchwork todo list regarding SPL for armv5 atmel devices. I will check them this weekend and maybe request another pull beginning of next week.

The following changes since commit 052a681bae8ee91c9854089549b20c857d499fd7:

Prepare v2015.04-rc4 (2015-03-17 16:37:48 -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 8e7a96364bc29073e5246d331a11ce8602d5d6a3:

ARM: atmel: sama5d4: set non-secured for peripherals (2015-03-18 23:36:10 +0100)

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/20150320/d8d4e40e/attachment.sig>