diff options
| author | Marek Vasut <marex@denx.de> | 2017-05-02 18:27:50 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-06-29 17:31:06 (GMT) |
| commit | e3f40720bac263c00b5f78777fa948775ed1330f (patch) | |
| tree | 27f69305f72e77550c09a93e2554b4d48915edcc /include/configs | |
| parent | 7c22476b1983cb1a78933e623f25cda659609ba7 (diff) | |
| download | u-boot-fsl-qoriq-e3f40720bac263c00b5f78777fa948775ed1330f.tar.xz | |
ARM: at91: ma5d4: Support both SF and eMMC SoMs
Discern the SoMs based on the presence of SPI flash to support both
variants of the SoM, one booting from SPI NOR and one booting from
eMMC.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/ma5d4evk.h | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index c2f9182..82aee15 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -13,6 +13,7 @@ #include "at91-sama5_common.h" #undef CONFIG_BOOTARGS #define CONFIG_SYS_USE_SERIALFLASH 1 +#define CONFIG_BOARD_LATE_INIT /* * Memory configurations @@ -174,18 +175,23 @@ "nfsargs=" \ "setenv bootargs root=/dev/nfs rw " \ "nfsroot=${serverip}:${rootpath},v3,tcp\0" \ + "fdtimg=if test ${bootmode} = \"sf\" ; then " \ + "setenv kernel_fdt 1 ; " \ + "else ; " \ + "setenv kernel_fdt 2 ; " \ + "fi\0" \ "mmc_mmc=" \ - "run mmcload mmcargs addargs ; " \ - "bootm ${kernel_addr_r}\0" \ + "run fdtimg mmcload mmcargs addargs ; " \ + "bootm ${kernel_addr_r}:kernel@1 - ${kernel_addr_r}:fdt@${kernel_fdt}\0" \ "mmc_nfs=" \ - "run mmcload nfsargs addip addargs ; " \ - "bootm ${kernel_addr_r}\0" \ + "run fdtimg mmcload nfsargs addip addargs ; " \ + "bootm ${kernel_addr_r}:kernel@1 - ${kernel_addr_r}:fdt@${kernel_fdt}\0" \ "net_mmc=" \ - "run netload mmcargs addargs ; " \ - "bootm ${kernel_addr_r}\0" \ + "run fdtimg netload mmcargs addargs ; " \ + "bootm ${kernel_addr_r}:kernel@1 - ${kernel_addr_r}:fdt@${kernel_fdt}\0" \ "net_nfs=" \ - "run netload nfsargs addip addargs ; " \ - "bootm ${kernel_addr_r}\0" \ + "run fdtimg netload nfsargs addip addargs ; " \ + "bootm ${kernel_addr_r}:kernel@1 - ${kernel_addr_r}:fdt@${kernel_fdt}\0" \ "try_bootscript=" \ "mmc rescan;" \ "if test -e mmc 1:1 ${bootscript} ; then " \ |