From: Tom Rini Date: Mon, 30 Aug 2021 20:44:54 +0000 (-0400) Subject: Merge branch '2021-08-30-kconfig-migrations-part1' into next X-Git-Url: http://git.dujemihanovic.xyz/html/index.html?a=commitdiff_plain;h=a85a8e63c5cf8ccb3905eb5982bf8bdcb2978557;p=u-boot.git Merge branch '2021-08-30-kconfig-migrations-part1' into next - Begin merging some Kconfig migration, and CONFIG namespace cleanup series in. This gives us: - A number of I2C symbols migrated over - DWC2, i8042, altera_spi and a few other areas updated to use CFG not CONFIG for the concept of "configuration space" defines. - Rename CONFIG_EXTRA_ENV_BOARD_SETTINGS to EXTRA_ENV_BOARD_SETTINGS - Some dead code removal. - Rename a number of CONFIG symbols that were only referenced within the config header to not use CONFIG as a prefix. --- a85a8e63c5cf8ccb3905eb5982bf8bdcb2978557 diff --cc scripts/config_whitelist.txt index d86f35856f,1ee871e115..1d7cc2741b --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@@ -1,23 -1,23 +1,11 @@@ --CONFIG_16BIT CONFIG_64BIT_PHYS_ADDR --CONFIG_8349_CLKIN CONFIG_83XX --CONFIG_83XX_CLKIN --CONFIG_83XX_GENERIC_PCIE_REGISTER_HOSES CONFIG_83XX_PCICLK --CONFIG_83XX_PCI_STREAMING CONFIG_88F5182 CONFIG_A003399_NOR_WORKAROUND CONFIG_A008044_WORKAROUND --CONFIG_ACX517AKN --CONFIG_ACX544AKN --CONFIG_ADDRESS --CONFIG_ADDR_AUTO_INCR_BIT --CONFIG_ADNPESC1 CONFIG_AEABI CONFIG_AEMIF_CNTRL_BASE --CONFIG_ALTERA_SPI_IDLE_VAL --CONFIG_ALU CONFIG_AM335X_USB0 CONFIG_AM335X_USB0_MODE CONFIG_AM335X_USB1 @@@ -25,10 -25,10 +13,6 @@@ CONFIG_AM335X_USB1_MOD CONFIG_AM437X_USB2PHY2_HOST CONFIG_ANDES_PCU CONFIG_ANDES_PCU_BASE --CONFIG_APER_0_BASE --CONFIG_APER_1_BASE --CONFIG_APER_SIZE --CONFIG_APUS_FAST_EXCEPT CONFIG_ARCH_ADPAG101P CONFIG_ARCH_HAS_ILOG2_U32 CONFIG_ARCH_HAS_ILOG2_U64 @@@ -38,21 -38,21 +22,12 @@@ CONFIG_ARCH_RMOBILE_EXTRAM_BOO CONFIG_ARCH_USE_BUILTIN_BSWAP CONFIG_ARC_MMU_VER CONFIG_ARMADA100 --CONFIG_ARMADA168 CONFIG_ARMV7_SECURE_BASE CONFIG_ARMV7_SECURE_MAX_SIZE CONFIG_ARMV7_SECURE_RESERVE_SIZE CONFIG_ARMV8_SWITCH_TO_EL1 --CONFIG_ARM_ARCH_CP15_ERRATA CONFIG_ARM_GIC_BASE_ADDRESS --CONFIG_ARM_PL180_MMCI_BASE --CONFIG_ARM_PL180_MMCI_CLOCK_FREQ CONFIG_ARP_TIMEOUT --CONFIG_ASTRO_COFDMDUOS2 --CONFIG_ASTRO_TWIN7S2 --CONFIG_ASTRO_V512 --CONFIG_ASTRO_V532 --CONFIG_ASTRO_V912 CONFIG_AT91C_PQFP_UHPBUG CONFIG_AT91RESET_EXTRST CONFIG_AT91RM9200 @@@ -77,7 -77,7 +52,6 @@@ CONFIG_ATMEL_LCD_RGB56 CONFIG_ATMEL_LEGACY CONFIG_ATMEL_MCI_8BIT CONFIG_ATMEL_SPI0 --CONFIG_AT_TRANS CONFIG_AUTO_ZRELADDR CONFIG_BACKSIDE_L2_CACHE CONFIG_BCH_CONST_M @@@ -102,7 -102,7 +76,6 @@@ CONFIG_BOARD_NAM CONFIG_BOARD_POSTCLK_INIT CONFIG_BOARD_SIZE_LIMIT CONFIG_BOOGER --CONFIG_BOOTBLOCK CONFIG_BOOTFILE CONFIG_BOOTMODE CONFIG_BOOTP_ @@@ -120,7 -120,7 +93,6 @@@ CONFIG_BOOTSCRIPT_ADD CONFIG_BOOTSCRIPT_COPY_RAM CONFIG_BOOTSCRIPT_HDR_ADDR CONFIG_BOOTSCRIPT_KEY_HASH --CONFIG_BOOT_MODE_BIT CONFIG_BOOT_RETRY_MIN CONFIG_BOOT_RETRY_TIME CONFIG_BPTR_VIRT_ADDR @@@ -133,7 -133,7 +105,6 @@@ CONFIG_BS_HDR_ADDR_RA CONFIG_BS_HDR_SIZE CONFIG_BS_SIZE CONFIG_BTB --CONFIG_BUFNO_AUTO_INCR_BIT CONFIG_BUILD_ENVCRC CONFIG_BUS_WIDTH CONFIG_CDP_APPLIANCE_VLAN_TYPE @@@ -176,7 -176,7 +147,6 @@@ CONFIG_CM_T33 CONFIG_CM_T3X CONFIG_CM_T43 CONFIG_CM_TCRAM --CONFIG_CNTL CONFIG_COLDFIRE CONFIG_COMMANDS CONFIG_COMMON_BOOT @@@ -223,7 -223,7 +193,6 @@@ CONFIG_DB_784MP_G CONFIG_DCACHE CONFIG_DCACHE_OFF CONFIG_DCFG_ADDR --CONFIG_DDR3 CONFIG_DDR_2T_TIMING CONFIG_DDR_32BIT CONFIG_DDR_64BIT @@@ -270,7 -270,7 +239,6 @@@ CONFIG_DMA_COHEREN CONFIG_DMA_COHERENT_SIZE CONFIG_DMA_LPC32XX CONFIG_DMA_NONCOHERENT --CONFIG_DMA_REQ_BIT CONFIG_DNET_AUTONEG_TIMEOUT CONFIG_DP_DDR_CTRL CONFIG_DP_DDR_DIMM_SLOTS_PER_CTLR @@@ -315,11 -295,11 +263,6 @@@ CONFIG_E30 CONFIG_E5500 CONFIG_ECC CONFIG_ECC_INIT_VIA_DDRCONTROLLER --CONFIG_ECC_MODE_MASK --CONFIG_ECC_MODE_SHIFT --CONFIG_ECC_SRAM_ADDR_MASK --CONFIG_ECC_SRAM_ADDR_SHIFT --CONFIG_ECC_SRAM_REQ_BIT CONFIG_EDB9301 CONFIG_EDB93XX_INDUSTRIAL CONFIG_EDB93XX_SDCS0 @@@ -340,11 -320,11 +283,8 @@@ CONFIG_ENABLE_MUST_CHEC CONFIG_ENV_ADDR_FLEX CONFIG_ENV_CALLBACK_LIST_DEFAULT CONFIG_ENV_CALLBACK_LIST_STATIC --CONFIG_ENV_COMMON_BOOT --CONFIG_ENV_EEPROM_IS_ON_I2C CONFIG_ENV_FLAGS_LIST_DEFAULT CONFIG_ENV_FLAGS_LIST_STATIC --CONFIG_ENV_FLASHBOOT CONFIG_ENV_IS_EMBEDDED CONFIG_ENV_IS_IN_ CONFIG_ENV_MAX_ENTRIES @@@ -360,8 -340,8 +300,6 @@@ CONFIG_ENV_SETTINGS_V CONFIG_ENV_SIZE_FLEX CONFIG_ENV_SROM_BANK CONFIG_ENV_TOTAL_SIZE --CONFIG_ENV_UBIFS_OPTION --CONFIG_ENV_UBI_MTD CONFIG_ENV_VERSION CONFIG_EPH_POWER_EN CONFIG_EPOLL @@@ -376,20 -356,20 +314,11 @@@ CONFIG_ETH1ADD CONFIG_ETH2ADDR CONFIG_ETHADDR CONFIG_ETHBASE --CONFIG_ETHER_INDEX --CONFIG_ETHER_NONE --CONFIG_ETHER_ON_FCC --CONFIG_ETHER_ON_FCC1 --CONFIG_ETHER_ON_FCC2 --CONFIG_ETHER_ON_FCC3 CONFIG_ETHPRIME CONFIG_ETH_BUFSIZE CONFIG_ETH_RXSIZE CONFIG_EXTRA_CLOCK CONFIG_EXTRA_ENV --CONFIG_EXTRA_ENV_BOARD_SETTINGS --CONFIG_EXTRA_ENV_ITB --CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS CONFIG_EXTRA_ENV_SETTINGS CONFIG_EXTRA_ENV_SETTINGS_COMMON CONFIG_EXT_AHB2AHB_BASE @@@ -414,7 -394,7 +343,6 @@@ CONFIG_EXYNOS_RELOCATE_CODE_BAS CONFIG_EXYNOS_SPL CONFIG_EXYNOS_TMU CONFIG_FACTORYSET --CONFIG_FAST_FLASH_BIT CONFIG_FB_ADDR CONFIG_FB_BACKLIGHT CONFIG_FB_DEFERRED_IO @@@ -525,7 -505,7 +453,6 @@@ CONFIG_FTWDT010_BAS CONFIG_FTWDT010_WATCHDOG CONFIG_FZOTG266HD0A_BASE CONFIG_GATEWAYIP --CONFIG_GICV2 CONFIG_GLOBAL_DATA_NOT_REG10 CONFIG_GLOBAL_TIMER CONFIG_GMII @@@ -546,7 -526,7 +473,6 @@@ CONFIG_HAS_ETH CONFIG_HAS_FEC CONFIG_HAS_FSL_DR_USB CONFIG_HAS_FSL_MPH_USB --CONFIG_HDBOOT CONFIG_HDMI_ENCODER_I2C_ADDR CONFIG_HETROGENOUS_CLUSTERS CONFIG_HIDE_LOGO_VERSION @@@ -699,7 -679,7 +625,6 @@@ CONFIG_HPS_SDR_CTRLCFG_STATICCFG_USEECC CONFIG_HPS_SDR_CTRLCFG_WFIFOCMAP_WFIFOCMAP CONFIG_HSMMC2_8BIT CONFIG_HUSH_INIT_VAR --CONFIG_HVBOOT CONFIG_HWCONFIG CONFIG_HW_ENV_SETTINGS CONFIG_I2C_ENV_EEPROM_BUS @@@ -764,7 -743,7 +688,6 @@@ CONFIG_JFFS2_PART_SIZ CONFIG_JFFS2_SUMMARY CONFIG_JRSTARTR_JR0 CONFIG_JTAG_CONSOLE --CONFIG_KCLK_DIS CONFIG_KEEP_SERVERADDR CONFIG_KEYBOARD CONFIG_KEYSTONE_NAND_MAX_RBL_PAGE @@@ -777,7 -756,7 +700,6 @@@ CONFIG_KIRKWOOD_EGIGA_INI CONFIG_KIRKWOOD_GPIO CONFIG_KIRKWOOD_PCIE_INIT CONFIG_KIRKWOOD_RGMII_PAD_1V8 --CONFIG_KIRQ_EN CONFIG_KM8321 CONFIG_KMTEGR1 CONFIG_KM_BOARD_EXTRA_ENV @@@ -863,7 -842,7 +785,6 @@@ CONFIG_LCD_MEN CONFIG_LD9040 CONFIG_LEGACY CONFIG_LEGACY_BOOTCMD_ENV --CONFIG_LINUX CONFIG_LITTLETON_LCD CONFIG_LMS283GF05 CONFIG_LOADADDR @@@ -920,11 -899,11 +841,8 @@@ CONFIG_MCF524 CONFIG_MCF5253 CONFIG_MCFRTC CONFIG_MCFTMR --CONFIG_MCLK_DIS CONFIG_MDIO_TIMEOUT --CONFIG_MEMSIZE CONFIG_MEMSIZE_IN_BYTES --CONFIG_MEMSIZE_MASK CONFIG_MEM_HOLE_16M CONFIG_MEM_INIT_VALUE CONFIG_MEM_REMAP @@@ -933,13 -912,13 +851,11 @@@ CONFIG_MII_DEFAULT_TSE CONFIG_MII_INIT CONFIG_MIPS_HUGE_TLB_SUPPORT CONFIG_MIPS_MT_FPAFF --CONFIG_MIRQ_EN CONFIG_MISC_COMMON CONFIG_MIU_1BIT_INTERLEAVED CONFIG_MIU_2BIT_21_7_INTERLEAVED CONFIG_MIU_2BIT_INTERLEAVED CONFIG_MIU_LINEAR --CONFIG_MMCBOOTCOMMAND CONFIG_MMCROOT CONFIG_MMC_DEFAULT_DEV CONFIG_MMC_RPMB_TRACE @@@ -1061,8 -1040,8 +977,6 @@@ CONFIG_OMAP_USB3PHY1_HOS CONFIG_ORIGEN CONFIG_OTHBOOTARGS CONFIG_OVERWRITE_ETHADDR_ONCE --CONFIG_PAGE_CNT_MASK --CONFIG_PAGE_CNT_SHIFT CONFIG_PALMAS_AUDPWR CONFIG_PALMAS_POWER CONFIG_PALMAS_SMPS7_FPWM @@@ -1163,7 -1142,7 +1077,6 @@@ CONFIG_PRINT CONFIG_PROC_FS CONFIG_PROFILE_ALL_BRANCHES CONFIG_PROFILING --CONFIG_PROOF_POINTS CONFIG_PSRAM_SCFG CONFIG_PWM CONFIG_PXA_LCD @@@ -1189,11 -1168,11 +1102,9 @@@ CONFIG_REALMODE_DEBU CONFIG_RED_LED CONFIG_REG CONFIG_REG_0 --CONFIG_REG_1_BASE CONFIG_REG_2 CONFIG_REG_3 CONFIG_REG_8 --CONFIG_REG_APER_SIZE CONFIG_REMAKE_ELF CONFIG_REQ CONFIG_RESERVED_01_BASE @@@ -1284,7 -1263,7 +1195,6 @@@ CONFIG_SERIRQ_CONTINUOUS_MOD CONFIG_SERVERIP CONFIG_SETUP_INITRD_TAG CONFIG_SETUP_MEMORY_TAGS --CONFIG_SET_BIST CONFIG_SET_BOOTARGS CONFIG_SET_DFU_ALT_BUF_LEN CONFIG_SFIO @@@ -1305,10 -1284,10 +1215,6 @@@ CONFIG_SH_ETHER_PHY_MOD CONFIG_SH_ETHER_SH7734_MII CONFIG_SH_ETHER_USE_PORT CONFIG_SH_GPIO_PFC --CONFIG_SH_I2C_8BIT --CONFIG_SH_I2C_CLOCK --CONFIG_SH_I2C_DATA_HIGH --CONFIG_SH_I2C_DATA_LOW CONFIG_SH_MMCIF_CLK CONFIG_SH_QSPI_BASE CONFIG_SH_SCIF_CLK_FREQ @@@ -1468,10 -1447,10 +1374,6 @@@ CONFIG_SYS_ATA_IDE1_OFFSE CONFIG_SYS_ATA_PORT_ADDR CONFIG_SYS_ATA_REG_OFFSET CONFIG_SYS_ATA_STRIDE --CONFIG_SYS_ATI_REV_A11 --CONFIG_SYS_ATI_REV_A12 --CONFIG_SYS_ATI_REV_A13 --CONFIG_SYS_ATI_REV_ID_MASK CONFIG_SYS_ATMEL_CPU_NAME CONFIG_SYS_AUTOLOAD CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION @@@ -1537,12 -1516,12 +1439,6 @@@ CONFIG_SYS_CMD_E CONFIG_SYS_CMD_IAS CONFIG_SYS_CMD_INT CONFIG_SYS_CMD_SUSPEND --CONFIG_SYS_CMXFCR_MASK1 --CONFIG_SYS_CMXFCR_MASK2 --CONFIG_SYS_CMXFCR_MASK3 --CONFIG_SYS_CMXFCR_VALUE1 --CONFIG_SYS_CMXFCR_VALUE2 --CONFIG_SYS_CMXFCR_VALUE3 CONFIG_SYS_CORE_SRAM CONFIG_SYS_CORE_SRAM_SIZE CONFIG_SYS_CPC_REINIT_F @@@ -1557,7 -1536,7 +1453,6 @@@ CONFIG_SYS_CPLD_FTIM CONFIG_SYS_CPLD_FTIM2 CONFIG_SYS_CPLD_FTIM3 CONFIG_SYS_CPLD_SIZE --CONFIG_SYS_CPMFCR_RAMTYPE CONFIG_SYS_CPM_INTERRUPT CONFIG_SYS_CPRI CONFIG_SYS_CPRI_CLK @@@ -1809,7 -1788,7 +1704,6 @@@ CONFIG_SYS_DEBUG_SERVER_FW_ADD CONFIG_SYS_DEBUG_SERVER_FW_IN_NOR CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS CONFIG_SYS_DEFAULT_VIDEO_MODE --CONFIG_SYS_DEF_EEPROM_ADDR CONFIG_SYS_DIALOG_PMIC_I2C_ADDR CONFIG_SYS_DIMM_SLOTS_PER_CTLR CONFIG_SYS_DIRECT_FLASH_NFS @@@ -1855,7 -1834,7 +1749,6 @@@ CONFIG_SYS_EXCEPTION_VECTORS_HIG CONFIG_SYS_FAST_CLK CONFIG_SYS_FAULT_ECHO_LINK_DOWN CONFIG_SYS_FAULT_MII_ADDR --CONFIG_SYS_FCC_PSMR CONFIG_SYS_FDT_BASE CONFIG_SYS_FDT_LOAD_ADDR CONFIG_SYS_FDT_PAD @@@ -2083,18 -2062,18 +1976,6 @@@ CONFIG_SYS_FSL_FM2_RX5_1G_OFFSE CONFIG_SYS_FSL_FMAN_ADDR CONFIG_SYS_FSL_GUTS_ADDR CONFIG_SYS_FSL_I2C --CONFIG_SYS_FSL_I2C2_OFFSET --CONFIG_SYS_FSL_I2C2_SLAVE --CONFIG_SYS_FSL_I2C2_SPEED --CONFIG_SYS_FSL_I2C3_OFFSET --CONFIG_SYS_FSL_I2C3_SLAVE --CONFIG_SYS_FSL_I2C3_SPEED --CONFIG_SYS_FSL_I2C4_OFFSET --CONFIG_SYS_FSL_I2C4_SLAVE --CONFIG_SYS_FSL_I2C4_SPEED --CONFIG_SYS_FSL_I2C_OFFSET --CONFIG_SYS_FSL_I2C_SLAVE --CONFIG_SYS_FSL_I2C_SPEED CONFIG_SYS_FSL_IFC_BASE CONFIG_SYS_FSL_IFC_BASE1 CONFIG_SYS_FSL_IFC_BASE2 @@@ -2307,10 -2286,10 +2188,8 @@@ CONFIG_SYS_I2C_CLK_OFFSE CONFIG_SYS_I2C_DIRECT_BUS CONFIG_SYS_I2C_DVI_ADDR CONFIG_SYS_I2C_DVI_BUS_NUM --CONFIG_SYS_I2C_EARLY_INIT CONFIG_SYS_I2C_EEPROM_CCID CONFIG_SYS_I2C_EEPROM_NXID --CONFIG_SYS_I2C_EEPROM_NXID_MAC CONFIG_SYS_I2C_EEPROM_PAGE_WRITE_BITS CONFIG_SYS_I2C_EEPROM_PAGE_WRITE_DELAY_MS CONFIG_SYS_I2C_EXPANDER_ADDR @@@ -2319,42 -2298,41 +2198,13 @@@ CONFIG_SYS_I2C_FRA CONFIG_SYS_I2C_G762_ADDR CONFIG_SYS_I2C_IDT6V49205B CONFIG_SYS_I2C_IFDR_DIV --CONFIG_SYS_I2C_IHS_CH0 --CONFIG_SYS_I2C_IHS_CH1 --CONFIG_SYS_I2C_IHS_CH2 --CONFIG_SYS_I2C_IHS_CH3 --CONFIG_SYS_I2C_IHS_DUAL --CONFIG_SYS_I2C_IHS_SLAVE_0 --CONFIG_SYS_I2C_IHS_SLAVE_0_1 --CONFIG_SYS_I2C_IHS_SLAVE_1 --CONFIG_SYS_I2C_IHS_SLAVE_1_1 --CONFIG_SYS_I2C_IHS_SLAVE_2 --CONFIG_SYS_I2C_IHS_SLAVE_2_1 --CONFIG_SYS_I2C_IHS_SLAVE_3 --CONFIG_SYS_I2C_IHS_SLAVE_3_1 --CONFIG_SYS_I2C_IHS_SPEED_0 --CONFIG_SYS_I2C_IHS_SPEED_0_1 --CONFIG_SYS_I2C_IHS_SPEED_1 --CONFIG_SYS_I2C_IHS_SPEED_1_1 --CONFIG_SYS_I2C_IHS_SPEED_2 --CONFIG_SYS_I2C_IHS_SPEED_2_1 --CONFIG_SYS_I2C_IHS_SPEED_3 --CONFIG_SYS_I2C_IHS_SPEED_3_1 CONFIG_SYS_I2C_INIT_BOARD CONFIG_SYS_I2C_LDI_ADDR - CONFIG_SYS_I2C_LEGACY CONFIG_SYS_I2C_LPC32XX_SLAVE CONFIG_SYS_I2C_LPC32XX_SPEED --CONFIG_SYS_I2C_MAC1_BUS --CONFIG_SYS_I2C_MAC1_CHIP_ADDR --CONFIG_SYS_I2C_MAC1_DATA_ADDR --CONFIG_SYS_I2C_MAC2_BUS --CONFIG_SYS_I2C_MAC2_CHIP_ADDR --CONFIG_SYS_I2C_MAC2_DATA_ADDR CONFIG_SYS_I2C_MAX_HOPS CONFIG_SYS_I2C_NCT72_ADDR CONFIG_SYS_I2C_NOPROBES --CONFIG_SYS_I2C_OFFSET CONFIG_SYS_I2C_PCA953X_ADDR CONFIG_SYS_I2C_PCA953X_WIDTH CONFIG_SYS_I2C_PCA9557_ADDR @@@ -2364,53 -2342,53 +2214,6 @@@ CONFIG_SYS_I2C_PINMUX_SE CONFIG_SYS_I2C_PXA CONFIG_SYS_I2C_QIXIS_ADDR CONFIG_SYS_I2C_RTC_ADDR --CONFIG_SYS_I2C_S3C24X0_SLAVE --CONFIG_SYS_I2C_S3C24X0_SPEED --CONFIG_SYS_I2C_SH --CONFIG_SYS_I2C_SH_BASE0 --CONFIG_SYS_I2C_SH_BASE1 --CONFIG_SYS_I2C_SH_BASE2 --CONFIG_SYS_I2C_SH_BASE3 --CONFIG_SYS_I2C_SH_BASE4 --CONFIG_SYS_I2C_SH_NUM_CONTROLLERS --CONFIG_SYS_I2C_SH_SPEED0 --CONFIG_SYS_I2C_SH_SPEED1 --CONFIG_SYS_I2C_SH_SPEED2 --CONFIG_SYS_I2C_SH_SPEED3 --CONFIG_SYS_I2C_SH_SPEED4 --CONFIG_SYS_I2C_SLAVE --CONFIG_SYS_I2C_SLAVE1 --CONFIG_SYS_I2C_SLAVE2 --CONFIG_SYS_I2C_SLAVE3 --CONFIG_SYS_I2C_SOFT --CONFIG_SYS_I2C_SOFT_SLAVE --CONFIG_SYS_I2C_SOFT_SLAVE_10 --CONFIG_SYS_I2C_SOFT_SLAVE_11 --CONFIG_SYS_I2C_SOFT_SLAVE_12 --CONFIG_SYS_I2C_SOFT_SLAVE_2 --CONFIG_SYS_I2C_SOFT_SLAVE_3 --CONFIG_SYS_I2C_SOFT_SLAVE_4 --CONFIG_SYS_I2C_SOFT_SLAVE_5 --CONFIG_SYS_I2C_SOFT_SLAVE_6 --CONFIG_SYS_I2C_SOFT_SLAVE_7 --CONFIG_SYS_I2C_SOFT_SLAVE_8 --CONFIG_SYS_I2C_SOFT_SLAVE_9 --CONFIG_SYS_I2C_SOFT_SPEED --CONFIG_SYS_I2C_SOFT_SPEED_10 --CONFIG_SYS_I2C_SOFT_SPEED_11 --CONFIG_SYS_I2C_SOFT_SPEED_12 --CONFIG_SYS_I2C_SOFT_SPEED_2 --CONFIG_SYS_I2C_SOFT_SPEED_3 --CONFIG_SYS_I2C_SOFT_SPEED_4 --CONFIG_SYS_I2C_SOFT_SPEED_5 --CONFIG_SYS_I2C_SOFT_SPEED_6 --CONFIG_SYS_I2C_SOFT_SPEED_7 --CONFIG_SYS_I2C_SOFT_SPEED_8 --CONFIG_SYS_I2C_SOFT_SPEED_9 --CONFIG_SYS_I2C_SPEED --CONFIG_SYS_I2C_SPEED1 --CONFIG_SYS_I2C_SPEED2 --CONFIG_SYS_I2C_SPEED3 CONFIG_SYS_I2C_TCA642X_ADDR CONFIG_SYS_I2C_TCA642X_BUS_NUM CONFIG_SYS_IBAT0L @@@ -2771,14 -2749,14 +2574,6 @@@ CONFIG_SYS_NVRAM_SIZ CONFIG_SYS_OBIR CONFIG_SYS_OHCI_BE_CONTROLLER CONFIG_SYS_OHCI_SWAP_REG_ACCESS --CONFIG_SYS_OMAP24_I2C_SLAVE1 --CONFIG_SYS_OMAP24_I2C_SLAVE2 --CONFIG_SYS_OMAP24_I2C_SLAVE3 --CONFIG_SYS_OMAP24_I2C_SLAVE4 --CONFIG_SYS_OMAP24_I2C_SPEED1 --CONFIG_SYS_OMAP24_I2C_SPEED2 --CONFIG_SYS_OMAP24_I2C_SPEED3 --CONFIG_SYS_OMAP24_I2C_SPEED4 CONFIG_SYS_OMAP_ABE_SYSCK CONFIG_SYS_ONENAND_BASE CONFIG_SYS_ONENAND_BLOCK_SIZE @@@ -3271,7 -3249,7 +3066,6 @@@ CONFIG_SYS_VCXK_REQUEST_POR CONFIG_SYS_VCXK_RESET_DDR CONFIG_SYS_VCXK_RESET_PIN CONFIG_SYS_VCXK_RESET_PORT --CONFIG_SYS_VGA_RAM_EN CONFIG_SYS_VIDEO_LOGO_MAX_SIZE CONFIG_SYS_VSC7385_BASE CONFIG_SYS_VSC7385_BASE_PHYS @@@ -3285,7 -3263,7 +3079,6 @@@ CONFIG_SYS_XHCI_USB1_ADD CONFIG_SYS_XHCI_USB2_ADDR CONFIG_SYS_XHCI_USB3_ADDR CONFIG_SYS_XIMG_LEN --CONFIG_SYS_i2C_FSL CONFIG_TAM3517_SETTINGS CONFIG_TCA642X CONFIG_TEGRA_BOARD_STRING @@@ -3335,7 -3313,7 +3128,6 @@@ CONFIG_TSEC_TBICR_SETTING CONFIG_TWL6030_POWER CONFIG_TX_DESCR_NUM CONFIG_TZSW_RESERVED_DRAM_SIZE --CONFIG_UBIBLOCK CONFIG_UBIFS_VOLUME CONFIG_UBI_PART CONFIG_UBI_SIZE