Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ae02cf03bc47804e88bb2fbc7cae3560618e6547

Authored by Yuantian Tang
Committed by York Sun
1 parent f216ef252e
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: ls1012a: Add sata distro boot support 

Sata is equipped on ls1012a 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 11 additions and 19 deletions Side-by-side Diff

include/configs/ls1012a_common.h
Diff comments   View file @ ae02cf0
... ... @@ -69,6 +69,16 @@
69 69 #define CONFIG_ENV_SECT_SIZE 0x40000
70 70 #endif
71 71  
  72 +/* SATA */
  73 +#define CONFIG_SCSI_AHCI_PLAT
  74 +
  75 +#define CONFIG_SYS_SATA AHCI_BASE_ADDR
  76 +
  77 +#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1
  78 +#define CONFIG_SYS_SCSI_MAX_LUN 1
  79 +#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
  80 + CONFIG_SYS_SCSI_MAX_LUN)
  81 +
72 82 /* I2C */
73 83 #define CONFIG_SYS_I2C
74 84 #define CONFIG_SYS_I2C_MXC
... ... @@ -90,6 +100,7 @@
90 100 #include <config_distro_defaults.h>
91 101 #ifndef CONFIG_SPL_BUILD
92 102 #define BOOT_TARGET_DEVICES(func) \
  103 + func(SCSI, scsi, 0) \
93 104 func(MMC, mmc, 0) \
94 105 func(USB, usb, 0)
95 106 #include <config_distro_bootcmd.h>
include/configs/ls1012aqds.h
Diff comments   View file @ ae02cf0
... ... @@ -113,16 +113,6 @@
113 113 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
114 114 #endif
115 115  
116   -/* SATA */
117   -#define CONFIG_SCSI_AHCI_PLAT
118   -
119   -#define CONFIG_SYS_SATA AHCI_BASE_ADDR
120   -
121   -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1
122   -#define CONFIG_SYS_SCSI_MAX_LUN 1
123   -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
124   - CONFIG_SYS_SCSI_MAX_LUN)
125   -
126 116 #define CONFIG_PCIE1 /* PCIE controller 1 */
127 117  
128 118 #define CONFIG_PCI_SCAN_SHOW
include/configs/ls1012ardb.h
Diff comments   View file @ ae02cf0
... ... @@ -46,15 +46,6 @@
46 46 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
47 47 #endif
48 48  
49   -/* SATA */
50   -#define CONFIG_SCSI_AHCI_PLAT
51   -
52   -#define CONFIG_SYS_SATA AHCI_BASE_ADDR
53   -
54   -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1
55   -#define CONFIG_SYS_SCSI_MAX_LUN 1
56   -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
57   - CONFIG_SYS_SCSI_MAX_LUN)
58 49  
59 50 #define CONFIG_PCIE1 /* PCIE controller 1 */
60 51