[PATCH] configs: sama7d65_curiosity: Resync with savedefconfig

[Mihai Sain]

Perform a clean up of the initial defconfig file,
and resync with savedefconfig.

Signed-off-by: Mihai Sain <mihai.sain at microchip.com>
---
 configs/sama7d65_curiosity_mmc1_defconfig | 43 ++++++++---------------
 1 file changed, 14 insertions(+), 29 deletions(-)

diff --git a/configs/sama7d65_curiosity_mmc1_defconfig b/configs/sama7d65_curiosity_mmc1_defconfig
index e819e51b458..61adebf1980 100644
--- a/configs/sama7d65_curiosity_mmc1_defconfig
+++ b/configs/sama7d65_curiosity_mmc1_defconfig
@@ -6,17 +6,21 @@ CONFIG_TARGET_SAMA7D65_CURIOSITY=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x60014ef0
-CONFIG_SYS_MEMTEST_START=0x60000000
-CONFIG_SYS_MEMTEST_END=0x70000000
 CONFIG_ENV_SIZE=0x4000
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="microchip/at91-sama7d65_curiosity"
-CONFIG_DEBUG_UART_BOARD_INIT=y
+CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_DM_RESET=y
+CONFIG_SYS_BOOTM_LEN=0x2000000
+CONFIG_SYS_LOAD_ADDR=0x62000000
 CONFIG_DEBUG_UART_BASE=0xe2020200
 CONFIG_DEBUG_UART_CLOCK=100000000
+CONFIG_DEBUG_UART_BOARD_INIT=y
 CONFIG_DEBUG_UART=y
+CONFIG_SYS_MEMTEST_START=0x60000000
+CONFIG_SYS_MEMTEST_END=0x70000000
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x62000000
+# CONFIG_EFI_LOADER is not set
 CONFIG_FIT=y
 CONFIG_SD_BOOT=y
 CONFIG_USE_BOOTARGS=y
@@ -25,8 +29,6 @@ CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="fatload mmc 0:1 0x61000000 at91-sama7d65_curiosity.dtb; fatload mmc 0:1 0x62000000 zImage; bootz 0x62000000 - 0x61000000"
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
-CONFIG_SYS_BOOTM_LEN=0x2000000
-CONFIG_CMD_IMI=y
 CONFIG_CMD_MD5SUM=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_STRINGS=y
@@ -38,23 +40,21 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_MTD=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_SF_TEST=y
 CONFIG_CMD_DHCP=y
-CONFIG_CMD_WGET=y
+CONFIG_CMD_DNS=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
-CONFIG_CMD_DNS=y
+CONFIG_CMD_WGET=y
 CONFIG_CMD_HASH=y
 CONFIG_HASH_VERIFY=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
+CONFIG_PARTITION_UUIDS=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ARP_TIMEOUT=200
 CONFIG_NET_RETRY_COUNT=50
-CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_CCF=y
 CONFIG_CLK_AT91=y
@@ -72,37 +72,22 @@ CONFIG_MICROCHIP_FLEXCOM=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ATMEL=y
 CONFIG_MTD=y
-CONFIG_MTD_RAW_NAND=y
 CONFIG_DM_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_DM_NAND_ATMEL=y
 CONFIG_SYS_NAND_ONFI_DETECTION=y
-CONFIG_DM_SPI_FLASH=n
-CONFIG_SF_DEFAULT_MODE=0x0
-CONFIG_SF_DEFAULT_SPEED=133000000
-CONFIG_SPI_FLASH_SFDP_SUPPORT=n
-CONFIG_SPI_FLASH_SOFT_RESET=n
-CONFIG_SPI_FLASH_MACRONIX=n
-CONFIG_SPI_FLASH_MX66LM1G45G=n
-CONFIG_SPI_FLASH_SST=n
-CONFIG_SPI_FLASH_MTD=n
-CONFIG_DM_ETH=y
 CONFIG_PHY_SMSC=y
 CONFIG_DM_ETH_PHY=y
 CONFIG_MACB=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_AT91PIO4=y
-CONFIG_DM_RESET=y
 CONFIG_RESET_AT91=y
 CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_ATMEL_USART=y
-CONFIG_SPI=n
-# CONFIG_ATMEL_SPI is not set
-CONFIG_TIMER=y
 CONFIG_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
 CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
 CONFIG_MCHP_PIT64B_TIMER=y
-CONFIG_OF_LIBFDT_OVERLAY=y
-# CONFIG_EFI_LOADER_HII is not set
+CONFIG_FAT_RENAME=y
 CONFIG_PHANDLE_CHECK_SEQ=y
-- 
2.50.1