From 0c502b6c176281a096a23803e517b19e964485f1 Mon Sep 17 00:00:00 2001 From: Tom Rini <trini@konsulko.com> Date: Wed, 14 Feb 2018 15:46:14 -0500 Subject: [PATCH] configs: Resync with savedefconfig Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini <trini@konsulko.com> --- configs/adp-ae3xx_defconfig | 3 +-- configs/adp-ag101p_defconfig | 3 +-- configs/ls1088ardb_qspi_SECURE_BOOT_defconfig | 2 +- configs/ls1088ardb_qspi_defconfig | 2 +- configs/mpr2_defconfig | 1 - configs/ms7720se_defconfig | 1 - configs/rsk7203_defconfig | 1 - configs/rsk7264_defconfig | 1 - configs/rsk7269_defconfig | 1 - configs/shmin_defconfig | 1 - scripts/config_whitelist.txt | 20 ------------------- 11 files changed, 4 insertions(+), 32 deletions(-) diff --git a/configs/adp-ae3xx_defconfig b/configs/adp-ae3xx_defconfig index cdcac3ece1..57df9342b1 100644 --- a/configs/adp-ae3xx_defconfig +++ b/configs/adp-ae3xx_defconfig @@ -1,4 +1,5 @@ CONFIG_NDS32=y +CONFIG_SYS_TEXT_BASE=0x4A000000 CONFIG_TARGET_ADP_AE3XX=y CONFIG_DEFAULT_DEVICE_TREE="ae3xx" CONFIG_FIT=y @@ -40,5 +41,3 @@ CONFIG_ATCSPI200_SPI=y CONFIG_TIMER=y CONFIG_ATCPIT100_TIMER=y CONFIG_PANIC_HANG=y -CONFIG_SYS_TEXT_BASE=0x4A000000 -# CONFIG_SPL_FRAMEWORK is not set diff --git a/configs/adp-ag101p_defconfig b/configs/adp-ag101p_defconfig index 61b89dcbfa..da398d90ae 100644 --- a/configs/adp-ag101p_defconfig +++ b/configs/adp-ag101p_defconfig @@ -1,4 +1,5 @@ CONFIG_NDS32=y +CONFIG_SYS_TEXT_BASE=0x11000000 CONFIG_TARGET_ADP_AG101P=y CONFIG_DEFAULT_DEVICE_TREE="ag101p" CONFIG_FIT=y @@ -29,5 +30,3 @@ CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_TIMER=y CONFIG_AG101P_TIMER=y -CONFIG_SYS_TEXT_BASE=0x11000000 -# CONFIG_SPL_FRAMEWORK is not set diff --git a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig index 592ed1bdd7..edfb02992a 100644 --- a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig @@ -3,6 +3,7 @@ CONFIG_TARGET_LS1088ARDB=y CONFIG_SYS_TEXT_BASE=0x20100000 CONFIG_SECURE_BOOT=y CONFIG_FSL_LS_PPA=y +CONFIG_QSPI_AHB_INIT=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-rdb" CONFIG_DISTRO_DEFAULTS=y # CONFIG_SYS_MALLOC_F is not set @@ -33,7 +34,6 @@ CONFIG_PCIE_LAYERSCAPE=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y -CONFIG_QSPI_AHB_INIT=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y diff --git a/configs/ls1088ardb_qspi_defconfig b/configs/ls1088ardb_qspi_defconfig index bc1bb1784c..d56815625a 100644 --- a/configs/ls1088ardb_qspi_defconfig +++ b/configs/ls1088ardb_qspi_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_LS1088ARDB=y CONFIG_SYS_TEXT_BASE=0x20100000 CONFIG_FSL_LS_PPA=y +CONFIG_QSPI_AHB_INIT=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-rdb" CONFIG_DISTRO_DEFAULTS=y # CONFIG_SYS_MALLOC_F is not set @@ -33,7 +34,6 @@ CONFIG_PCIE_LAYERSCAPE=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y -CONFIG_QSPI_AHB_INIT=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y diff --git a/configs/mpr2_defconfig b/configs/mpr2_defconfig index d4ddee6dc3..a0b42b8601 100644 --- a/configs/mpr2_defconfig +++ b/configs/mpr2_defconfig @@ -26,4 +26,3 @@ CONFIG_CMD_CACHE=y CONFIG_MTD_NOR_FLASH=y CONFIG_SCIF_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y -# CONFIG_SPL_FRAMEWORK is not set diff --git a/configs/ms7720se_defconfig b/configs/ms7720se_defconfig index 97388e92e7..885b1a8a9c 100644 --- a/configs/ms7720se_defconfig +++ b/configs/ms7720se_defconfig @@ -31,4 +31,3 @@ CONFIG_DOS_PARTITION=y CONFIG_MTD_NOR_FLASH=y CONFIG_SCIF_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y -# CONFIG_SPL_FRAMEWORK is not set diff --git a/configs/rsk7203_defconfig b/configs/rsk7203_defconfig index 4fc65ef032..b34d4657f1 100644 --- a/configs/rsk7203_defconfig +++ b/configs/rsk7203_defconfig @@ -26,4 +26,3 @@ CONFIG_CMD_CACHE=y CONFIG_MTD_NOR_FLASH=y CONFIG_SCIF_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y -# CONFIG_SPL_FRAMEWORK is not set diff --git a/configs/rsk7264_defconfig b/configs/rsk7264_defconfig index 02498bf3de..17ecbe5cc6 100644 --- a/configs/rsk7264_defconfig +++ b/configs/rsk7264_defconfig @@ -9,4 +9,3 @@ CONFIG_CMD_IMLS=y CONFIG_MTD_NOR_FLASH=y CONFIG_SCIF_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y -# CONFIG_SPL_FRAMEWORK is not set diff --git a/configs/rsk7269_defconfig b/configs/rsk7269_defconfig index fecebae1d0..5ad81ae002 100644 --- a/configs/rsk7269_defconfig +++ b/configs/rsk7269_defconfig @@ -9,4 +9,3 @@ CONFIG_CMD_IMLS=y CONFIG_MTD_NOR_FLASH=y CONFIG_SCIF_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y -# CONFIG_SPL_FRAMEWORK is not set diff --git a/configs/shmin_defconfig b/configs/shmin_defconfig index 022e2fd397..531bd80b9e 100644 --- a/configs/shmin_defconfig +++ b/configs/shmin_defconfig @@ -25,4 +25,3 @@ CONFIG_CMD_PING=y CONFIG_MTD_NOR_FLASH=y CONFIG_SCIF_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y -# CONFIG_SPL_FRAMEWORK is not set diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 95a9a28f4c..4ac89cdde0 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -325,7 +325,6 @@ CONFIG_CPU_SH7780 CONFIG_CPU_SH7785 CONFIG_CPU_TYPE_R CONFIG_CPU_VR41XX -CONFIG_CQSPI_DECODER CONFIG_CQSPI_REF_CLK CONFIG_CRC32 CONFIG_CS8900 @@ -1215,7 +1214,6 @@ CONFIG_LEGACY_BOOTCMD_ENV CONFIG_LG4573 CONFIG_LG4573_BUS CONFIG_LG4573_CS -CONFIG_LIB_UUID CONFIG_LINUX CONFIG_LINUX_RESET_VEC CONFIG_LITTLETON_LCD @@ -1517,7 +1515,6 @@ CONFIG_PALMAS_AUDPWR CONFIG_PALMAS_POWER CONFIG_PALMAS_SMPS7_FPWM CONFIG_PALMAS_USB_SS_PWR -CONFIG_PANIC_HANG CONFIG_PARAVIRT CONFIG_PB1000 CONFIG_PB1100 @@ -2106,10 +2103,7 @@ CONFIG_STATIC_BOARD_REV CONFIG_STD_DEVICES_SETTINGS CONFIG_STM32F4DISCOVERY CONFIG_STM32_FLASH -CONFIG_STM32_GPIO -CONFIG_STM32_HSE_HZ CONFIG_STM32_HZ -CONFIG_STM32_SERIAL CONFIG_STRIDER CONFIG_STRIDER_CON CONFIG_STRIDER_CON_DP @@ -2134,7 +2128,6 @@ CONFIG_SXNI855T CONFIG_SYSFLAGS_ADDR CONFIG_SYSFS CONFIG_SYSMGR_ISWGRP_HANDOFF -CONFIG_SYSTEMACE CONFIG_SYS_33MHZ CONFIG_SYS_64BIT CONFIG_SYS_64BIT_LBA @@ -2647,7 +2640,6 @@ CONFIG_SYS_DP501_VCAPCTRL0 CONFIG_SYS_DPAA_DCE CONFIG_SYS_DPAA_FMAN CONFIG_SYS_DPAA_PME -CONFIG_SYS_DPAA_QBMAN CONFIG_SYS_DPAA_RMAN CONFIG_SYS_DP_DDR_BASE CONFIG_SYS_DP_DDR_BASE_PHY @@ -3217,7 +3209,6 @@ CONFIG_SYS_I2C_G762_ADDR CONFIG_SYS_I2C_GENERIC_MAC CONFIG_SYS_I2C_IDT6V49205B CONFIG_SYS_I2C_IFDR_DIV -CONFIG_SYS_I2C_IHS CONFIG_SYS_I2C_IHS_CH0 CONFIG_SYS_I2C_IHS_CH0_1 CONFIG_SYS_I2C_IHS_CH1 @@ -4083,7 +4074,6 @@ CONFIG_SYS_PCI_BAR3 CONFIG_SYS_PCI_BAR4 CONFIG_SYS_PCI_BAR5 CONFIG_SYS_PCI_CACHE_LINE_SIZE -CONFIG_SYS_PCI_CFG_BASE CONFIG_SYS_PCI_CFG_BUS CONFIG_SYS_PCI_CFG_PHYS CONFIG_SYS_PCI_CFG_SIZE @@ -4231,7 +4221,6 @@ CONFIG_SYS_RAMBOOT CONFIG_SYS_RAM_BASE CONFIG_SYS_RAM_CS CONFIG_SYS_RAM_FREQ_DIV -CONFIG_SYS_RAM_SIZE CONFIG_SYS_RCAR_I2C0_BASE CONFIG_SYS_RCAR_I2C0_SPEED CONFIG_SYS_RCAR_I2C1_BASE @@ -4449,8 +4438,6 @@ CONFIG_SYS_STATUS_OK CONFIG_SYS_STMICRO_BOOT CONFIG_SYS_SUPPORT_64BIT_DATA CONFIG_SYS_SXCNFG_VAL -CONFIG_SYS_SYSTEMACE_BASE -CONFIG_SYS_SYSTEMACE_WIDTH CONFIG_SYS_TBIPA_VALUE CONFIG_SYS_TCLK CONFIG_SYS_TEXT_ADDR @@ -4771,7 +4758,6 @@ CONFIG_USB_EHCI_BASE CONFIG_USB_EHCI_BASE_LIST CONFIG_USB_EHCI_EXYNOS CONFIG_USB_EHCI_FARADAY -CONFIG_USB_EHCI_FSL CONFIG_USB_EHCI_KIRKWOOD CONFIG_USB_EHCI_MX5 CONFIG_USB_EHCI_MXC @@ -4788,8 +4774,6 @@ CONFIG_USB_ETH_SUBSET CONFIG_USB_EXT2_BOOT CONFIG_USB_FAT_BOOT CONFIG_USB_FREQ -CONFIG_USB_FUNCTION_MASS_STORAGE -CONFIG_USB_FUNCTION_THOR CONFIG_USB_GADGET_AMD5536UDC CONFIG_USB_GADGET_AT91 CONFIG_USB_GADGET_AU1X00 @@ -4919,10 +4903,6 @@ CONFIG_YAFFS_UNICODE CONFIG_YAFFS_UTIL CONFIG_YAFFS_WINCE CONFIG_YELLOW_LED -CONFIG_ZC770_XM010 -CONFIG_ZC770_XM011 -CONFIG_ZC770_XM012 -CONFIG_ZC770_XM013 CONFIG_ZLIB CONFIG_ZLT CONFIG_ZM7300 -- 2.39.5