summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQianyu Gong <qianyu.gong@nxp.com>2016-04-25 16:53:53 +0800
committerYork Sun <york.sun@nxp.com>2016-05-18 08:51:45 -0700
commit1297cdb452fcdc6e7149c6761e43629f9c732010 (patch)
tree7043e0549c8e260d1f9e9e855a90af625b26fe1c
parent869bf86811a7c942dc48b294d5c0442b1f57ab53 (diff)
downloadtalos-obmc-uboot-1297cdb452fcdc6e7149c6761e43629f9c732010.tar.gz
talos-obmc-uboot-1297cdb452fcdc6e7149c6761e43629f9c732010.zip
armv8: ls1043a: copy kernel from QSPI when booting with QSPI enabled
IFC won't be initialized in U-Boot if QSPI is enabled on LS1043AQDS. So this patch could fix 'sync abort' caused by autoboot that tries to access IFC address. Signed-off-by: Gong Qianyu <Qianyu.Gong@nxp.com> Reviewed-by: York Sun <york.sun@nxp.com>
-rw-r--r--include/configs/ls1043a_common.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 54968b5231..a7d49ed6e8 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -257,8 +257,13 @@
#define CONFIG_BOOTARGS "console=ttyS0,115200 root=/dev/ram0 " \
"earlycon=uart8250,mmio,0x21c0500"
+#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
+#define CONFIG_BOOTCOMMAND "sf probe && sf read $kernel_load " \
+ "e0000 f00000 && bootm $kernel_load"
+#else
#define CONFIG_BOOTCOMMAND "cp.b $kernel_start $kernel_load " \
"$kernel_size && bootm $kernel_load"
+#endif
#define CONFIG_BOOTDELAY 10
/* Monitor Command Prompt */
OpenPOWER on IntegriCloud