From a475ad7f9e156fbadb33ee27b9ff0182cb6c0b64 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 7 Sep 2020 14:05:55 -0400 Subject: configs: Resync with savedefconfig Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini --- configs/axs101_defconfig | 1 - configs/axs103_defconfig | 1 - configs/emsdp_defconfig | 1 - configs/hsdk_4xd_defconfig | 1 - configs/hsdk_defconfig | 1 - configs/iot_devkit_defconfig | 1 - configs/mvebu_espressobin-88f3720_defconfig | 11 +++++------ configs/nsim_700_defconfig | 1 - configs/nsim_700be_defconfig | 1 - configs/nsim_hs38_defconfig | 1 - configs/nsim_hs38be_defconfig | 1 - configs/tb100_defconfig | 1 - 12 files changed, 5 insertions(+), 17 deletions(-) diff --git a/configs/axs101_defconfig b/configs/axs101_defconfig index 633bc119..9dbc594 100644 --- a/configs/axs101_defconfig +++ b/configs/axs101_defconfig @@ -31,7 +31,6 @@ CONFIG_ENV_IS_IN_FAT=y CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y -CONFIG_DM=y CONFIG_HSDK_CREG_GPIO=y CONFIG_MMC=y CONFIG_DM_MMC=y diff --git a/configs/axs103_defconfig b/configs/axs103_defconfig index 24996ac..399ec9c 100644 --- a/configs/axs103_defconfig +++ b/configs/axs103_defconfig @@ -31,7 +31,6 @@ CONFIG_ENV_IS_IN_FAT=y CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y -CONFIG_DM=y CONFIG_HSDK_CREG_GPIO=y CONFIG_MMC=y CONFIG_DM_MMC=y diff --git a/configs/emsdp_defconfig b/configs/emsdp_defconfig index 6dc60f7..2b05828 100644 --- a/configs/emsdp_defconfig +++ b/configs/emsdp_defconfig @@ -22,7 +22,6 @@ CONFIG_ENV_IS_IN_FAT=y CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_NET is not set -CONFIG_DM=y CONFIG_MMC=y CONFIG_DM_MMC=y CONFIG_MMC_DW=y diff --git a/configs/hsdk_4xd_defconfig b/configs/hsdk_4xd_defconfig index c968468..e5d7767 100644 --- a/configs/hsdk_4xd_defconfig +++ b/configs/hsdk_4xd_defconfig @@ -35,7 +35,6 @@ CONFIG_ENV_IS_IN_FAT=y CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y -CONFIG_DM=y CONFIG_CLK_HSDK=y CONFIG_HSDK_CREG_GPIO=y CONFIG_MMC=y diff --git a/configs/hsdk_defconfig b/configs/hsdk_defconfig index 63ac6b3..224a295 100644 --- a/configs/hsdk_defconfig +++ b/configs/hsdk_defconfig @@ -34,7 +34,6 @@ CONFIG_ENV_IS_IN_FAT=y CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y -CONFIG_DM=y CONFIG_CLK_HSDK=y CONFIG_HSDK_CREG_GPIO=y CONFIG_MMC=y diff --git a/configs/iot_devkit_defconfig b/configs/iot_devkit_defconfig index 972bb9a..5530440 100644 --- a/configs/iot_devkit_defconfig +++ b/configs/iot_devkit_defconfig @@ -26,7 +26,6 @@ CONFIG_ENV_IS_IN_FAT=y CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_NET is not set -CONFIG_DM=y CONFIG_MMC=y CONFIG_DM_MMC=y CONFIG_MMC_DW=y diff --git a/configs/mvebu_espressobin-88f3720_defconfig b/configs/mvebu_espressobin-88f3720_defconfig index ec32906..7aabbba 100644 --- a/configs/mvebu_espressobin-88f3720_defconfig +++ b/configs/mvebu_espressobin-88f3720_defconfig @@ -16,6 +16,7 @@ CONFIG_DEBUG_UART=y CONFIG_AHCI=y CONFIG_DISTRO_DEFAULTS=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_CPUINFO is not set @@ -51,22 +52,23 @@ CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_XENON=y CONFIG_MTD=y CONFIG_SF_DEFAULT_MODE=0 +CONFIG_SPI_FLASH_GIGADEVICE=y +CONFIG_SPI_FLASH_ISSI=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y -CONFIG_SPI_FLASH_GIGADEVICE=y -CONFIG_SPI_FLASH_ISSI=y -CONFIG_PHYLIB=y CONFIG_PHY_MARVELL=y CONFIG_PHY_GIGE=y CONFIG_E1000=y +CONFIG_MVNETA=y CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_PCI_AARDVARK=y CONFIG_MVEBU_COMPHY_SUPPORT=y CONFIG_PINCTRL=y CONFIG_PINCTRL_ARMADA_37XX=y +CONFIG_DM_REGULATOR_GPIO=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_MVEBU_A3700_UART=y @@ -82,6 +84,3 @@ CONFIG_USB_ETHER_RTL8152=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_SHA1=y CONFIG_SHA256=y -CONFIG_MVNETA=y -CONFIG_DM_REGULATOR_GPIO=y -CONFIG_OF_BOARD_SETUP=y diff --git a/configs/nsim_700_defconfig b/configs/nsim_700_defconfig index b2494c6..e8faf72 100644 --- a/configs/nsim_700_defconfig +++ b/configs/nsim_700_defconfig @@ -16,7 +16,6 @@ CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_NET is not set -CONFIG_DM=y CONFIG_DM_SERIAL=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y diff --git a/configs/nsim_700be_defconfig b/configs/nsim_700be_defconfig index 914e118..358ea77 100644 --- a/configs/nsim_700be_defconfig +++ b/configs/nsim_700be_defconfig @@ -17,7 +17,6 @@ CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_NET is not set -CONFIG_DM=y CONFIG_DM_SERIAL=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y diff --git a/configs/nsim_hs38_defconfig b/configs/nsim_hs38_defconfig index 1309eca..3a66b3b 100644 --- a/configs/nsim_hs38_defconfig +++ b/configs/nsim_hs38_defconfig @@ -19,7 +19,6 @@ CONFIG_CMD_DHCP=y CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_DM=y CONFIG_BLK=y CONFIG_HAVE_BLOCK_DEVICE=y CONFIG_DM_ETH=y diff --git a/configs/nsim_hs38be_defconfig b/configs/nsim_hs38be_defconfig index 90642e3..97ede6e 100644 --- a/configs/nsim_hs38be_defconfig +++ b/configs/nsim_hs38be_defconfig @@ -18,7 +18,6 @@ CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_NET is not set -CONFIG_DM=y CONFIG_DM_SERIAL=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y diff --git a/configs/tb100_defconfig b/configs/tb100_defconfig index 5fd7f03..47e2f57 100644 --- a/configs/tb100_defconfig +++ b/configs/tb100_defconfig @@ -14,7 +14,6 @@ CONFIG_CMD_PING=y CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_DM=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y CONFIG_DM_SERIAL=y -- cgit v1.1