* [U-Boot] [PATCH 0/3] QIXIS related patches
@ 2015-12-17 9:45 Gong Qianyu
2015-12-17 9:45 ` [U-Boot] [PATCH 1/3] freescale/qixis: Add support for booting from SD/QSPI Gong Qianyu
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Gong Qianyu @ 2015-12-17 9:45 UTC (permalink / raw)
To: u-boot
Hi all,
Here are three QIXIS related patches. I have tested on LS1043AQDS board.
Please help to review. Thanks!
Regards,
Qianyu
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 1/3] freescale/qixis: Add support for booting from SD/QSPI
2015-12-17 9:45 [U-Boot] [PATCH 0/3] QIXIS related patches Gong Qianyu
@ 2015-12-17 9:45 ` Gong Qianyu
2015-12-17 9:45 ` [U-Boot] [PATCH 2/3] armv8/ls1043aqds: fix qixis_reset command issue Gong Qianyu
2015-12-17 9:45 ` [U-Boot] [PATCH 3/3] armv8/ls1043aqds: enable qixis_reset command to boot from NAND/SD Gong Qianyu
2 siblings, 0 replies; 4+ messages in thread
From: Gong Qianyu @ 2015-12-17 9:45 UTC (permalink / raw)
To: u-boot
1.Use "qixis_reset sd" to boot from SD
2.Use "qixis_reset sd_qspi" to boot from SD with QSPI support
3.Use "qixis_reset qspi" to boot from QSPI flash
On some SoCs such as LS1021A and LS1043A, IFC and QSPI could be
pin-multiplexed. So the switches are different between SD boot with
IFC support and SD boot with QSPI support. The default booting from
SD is with IFC support.
Signed-off-by: Gong Qianyu <Qianyu.Gong@freescale.com>
---
board/freescale/common/qixis.c | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/board/freescale/common/qixis.c b/board/freescale/common/qixis.c
index 9f6b0e7..8642fec 100644
--- a/board/freescale/common/qixis.c
+++ b/board/freescale/common/qixis.c
@@ -216,6 +216,39 @@ int qixis_reset_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
#else
printf("Not implemented\n");
#endif
+ } else if (strcmp(argv[1], "sd") == 0) {
+#ifdef QIXIS_LBMAP_SD
+ QIXIS_WRITE(rst_ctl, 0x30);
+ QIXIS_WRITE(rcfg_ctl, 0);
+ set_lbmap(QIXIS_LBMAP_SD);
+ set_rcw_src(QIXIS_RCW_SRC_SD);
+ QIXIS_WRITE(rcfg_ctl, 0x20);
+ QIXIS_WRITE(rcfg_ctl, 0x21);
+#else
+ printf("Not implemented\n");
+#endif
+ } else if (strcmp(argv[1], "sd_qspi") == 0) {
+#ifdef QIXIS_LBMAP_SD_QSPI
+ QIXIS_WRITE(rst_ctl, 0x30);
+ QIXIS_WRITE(rcfg_ctl, 0);
+ set_lbmap(QIXIS_LBMAP_SD_QSPI);
+ set_rcw_src(QIXIS_RCW_SRC_SD);
+ QIXIS_WRITE(rcfg_ctl, 0x20);
+ QIXIS_WRITE(rcfg_ctl, 0x21);
+#else
+ printf("Not implemented\n");
+#endif
+ } else if (strcmp(argv[1], "qspi") == 0) {
+#ifdef QIXIS_LBMAP_QSPI
+ QIXIS_WRITE(rst_ctl, 0x30);
+ QIXIS_WRITE(rcfg_ctl, 0);
+ set_lbmap(QIXIS_LBMAP_QSPI);
+ set_rcw_src(QIXIS_RCW_SRC_QSPI);
+ QIXIS_WRITE(rcfg_ctl, 0x20);
+ QIXIS_WRITE(rcfg_ctl, 0x21);
+#else
+ printf("Not implemented\n");
+#endif
} else if (strcmp(argv[1], "watchdog") == 0) {
static char *period[9] = {"2s", "4s", "8s", "16s", "32s",
"1min", "2min", "4min", "8min"};
@@ -255,6 +288,9 @@ U_BOOT_CMD(
"- hard reset to default bank\n"
"qixis_reset altbank - reset to alternate bank\n"
"qixis_reset nand - reset to nand\n"
+ "qixis_reset sd - reset to sd\n"
+ "qixis_reset sd_qspi - reset to sd with qspi support\n"
+ "qixis_reset qspi - reset to qspi\n"
"qixis watchdog <watchdog_period> - set the watchdog period\n"
" period: 1s 2s 4s 8s 16s 32s 1min 2min 4min 8min\n"
"qixis_reset dump - display the QIXIS registers\n"
--
2.1.0.27.g96db324
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 2/3] armv8/ls1043aqds: fix qixis_reset command issue
2015-12-17 9:45 [U-Boot] [PATCH 0/3] QIXIS related patches Gong Qianyu
2015-12-17 9:45 ` [U-Boot] [PATCH 1/3] freescale/qixis: Add support for booting from SD/QSPI Gong Qianyu
@ 2015-12-17 9:45 ` Gong Qianyu
2015-12-17 9:45 ` [U-Boot] [PATCH 3/3] armv8/ls1043aqds: enable qixis_reset command to boot from NAND/SD Gong Qianyu
2 siblings, 0 replies; 4+ messages in thread
From: Gong Qianyu @ 2015-12-17 9:45 UTC (permalink / raw)
To: u-boot
Signed-off-by: Gong Qianyu <Qianyu.Gong@freescale.com>
---
include/configs/ls1043aqds.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h
index 4aeb238..346a858 100644
--- a/include/configs/ls1043aqds.h
+++ b/include/configs/ls1043aqds.h
@@ -195,7 +195,7 @@ unsigned long get_board_ddr_clk(void);
#define QIXIS_LBMAP_SHIFT 0
#define QIXIS_LBMAP_DFLTBANK 0x00
#define QIXIS_LBMAP_ALTBANK 0x04
-#define QIXIS_RST_CTL_RESET 0x44
+#define QIXIS_RST_CTL_RESET 0x41
#define QIXIS_RCFG_CTL_RECONFIG_IDLE 0x20
#define QIXIS_RCFG_CTL_RECONFIG_START 0x21
#define QIXIS_RCFG_CTL_WATCHDOG_ENBLE 0x08
--
2.1.0.27.g96db324
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 3/3] armv8/ls1043aqds: enable qixis_reset command to boot from NAND/SD
2015-12-17 9:45 [U-Boot] [PATCH 0/3] QIXIS related patches Gong Qianyu
2015-12-17 9:45 ` [U-Boot] [PATCH 1/3] freescale/qixis: Add support for booting from SD/QSPI Gong Qianyu
2015-12-17 9:45 ` [U-Boot] [PATCH 2/3] armv8/ls1043aqds: fix qixis_reset command issue Gong Qianyu
@ 2015-12-17 9:45 ` Gong Qianyu
2 siblings, 0 replies; 4+ messages in thread
From: Gong Qianyu @ 2015-12-17 9:45 UTC (permalink / raw)
To: u-boot
Signed-off-by: Gong Qianyu <Qianyu.Gong@freescale.com>
---
include/configs/ls1043aqds.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h
index 346a858..58c7144 100644
--- a/include/configs/ls1043aqds.h
+++ b/include/configs/ls1043aqds.h
@@ -195,6 +195,10 @@ unsigned long get_board_ddr_clk(void);
#define QIXIS_LBMAP_SHIFT 0
#define QIXIS_LBMAP_DFLTBANK 0x00
#define QIXIS_LBMAP_ALTBANK 0x04
+#define QIXIS_LBMAP_NAND 0x09
+#define QIXIS_LBMAP_SD 0x00
+#define QIXIS_RCW_SRC_NAND 0x106
+#define QIXIS_RCW_SRC_SD 0x040
#define QIXIS_RST_CTL_RESET 0x41
#define QIXIS_RCFG_CTL_RECONFIG_IDLE 0x20
#define QIXIS_RCFG_CTL_RECONFIG_START 0x21
--
2.1.0.27.g96db324
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-12-17 9:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-17 9:45 [U-Boot] [PATCH 0/3] QIXIS related patches Gong Qianyu
2015-12-17 9:45 ` [U-Boot] [PATCH 1/3] freescale/qixis: Add support for booting from SD/QSPI Gong Qianyu
2015-12-17 9:45 ` [U-Boot] [PATCH 2/3] armv8/ls1043aqds: fix qixis_reset command issue Gong Qianyu
2015-12-17 9:45 ` [U-Boot] [PATCH 3/3] armv8/ls1043aqds: enable qixis_reset command to boot from NAND/SD Gong Qianyu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.