Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit f216ef252eb857167d2f6e58d646ff8dbf28abd1

Authored by Yuantian Tang
Committed by York Sun
1 parent 1f0ce3259e
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

arm64: ls1046a: Add sata distro boot support 

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

Signed-off-by: Tang Yuantian <andy.tang@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>

Showing 3 changed files with 13 additions and 22 deletions Side-by-side Diff

include/configs/ls1046a_common.h
Diff comments   View file @ f216ef2
... ... @@ -145,6 +145,18 @@
145 145 #define CONFIG_PCI_SCAN_SHOW
146 146 #endif
147 147  
  148 +/* SATA */
  149 +#ifndef SPL_NO_SATA
  150 +#define CONFIG_SCSI_AHCI_PLAT
  151 +
  152 +#define CONFIG_SYS_SATA AHCI_BASE_ADDR
  153 +
  154 +#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1
  155 +#define CONFIG_SYS_SCSI_MAX_LUN 1
  156 +#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
  157 + CONFIG_SYS_SCSI_MAX_LUN)
  158 +#endif
  159 +
148 160 /* Command line configuration */
149 161  
150 162 /* MMC */
... ... @@ -197,6 +209,7 @@
197 209 #include <config_distro_defaults.h>
198 210 #ifndef CONFIG_SPL_BUILD
199 211 #define BOOT_TARGET_DEVICES(func) \
  212 + func(SCSI, scsi, 0) \
200 213 func(MMC, mmc, 0) \
201 214 func(USB, usb, 0)
202 215 #include <config_distro_bootcmd.h>
include/configs/ls1046aqds.h
Diff comments   View file @ f216ef2
... ... @@ -136,9 +136,6 @@
136 136 #define CFG_LPUART_EN 0x2
137 137 #endif
138 138  
139   -/* SATA */
140   -#define CONFIG_SCSI_AHCI_PLAT
141   -
142 139 /* EEPROM */
143 140 #define CONFIG_ID_EEPROM
144 141 #define CONFIG_SYS_I2C_EEPROM_NXID
... ... @@ -147,13 +144,6 @@
147 144 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
148 145 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
149 146 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5
150   -
151   -#define CONFIG_SYS_SATA AHCI_BASE_ADDR
152   -
153   -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1
154   -#define CONFIG_SYS_SCSI_MAX_LUN 1
155   -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
156   - CONFIG_SYS_SCSI_MAX_LUN)
157 147  
158 148 /*
159 149 * IFC Definitions
include/configs/ls1046ardb.h
Diff comments   View file @ f216ef2
... ... @@ -211,18 +211,6 @@
211 211 #endif
212 212 #endif
213 213  
214   -/* SATA */
215   -#ifndef SPL_NO_SATA
216   -#define CONFIG_SCSI_AHCI_PLAT
217   -
218   -#define CONFIG_SYS_SATA AHCI_BASE_ADDR
219   -
220   -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1
221   -#define CONFIG_SYS_SCSI_MAX_LUN 1
222   -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
223   - CONFIG_SYS_SCSI_MAX_LUN)
224   -#endif
225   -
226 214 #ifndef SPL_NO_MISC
227 215 #undef CONFIG_BOOTCOMMAND
228 216 #if defined(CONFIG_QSPI_BOOT)