[U-Boot] [PULL] u-boot-atmel/master -> u-boot/master
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
This flag was missing and thus the board was totally being configured wrong.
Signed-off-by: Tom Rini trini@konsulko.com --- configs/at91sam9rlek_mmc_defconfig | 1 + 1 file changed, 1 insertion(+)
diff --git a/configs/at91sam9rlek_mmc_defconfig b/configs/at91sam9rlek_mmc_defconfig index 8704140..41a2821 100644 --- a/configs/at91sam9rlek_mmc_defconfig +++ b/configs/at91sam9rlek_mmc_defconfig @@ -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
Hi, Tom
Thanks for fix this issue in mainline. I forgot to aligned it with mainline defconfig.
Best Regards, Josh Wu
On 3/20/2015 10:48 PM, Tom Rini wrote:
This flag was missing and thus the board was totally being configured wrong.
Signed-off-by: Tom Rini trini@konsulko.com
configs/at91sam9rlek_mmc_defconfig | 1 + 1 file changed, 1 insertion(+)
diff --git a/configs/at91sam9rlek_mmc_defconfig b/configs/at91sam9rlek_mmc_defconfig index 8704140..41a2821 100644 --- a/configs/at91sam9rlek_mmc_defconfig +++ b/configs/at91sam9rlek_mmc_defconfig @@ -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
On Fri, Mar 20, 2015 at 08:42:07AM +0100, Andreas Bießmann wrote:
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)
Applied to u-boot/master, thanks!
participants (3)
-
Andreas Bießmann -
Josh Wu -
Tom Rini