On 06/12/2016 10:13 PM, Andreas Bießmann wrote:
On 14.05.16 23:43, Marek Vasut wrote:
Extend the boot device autodetection from SAMA5D2 only to the entire SAMA5Dx family of microcontrollers.
Signed-off-by: Marek Vasut marex@denx.de Cc: Andreas Bießmann andreas.devel@googlemail.com Cc: Wenyou Yang wenyou.yang@atmel.com
Reviewed-by: Andreas Bießmann andreas@biessmann.org
with minor comment below ...
arch/arm/mach-at91/Makefile | 4 ++-- arch/arm/mach-at91/include/mach/sama5_boot.h | 25 +++++++++++++++++++++++++ arch/arm/mach-at91/include/mach/sama5d2.h | 12 ------------ arch/arm/mach-at91/spl.c | 19 ++++++++++++------- 4 files changed, 39 insertions(+), 21 deletions(-) create mode 100644 arch/arm/mach-at91/include/mach/sama5_boot.h
diff --git a/arch/arm/mach-at91/spl.c b/arch/arm/mach-at91/spl.c index 236c8ec..e626b66 100644 --- a/arch/arm/mach-at91/spl.c +++ b/arch/arm/mach-at91/spl.c @@ -23,20 +23,22 @@ void at91_disable_wdt(void) } #endif
-#if defined(CONFIG_SAMA5D2) +#if defined(CONFIG_SAMA5) || defined(CONFIG_SAMA5D3) || \
we should stay with CONFIG_SAMA5D2 here ... will fix it while applying
Gah, thanks!