Skip to contentSkip to conversation

arm64: ls1046a: Add sata distro boot support

PATCH New Yuantian Tang 2 participants 4 messages Jan 3, 2018 – Jan 19, 2018

lore
Share & tools
lore

Yuantian Tang

author
#0 lore raw

PATCH 1/2 arm64: ls1046a: Add sata distro boot support

Sata is equipped on ls1046a and can be a boot source. Add sata boot support as a option if available.

Signed-off-by Tang Yuantian <[email protected]>
---
 include/configs/ls1046a_common.h |   13 +++++++++++++
 include/configs/ls1046aqds.h     |   10 ----------
 include/configs/ls1046ardb.h     |   12 ------------
 3 files changed, 13 insertions(+), 22 deletions(-)
include/configs/ls1046a_common.h +13 -0
index e208f7d..309bfd8 100644
@@ -145,6 +145,18 @@
 #define CONFIG_PCI_SCAN_SHOW
 #endif
 
+/* SATA */
+#ifndef SPL_NO_SATA
+#define CONFIG_SCSI_AHCI_PLAT
+
+#define CONFIG_SYS_SATA				AHCI_BASE_ADDR
+
+#define CONFIG_SYS_SCSI_MAX_SCSI_ID		1
+#define CONFIG_SYS_SCSI_MAX_LUN			1
+#define CONFIG_SYS_SCSI_MAX_DEVICE		(CONFIG_SYS_SCSI_MAX_SCSI_ID * \
+						CONFIG_SYS_SCSI_MAX_LUN)
+#endif
+
 /* Command line configuration */
 
 /* MMC */

@@ -201,6 +213,7 @@
 #include <config_distro_defaults.h>
 #ifndef CONFIG_SPL_BUILD
 #define BOOT_TARGET_DEVICES(func) \
+	func(SCSI, scsi, 0) \
 	func(MMC, mmc, 0) \
 	func(USB, usb, 0)
 #include <config_distro_bootcmd.h>
include/configs/ls1046aqds.h +0 -10
index c3b0f4d..456f61a 100644
@@ -136,9 +136,6 @@ unsigned long get_board_ddr_clk(void);
 #define CFG_LPUART_EN		0x2
 #endif
 
-/* SATA */
-#define CONFIG_SCSI_AHCI_PLAT
-
 /* EEPROM */
 #define CONFIG_ID_EEPROM
 #define CONFIG_SYS_I2C_EEPROM_NXID

@@ -148,13 +145,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS	3
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS	5
 
-#define CONFIG_SYS_SATA				AHCI_BASE_ADDR
-
-#define CONFIG_SYS_SCSI_MAX_SCSI_ID		1
-#define CONFIG_SYS_SCSI_MAX_LUN			1
-#define CONFIG_SYS_SCSI_MAX_DEVICE		(CONFIG_SYS_SCSI_MAX_SCSI_ID * \
-						CONFIG_SYS_SCSI_MAX_LUN)
-
 /*
  * IFC Definitions
  */
include/configs/ls1046ardb.h +0 -12
index 784894f..f4f4fd7 100644
@@ -209,18 +209,6 @@
 #endif
 #endif
 
-/* SATA */
-#ifndef SPL_NO_SATA
-#define CONFIG_SCSI_AHCI_PLAT
-
-#define CONFIG_SYS_SATA				AHCI_BASE_ADDR
-
-#define CONFIG_SYS_SCSI_MAX_SCSI_ID		1
-#define CONFIG_SYS_SCSI_MAX_LUN			1
-#define CONFIG_SYS_SCSI_MAX_DEVICE		(CONFIG_SYS_SCSI_MAX_SCSI_ID * \
-						CONFIG_SYS_SCSI_MAX_LUN)
-#endif
-
 #ifndef SPL_NO_MISC
 #undef CONFIG_BOOTCOMMAND
 #if defined(CONFIG_QSPI_BOOT)
Signature · 1 line
1.7.1
author
#1 lore raw

PATCH 2/2 arm64: ls1012a: Add sata distro boot support

Sata is equipped on ls1012a and can be a boot source. Add sata boot support as a option if available.

Signed-off-by Tang Yuantian <[email protected]>
---
 include/configs/ls1012a_common.h |   11 +++++++++++
 include/configs/ls1012aqds.h     |   10 ----------
 include/configs/ls1012ardb.h     |    9 ---------
 3 files changed, 11 insertions(+), 19 deletions(-)
include/configs/ls1012a_common.h +11 -0
index db920bc..c57c08e 100644
@@ -69,6 +69,16 @@
 #define CONFIG_ENV_SECT_SIZE		0x40000
 #endif
 
+/* SATA */
+#define CONFIG_SCSI_AHCI_PLAT
+
+#define CONFIG_SYS_SATA				AHCI_BASE_ADDR
+
+#define CONFIG_SYS_SCSI_MAX_SCSI_ID		1
+#define CONFIG_SYS_SCSI_MAX_LUN			1
+#define CONFIG_SYS_SCSI_MAX_DEVICE		(CONFIG_SYS_SCSI_MAX_SCSI_ID * \
+						CONFIG_SYS_SCSI_MAX_LUN)
+
 /* I2C */
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_MXC

@@ -90,6 +100,7 @@
 #include <config_distro_defaults.h>
 #ifndef CONFIG_SPL_BUILD
 #define BOOT_TARGET_DEVICES(func) \
+	func(SCSI, scsi, 0) \
 	func(MMC, mmc, 0) \
 	func(USB, usb, 0)
 #include <config_distro_bootcmd.h>
include/configs/ls1012aqds.h +0 -10
index af5f37c..47d863a 100644
@@ -124,16 +124,6 @@
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
 #endif
 
-/* SATA */
-#define CONFIG_SCSI_AHCI_PLAT
-
-#define CONFIG_SYS_SATA				AHCI_BASE_ADDR
-
-#define CONFIG_SYS_SCSI_MAX_SCSI_ID		1
-#define CONFIG_SYS_SCSI_MAX_LUN			1
-#define CONFIG_SYS_SCSI_MAX_DEVICE		(CONFIG_SYS_SCSI_MAX_SCSI_ID * \
-						CONFIG_SYS_SCSI_MAX_LUN)
-
 #define CONFIG_PCIE1		/* PCIE controller 1 */
 
 #define CONFIG_PCI_SCAN_SHOW
include/configs/ls1012ardb.h +0 -9
index ab139b0..438b5a6 100644
@@ -46,15 +46,6 @@
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
 #endif
 
-/* SATA */
-#define CONFIG_SCSI_AHCI_PLAT
-
-#define CONFIG_SYS_SATA				AHCI_BASE_ADDR
-
-#define CONFIG_SYS_SCSI_MAX_SCSI_ID		1
-#define CONFIG_SYS_SCSI_MAX_LUN			1
-#define CONFIG_SYS_SCSI_MAX_DEVICE		(CONFIG_SYS_SCSI_MAX_SCSI_ID * \
-						CONFIG_SYS_SCSI_MAX_LUN)
 
 #define CONFIG_PCIE1		/* PCIE controller 1 */
Signature · 1 line
1.7.1
#2 lore raw

PATCH 2/2 arm64: ls1012a: Add sata distro boot support

Quoted 5 lines · Yuantian Tang

Sata is equipped on ls1012a and can be a boot source. Add sata boot support as a option if available.

Signed-off-by Tang Yuantian <[email protected]>

---

Minor change to commit message.
Applied to fsl-qoriq master. Thanks.

York