diff options
| author | Tom Rini <trini@konsulko.com> | 2019-05-03 14:22:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-05-03 14:22:23 -0400 |
| commit | 90c2ebd2156982eee1af6faa00f6740e9f79b3c5 (patch) | |
| tree | 65408be4e60989d77b7b65f7cf5cb0e697b0b62d /include/configs | |
| parent | b362fe0848df60569bdb867b7627151747eb6e23 (diff) | |
| parent | 5859a39a43d15cb775478bd4537e9a2eac1c4cf2 (diff) | |
Merge git://git.denx.de/u-boot-marvell
- Fix in kwbimage (return code checking) (Young Xiao)
- Misc updates to Turris Omnia (Marek)
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/turris_omnia.h | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h index 5a148873c7..018f54428b 100644 --- a/include/configs/turris_omnia.h +++ b/include/configs/turris_omnia.h @@ -18,31 +18,6 @@ */ #define CONFIG_SYS_TCLK 250000000 /* 250MHz */ -/* - * Commands configuration - */ - -/* I2C support */ -#define CONFIG_DM_I2C -#define CONFIG_I2C_MUX -#define CONFIG_I2C_MUX_PCA954x -#define CONFIG_SPL_I2C_MUX -#define CONFIG_SYS_I2C_MVTWSI - -/* - * SDIO/MMC Card Configuration - */ -#define CONFIG_SYS_MMC_BASE MVEBU_SDIO_BASE - -/* - * SATA/SCSI/AHCI configuration - */ -#define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 2 -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ - CONFIG_SYS_SCSI_MAX_LUN) - /* USB/EHCI configuration */ #define CONFIG_EHCI_IS_TDI @@ -114,9 +89,16 @@ #define BOOT_TARGET_DEVICES_USB(func) #endif +#ifdef CONFIG_SCSI +#define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0) +#else +#define BOOT_TARGET_DEVICES_SCSI(func) +#endif + #define BOOT_TARGET_DEVICES(func) \ BOOT_TARGET_DEVICES_MMC(func) \ BOOT_TARGET_DEVICES_USB(func) \ + BOOT_TARGET_DEVICES_SCSI(func) \ func(PXE, pxe, na) \ func(DHCP, dhcp, na) |