diff options
| author | Yuantian Tang <andy.tang@nxp.com> | 2018-01-03 09:43:52 (GMT) |
|---|---|---|
| committer | Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com> | 2018-01-08 06:00:07 (GMT) |
| commit | cc92828fc888b8d0585517e1413e01c1d7331779 (patch) | |
| tree | 248bf01595cb4ecb7b28f43982a4393904415a43 | |
| parent | 8f2dd3f9362d9a804a629ab6924e28236fe51e67 (diff) | |
| download | u-boot-cc92828fc888b8d0585517e1413e01c1d7331779.tar.xz | |
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 <andy.tang@nxp.com>
| -rw-r--r-- | include/configs/ls1046a_common.h | 17 | ||||
| -rw-r--r-- | include/configs/ls1046aqds.h | 12 | ||||
| -rw-r--r-- | include/configs/ls1046ardb.h | 14 |
3 files changed, 16 insertions, 27 deletions
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index e208f7d..3f9438f 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -147,6 +147,20 @@ /* Command line configuration */ +/* SATA */ +#ifndef SPL_NO_SATA +#define CONFIG_LIBATA +#define CONFIG_SCSI_AHCI +#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 + /* MMC */ #ifndef SPL_NO_MMC #ifdef CONFIG_MMC @@ -202,7 +216,8 @@ #ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ - func(USB, usb, 0) + func(USB, usb, 0) \ + func(SCSI, scsi, 0) #include <config_distro_bootcmd.h> #endif diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 29dc6d9..456f61a 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -136,11 +136,6 @@ unsigned long get_board_ddr_clk(void); #define CFG_LPUART_EN 0x2 #endif -/* SATA */ -#define CONFIG_LIBATA -#define CONFIG_SCSI_AHCI -#define CONFIG_SCSI_AHCI_PLAT - /* EEPROM */ #define CONFIG_ID_EEPROM #define CONFIG_SYS_I2C_EEPROM_NXID @@ -150,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 */ diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index 42c126f..2755f1c 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -211,20 +211,6 @@ #endif #endif -/* SATA */ -#ifndef SPL_NO_SATA -#define CONFIG_LIBATA -#define CONFIG_SCSI_AHCI -#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) |