From 80da2453e1ad5fb94f95811593246c1945a05fa9 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 7 Jun 2021 08:09:35 -0400 Subject: [PATCH] configs: Resync with savedefconfig Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini --- configs/am64x_evm_a53_defconfig | 1 - configs/brxre1_defconfig | 2 -- configs/mx28evk_auart_console_defconfig | 5 --- configs/mx28evk_defconfig | 5 --- configs/mx28evk_nand_defconfig | 5 --- configs/mx28evk_spi_defconfig | 5 --- configs/pico-dwarf-imx6ul_defconfig | 2 -- configs/pico-hobbit-imx6ul_defconfig | 2 -- configs/pico-pi-imx6ul_defconfig | 2 -- configs/pxm2_defconfig | 7 ---- configs/rut_defconfig | 7 ---- configs/sifive_unmatched_defconfig | 44 +++++++++---------------- 12 files changed, 16 insertions(+), 71 deletions(-) diff --git a/configs/am64x_evm_a53_defconfig b/configs/am64x_evm_a53_defconfig index 304f5b41a3..249b0dbabf 100644 --- a/configs/am64x_evm_a53_defconfig +++ b/configs/am64x_evm_a53_defconfig @@ -74,7 +74,6 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y -CONFIG_PHY_TI=y CONFIG_PHY_TI_DP83867=y CONFIG_PHY_FIXED=y CONFIG_DM_ETH=y diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig index 6d9f24314f..c1014db629 100644 --- a/configs/brxre1_defconfig +++ b/configs/brxre1_defconfig @@ -92,8 +92,6 @@ CONFIG_USB_MUSB_TI=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_SYS_WHITE_ON_BLACK=y -# CONFIG_AM335X_LCD is not set -# CONFIG_LCD is not set CONFIG_SPL_TINY_MEMSET=y # CONFIG_OF_LIBFDT_OVERLAY is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/mx28evk_auart_console_defconfig b/configs/mx28evk_auart_console_defconfig index 60b9f3999e..4fc764829e 100644 --- a/configs/mx28evk_auart_console_defconfig +++ b/configs/mx28evk_auart_console_defconfig @@ -12,7 +12,6 @@ CONFIG_TARGET_MX28EVK=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="MXS_AUART,MXS_AUART_BASE=MXS_UARTAPP3_BASE" -# CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_ARCH_MISC_INIT=y @@ -27,7 +26,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y -CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT4=y @@ -56,8 +54,5 @@ CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y -# CONFIG_VIDEO is not set CONFIG_SPLASH_SCREEN=y -# CONFIG_VIDEO_BMP_GZIP is not set -# CONFIG_VIDEO_BMP_RLE8 is not set CONFIG_OF_LIBFDT=y diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig index abc0c48d21..ff1d0ed24e 100644 --- a/configs/mx28evk_defconfig +++ b/configs/mx28evk_defconfig @@ -12,7 +12,6 @@ CONFIG_TARGET_MX28EVK=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y CONFIG_FIT=y -# CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_ARCH_MISC_INIT=y @@ -27,7 +26,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y -CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT4=y @@ -56,8 +54,5 @@ CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y -# CONFIG_VIDEO is not set CONFIG_SPLASH_SCREEN=y -# CONFIG_VIDEO_BMP_GZIP is not set -# CONFIG_VIDEO_BMP_RLE8 is not set CONFIG_OF_LIBFDT=y diff --git a/configs/mx28evk_nand_defconfig b/configs/mx28evk_nand_defconfig index 0a376a2f80..94e4244128 100644 --- a/configs/mx28evk_nand_defconfig +++ b/configs/mx28evk_nand_defconfig @@ -12,7 +12,6 @@ CONFIG_TARGET_MX28EVK=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y CONFIG_ENV_OFFSET_REDUND=0x380000 -# CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_ARCH_MISC_INIT=y @@ -27,7 +26,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y -CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT4=y @@ -57,8 +55,5 @@ CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y -# CONFIG_VIDEO is not set CONFIG_SPLASH_SCREEN=y -# CONFIG_VIDEO_BMP_GZIP is not set -# CONFIG_VIDEO_BMP_RLE8 is not set CONFIG_OF_LIBFDT=y diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig index a6b00c29f5..2122bbe870 100644 --- a/configs/mx28evk_spi_defconfig +++ b/configs/mx28evk_spi_defconfig @@ -10,7 +10,6 @@ CONFIG_SPL_TEXT_BASE=0x00001000 CONFIG_TARGET_MX28EVK=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y -# CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_ARCH_MISC_INIT=y @@ -25,7 +24,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y -CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT4=y @@ -53,8 +51,5 @@ CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y -# CONFIG_VIDEO is not set CONFIG_SPLASH_SCREEN=y -# CONFIG_VIDEO_BMP_GZIP is not set -# CONFIG_VIDEO_BMP_RLE8 is not set CONFIG_OF_LIBFDT=y diff --git a/configs/pico-dwarf-imx6ul_defconfig b/configs/pico-dwarf-imx6ul_defconfig index bf016f80ed..ab571b5dda 100644 --- a/configs/pico-dwarf-imx6ul_defconfig +++ b/configs/pico-dwarf-imx6ul_defconfig @@ -68,7 +68,5 @@ CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y -# CONFIG_VIDEO is not set CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y -# CONFIG_VIDEO_BMP_RLE8 is not set diff --git a/configs/pico-hobbit-imx6ul_defconfig b/configs/pico-hobbit-imx6ul_defconfig index 14d36c5e6a..a9c867e1a9 100644 --- a/configs/pico-hobbit-imx6ul_defconfig +++ b/configs/pico-hobbit-imx6ul_defconfig @@ -71,7 +71,5 @@ CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y -# CONFIG_VIDEO is not set CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y -# CONFIG_VIDEO_BMP_RLE8 is not set diff --git a/configs/pico-pi-imx6ul_defconfig b/configs/pico-pi-imx6ul_defconfig index ba8b1a1e8e..7d9e219c28 100644 --- a/configs/pico-pi-imx6ul_defconfig +++ b/configs/pico-pi-imx6ul_defconfig @@ -71,7 +71,5 @@ CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y -# CONFIG_VIDEO is not set CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y -# CONFIG_VIDEO_BMP_RLE8 is not set diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index da6b1bb0e3..eb70b6bbf8 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -27,7 +27,6 @@ CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"\" to stop\n" CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" CONFIG_USE_PREBOOT=y -# CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set @@ -55,7 +54,6 @@ CONFIG_CMD_DHCP=y CONFIG_BOOTP_DNS2=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y -CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_EXT2=y @@ -101,10 +99,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2 CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_ETHER=y CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" -# CONFIG_VIDEO is not set -# CONFIG_VIDEO_SW_CURSOR is not set -CONFIG_SYS_CONSOLE_BG_COL=0xff -CONFIG_SYS_CONSOLE_FG_COL=0x00 CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y -# CONFIG_VIDEO_BMP_RLE8 is not set diff --git a/configs/rut_defconfig b/configs/rut_defconfig index 2ddf0e63dd..ba3d6377df 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -27,7 +27,6 @@ CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"\" to stop\n" CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" CONFIG_USE_PREBOOT=y -# CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set @@ -55,7 +54,6 @@ CONFIG_CMD_DHCP=y CONFIG_BOOTP_DNS2=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y -CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_EXT2=y @@ -100,10 +98,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0908 CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2 CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_ETHER=y -# CONFIG_VIDEO is not set -# CONFIG_VIDEO_SW_CURSOR is not set -CONFIG_SYS_CONSOLE_BG_COL=0xff -CONFIG_SYS_CONSOLE_FG_COL=0x00 CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y -# CONFIG_VIDEO_BMP_RLE8 is not set diff --git a/configs/sifive_unmatched_defconfig b/configs/sifive_unmatched_defconfig index 4e5ed45ad9..01ca2d8c23 100644 --- a/configs/sifive_unmatched_defconfig +++ b/configs/sifive_unmatched_defconfig @@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="hifive-unmatched-a00" CONFIG_TARGET_SIFIVE_UNMATCHED=y CONFIG_ARCH_RV64I=y CONFIG_RISCV_SMODE=y +# CONFIG_SPL_USE_ARCH_MEMMOVE is not set CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x84000000 @@ -19,36 +20,23 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_DM_RESET=y CONFIG_SPL_YMODEM_SUPPORT=y -CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_SPL_CLK=y -CONFIG_DM_RESET=y -CONFIG_CMD_PCI=y -CONFIG_PCI=y -CONFIG_DM_PCI=y -CONFIG_PCI_PNP=y -CONFIG_PCIE_DW_SIFIVE=y -CONFIG_NVME=y -CONFIG_DM_ETH=y -CONFIG_NETDEVICES=y -CONFIG_E1000=y -CONFIG_USB=y -CONFIG_CMD_USB=y -CONFIG_DM_USB=y -CONFIG_USB_STORAGE=y -CONFIG_USB_XHCI_HCD=y -CONFIG_USB_XHCI_PCI=y -CONFIG_CMD_PART=y -CONFIG_CMD_NVME=y -CONFIG_SYS_USB_EVENT_POLL=y -CONFIG_CMD_GPT=y -CONFIG_CMD_GPT_RENAME=y CONFIG_CMD_EEPROM=y CONFIG_CMD_MEMINFO=y +CONFIG_CMD_PWM=y +CONFIG_CMD_GPT_RENAME=y CONFIG_CMD_I2C=y +CONFIG_CMD_PCI=y +CONFIG_CMD_USB=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SPL_CLK=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_OCORES=y -CONFIG_CLK_SIFIVE_PRCI=y -CONFIG_DM_PWM=y -CONFIG_PWM_SIFIVE=y -CONFIG_CMD_PWM=y -CONFIG_SPL_USE_ARCH_MEMMOVE=n +CONFIG_E1000=y +CONFIG_NVME=y +CONFIG_PCI=y +CONFIG_PCIE_DW_SIFIVE=y +CONFIG_DM_RESET=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_PCI=y