|
@@ -6,7 +6,6 @@
|
|
|
#ifndef _CONFIG_HELIOS4_H
|
|
|
#define _CONFIG_HELIOS4_H
|
|
|
|
|
|
-#include <linux/sizes.h>
|
|
|
#include <linux/stringify.h>
|
|
|
|
|
|
/*
|
|
@@ -30,26 +29,30 @@
|
|
|
|
|
|
#define CONFIG_ENV_MIN_ENTRIES 128
|
|
|
|
|
|
+/* Environment in MMC */
|
|
|
+#define CONFIG_SYS_MMC_ENV_DEV 0
|
|
|
/*
|
|
|
- * SATA/SCSI/AHCI configuration
|
|
|
+ * For SD - reserve 1 LBA for MBR + 1M for u-boot image. The MMC/eMMC
|
|
|
+ * boot image starts @ LBA-0.
|
|
|
+ * As result in MMC/eMMC case it will be a 1 sector gap between u-boot
|
|
|
+ * image and environment
|
|
|
*/
|
|
|
-#define CONFIG_SCSI_AHCI_PLAT
|
|
|
-#define CONFIG_SYS_SCSI_MAX_SCSI_ID 2
|
|
|
-#define CONFIG_SYS_SCSI_MAX_LUN 2
|
|
|
-#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
|
|
|
- CONFIG_SYS_SCSI_MAX_LUN)
|
|
|
|
|
|
-#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI
|
|
|
-/* Environment in SPI NOR flash */
|
|
|
-#endif
|
|
|
+#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
|
|
|
|
|
|
-#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC
|
|
|
-/* Environment in MMC */
|
|
|
-#define CONFIG_SYS_MMC_ENV_DEV 0
|
|
|
-/* stay within first 1M */
|
|
|
+/* PCIe support */
|
|
|
+#ifndef CONFIG_SPL_BUILD
|
|
|
+#define CONFIG_PCI_SCAN_SHOW
|
|
|
#endif
|
|
|
|
|
|
-#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
|
|
|
+/* SATA support */
|
|
|
+#ifdef CONFIG_SCSI
|
|
|
+#define CONFIG_SCSI_AHCI_PLAT
|
|
|
+#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
|
|
|
|
|
|
/* Keep device tree and initrd in lower memory so the kernel can access them */
|
|
|
#define RELOCATION_LIMITS_ENV_SETTINGS \
|
|
@@ -57,22 +60,6 @@
|
|
|
"initrd_high=0x10000000\0"
|
|
|
|
|
|
/* SPL */
|
|
|
-/*
|
|
|
- * Select the boot device here
|
|
|
- *
|
|
|
- * Currently supported are:
|
|
|
- * SPL_BOOT_SPI_NOR_FLASH - Booting via SPI NOR flash
|
|
|
- * SPL_BOOT_SDIO_MMC_CARD - Booting via SDIO/MMC card (partition 1)
|
|
|
- */
|
|
|
-#define SPL_BOOT_SPI_NOR_FLASH 1
|
|
|
-#define SPL_BOOT_SDIO_MMC_CARD 2
|
|
|
-
|
|
|
-#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI
|
|
|
-#define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SPI_NOR_FLASH
|
|
|
-#endif
|
|
|
-#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC
|
|
|
-#define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SDIO_MMC_CARD
|
|
|
-#endif
|
|
|
|
|
|
/* Defines for SPL */
|
|
|
#define CONFIG_SPL_SIZE (140 << 10)
|
|
@@ -88,11 +75,10 @@
|
|
|
#define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
|
|
|
#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)
|
|
|
|
|
|
-#if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SPI_NOR_FLASH
|
|
|
+#if defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI)
|
|
|
+/* SPL related SPI defines */
|
|
|
#define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS
|
|
|
-#endif
|
|
|
-
|
|
|
-#if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SDIO_MMC_CARD
|
|
|
+#elif defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC) || defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_SATA)
|
|
|
/* SPL related MMC defines */
|
|
|
#define CONFIG_SYS_MMC_U_BOOT_OFFS (160 << 10)
|
|
|
#define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_MMC_U_BOOT_OFFS
|
|
@@ -100,6 +86,7 @@
|
|
|
#define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000 /* in SDRAM */
|
|
|
#endif
|
|
|
#endif
|
|
|
+
|
|
|
/*
|
|
|
* mv-common.h should be defined after CMD configs since it used them
|
|
|
* to enable certain macros
|
|
@@ -121,16 +108,46 @@
|
|
|
#define BOOT_TARGET_DEVICES_USB(func)
|
|
|
#endif
|
|
|
|
|
|
-#ifdef CONFIG_SATA
|
|
|
-#define BOOT_TARGET_DEVICES_SATA(func) func(SATA, sata, 0)
|
|
|
+#ifndef CONFIG_SCSI
|
|
|
+#define BOOT_TARGET_DEVICES_SCSI_BUS0(func)
|
|
|
+#define BOOT_TARGET_DEVICES_SCSI_BUS1(func)
|
|
|
+#define BOOT_TARGET_DEVICES_SCSI_BUS2(func)
|
|
|
+#else
|
|
|
+/*
|
|
|
+ * With SCSI enabled, M.2 SATA is always located on bus 0
|
|
|
+ */
|
|
|
+#define BOOT_TARGET_DEVICES_SCSI_BUS0(func) func(SCSI, scsi, 0)
|
|
|
+
|
|
|
+/*
|
|
|
+ * Either one or both mPCIe slots may be configured as mSATA interfaces. The
|
|
|
+ * SCSI bus ids are assigned based on sequence of hardware present, not always
|
|
|
+ * tied to hardware slot ids. As such, use second SCSI bus if either slot is
|
|
|
+ * set for SATA, and only use third SCSI bus if both slots are SATA enabled.
|
|
|
+ */
|
|
|
+#if defined (CONFIG_HELIOS4_CON2_SATA) || defined (CONFIG_HELIOS4_CON3_SATA)
|
|
|
+#define BOOT_TARGET_DEVICES_SCSI_BUS1(func) func(SCSI, scsi, 1)
|
|
|
+#else
|
|
|
+#define BOOT_TARGET_DEVICES_SCSI_BUS1(func)
|
|
|
+#endif
|
|
|
+
|
|
|
+#if defined (CONFIG_HELIOS4_CON2_SATA) && defined (CONFIG_HELIOS4_CON3_SATA)
|
|
|
+#define BOOT_TARGET_DEVICES_SCSI_BUS2(func) func(SCSI, scsi, 2)
|
|
|
#else
|
|
|
-#define BOOT_TARGET_DEVICES_SATA(func)
|
|
|
+#define BOOT_TARGET_DEVICES_SCSI_BUS2(func)
|
|
|
#endif
|
|
|
|
|
|
+#endif /* CONFIG_SCSI */
|
|
|
+
|
|
|
+/*
|
|
|
+ * The SCSI buses are attempted in increasing bus order, there is no current
|
|
|
+ * mechanism to alter the default bus priority order for booting.
|
|
|
+ */
|
|
|
#define BOOT_TARGET_DEVICES(func) \
|
|
|
BOOT_TARGET_DEVICES_MMC(func) \
|
|
|
BOOT_TARGET_DEVICES_USB(func) \
|
|
|
- BOOT_TARGET_DEVICES_SATA(func) \
|
|
|
+ BOOT_TARGET_DEVICES_SCSI_BUS0(func) \
|
|
|
+ BOOT_TARGET_DEVICES_SCSI_BUS1(func) \
|
|
|
+ BOOT_TARGET_DEVICES_SCSI_BUS2(func) \
|
|
|
func(PXE, pxe, na) \
|
|
|
func(DHCP, dhcp, na)
|
|
|
|