From e608bebd7759e287f78269c6392f134283a4cbe6 Mon Sep 17 00:00:00 2001 From: Patrick Delaunay Date: Wed, 27 Feb 2019 15:20:33 +0100 Subject: controlcenterdc: move some configuration in defconfig file Move some configurations in defconfig file - CONFIG_CMD_I2C - CONFIG_CMD_SPI This allow correct dependency handling in Kconfig. Signed-off-by: Patrick Delaunay --- configs/controlcenterdc_defconfig | 2 ++ 1 file changed, 2 insertions(+) (limited to 'configs/controlcenterdc_defconfig') diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig index f22a3ab819..b4b5732f69 100644 --- a/configs/controlcenterdc_defconfig +++ b/configs/controlcenterdc_defconfig @@ -26,9 +26,11 @@ CONFIG_HUSH_PARSER=y # CONFIG_CMD_GO is not set # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y +CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y CONFIG_CMD_SF=y +CONFIG_CMD_SPI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y -- cgit From 14453fbfadc2f98ca35d6033140466c7a4b4947a Mon Sep 17 00:00:00 2001 From: Patrick Delaunay Date: Wed, 27 Feb 2019 15:20:36 +0100 Subject: Convert CONFIG_SF_DEFAULT_* to Kconfig This converts the following to Kconfig: CONFIG_SF_DEFAULT_BUS CONFIG_SF_DEFAULT_CS CONFIG_SF_DEFAULT_MODE CONFIG_SF_DEFAULT_SPEED I use moveconfig script and then manual check on generated u-boot.cfg to solve the remaining issue. Signed-off-by: Patrick Delaunay --- configs/controlcenterdc_defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'configs/controlcenterdc_defconfig') diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig index b4b5732f69..b2b61b2ca5 100644 --- a/configs/controlcenterdc_defconfig +++ b/configs/controlcenterdc_defconfig @@ -55,6 +55,7 @@ CONFIG_LED_GPIO=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_MV=y CONFIG_SPI_FLASH=y +CONFIG_SF_DEFAULT_BUS=1 CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHY_MARVELL=y CONFIG_PHY_GIGE=y -- cgit From abe66b1b5decf9cc2fb5daad42c9e870e5b99b67 Mon Sep 17 00:00:00 2001 From: Patrick Delaunay Date: Wed, 27 Feb 2019 15:20:38 +0100 Subject: Convert CONFIG_ENV_SPI_* to Kconfig This converts the following to Kconfig: CONFIG_ENV_SPI_BUS CONFIG_ENV_SPI_CS CONFIG_ENV_SPI_MAX_HZ CONFIG_ENV_SPI_MODE Most of time these value are not needed, CONFIG_SF_DEFAULT with same value is used, so I introduced CONFIG_USE_ENV_SPI_* to force the associated value for the environment. Signed-off-by: Patrick Delaunay --- configs/controlcenterdc_defconfig | 2 ++ 1 file changed, 2 insertions(+) (limited to 'configs/controlcenterdc_defconfig') diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig index b2b61b2ca5..08fdc55be2 100644 --- a/configs/controlcenterdc_defconfig +++ b/configs/controlcenterdc_defconfig @@ -44,6 +44,8 @@ CONFIG_EFI_PARTITION=y CONFIG_OF_BOARD_FIXUP=y CONFIG_DEFAULT_DEVICE_TREE="armada-38x-controlcenterdc" CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_USE_ENV_SPI_MAX_HZ=y +CONFIG_ENV_SPI_MAX_HZ=50000000 CONFIG_SPL_OF_TRANSLATE=y CONFIG_SCSI_AHCI=y CONFIG_DM_GPIO=y -- cgit