89 lines
2.4 KiB
Diff
89 lines
2.4 KiB
Diff
|
diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig
|
||
|
|
index 04290710a7..15ea602bc3 100644
|
||
|
|
--- a/configs/clearfog_defconfig
|
||
|
|
+++ b/configs/clearfog_defconfig
|
||
|
|
@@ -8,7 +8,6 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
|
||
|
|
CONFIG_SYS_MALLOC_F_LEN=0x2000
|
||
|
|
CONFIG_TARGET_CLEARFOG=y
|
||
|
|
CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC=y
|
||
|
|
-CONFIG_SPL_MMC_SUPPORT=y
|
||
|
|
CONFIG_SPL_SERIAL_SUPPORT=y
|
||
|
|
CONFIG_SPL=y
|
||
|
|
CONFIG_DEBUG_UART_BASE=0xd0012000
|
||
|
|
@@ -50,7 +49,6 @@ CONFIG_MMC_SDHCI_MV=y
|
||
|
|
CONFIG_SPI_FLASH=y
|
||
|
|
CONFIG_SF_DEFAULT_BUS=1
|
||
|
|
CONFIG_SPI_FLASH_WINBOND=y
|
||
|
|
-CONFIG_SPI_FLASH_MTD=y
|
||
|
|
CONFIG_PHY_MARVELL=y
|
||
|
|
CONFIG_PHY_GIGE=y
|
||
|
|
CONFIG_MVNETA=y
|
||
|
|
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
|
||
|
|
index c51cf28450..d0e023ae44 100644
|
||
|
|
--- a/include/configs/clearfog.h
|
||
|
|
+++ b/include/configs/clearfog.h
|
||
|
|
@@ -6,6 +6,8 @@
|
||
|
|
#ifndef _CONFIG_CLEARFOG_H
|
||
|
|
#define _CONFIG_CLEARFOG_H
|
||
|
|
|
||
|
|
+#include <linux/sizes.h>
|
||
|
|
+
|
||
|
|
/*
|
||
|
|
* High Level Configuration Options (easy to change)
|
||
|
|
*/
|
||
|
|
@@ -21,7 +23,19 @@
|
||
|
|
* Commands configuration
|
||
|
|
*/
|
||
|
|
|
||
|
|
-/* SPI NOR flash default params, used by sf commands */
|
||
|
|
+#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI
|
||
|
|
+/*
|
||
|
|
+ * SPI Flash configuration for the environment access
|
||
|
|
+ */
|
||
|
|
+#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
|
||
|
|
+#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
|
||
|
|
+#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
|
||
|
|
+
|
||
|
|
+/* Environment in SPI NOR flash */
|
||
|
|
+#define CONFIG_ENV_SECT_SIZE SZ_64K
|
||
|
|
+#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
|
||
|
|
+#define CONFIG_ENV_OFFSET SZ_1M
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
/*
|
||
|
|
* SDIO/MMC Card Configuration
|
||
|
|
@@ -37,6 +51,7 @@
|
||
|
|
|
||
|
|
#define CONFIG_ENV_MIN_ENTRIES 128
|
||
|
|
|
||
|
|
+#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC
|
||
|
|
/* Environment in MMC */
|
||
|
|
#define CONFIG_SYS_MMC_ENV_DEV 0
|
||
|
|
#define CONFIG_ENV_SECT_SIZE 0x200
|
||
|
|
@@ -49,6 +64,7 @@
|
||
|
|
*/
|
||
|
|
#define CONFIG_ENV_OFFSET 0xf0000
|
||
|
|
#define CONFIG_ENV_ADDR CONFIG_ENV_OFFSET
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
|
||
|
|
|
||
|
|
@@ -90,10 +106,14 @@
|
||
|
|
|
||
|
|
#if defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI)
|
||
|
|
/* SPL related SPI defines */
|
||
|
|
+#define CONFIG_SPL_SPI_FLASH_SUPPORT
|
||
|
|
+#define CONFIG_SPL_SPI_LOAD
|
||
|
|
+#define CONFIG_SPL_SPI_SUPPORT
|
||
|
|
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000
|
||
|
|
#define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS
|
||
|
|
#elif defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC)
|
||
|
|
/* SPL related MMC defines */
|
||
|
|
+#define CONFIG_SPL_MMC_SUPPORT
|
||
|
|
#define CONFIG_SYS_MMC_U_BOOT_OFFS (160 << 10)
|
||
|
|
#define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_MMC_U_BOOT_OFFS
|
||
|
|
#ifdef CONFIG_SPL_BUILD
|
||
|
|
--
|
||
|
|
2.17.1
|
||
|
|
|