Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Thu, 13 Apr 2017 14:17:06 +0000 (10:17 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 13 Apr 2017 15:19:00 +0000 (11:19 -0400)
Drop CONFIG_STACKSIZE from include/configs/imx6_logic.h

Signed-off-by: Tom Rini <trini@konsulko.com>
1  2 
MAINTAINERS
arch/arm/Kconfig
arch/arm/dts/Makefile
board/aries/m53evk/m53evk.c
drivers/net/phy/Kconfig
include/configs/advantech_dms-ba16.h
include/configs/imx6_logic.h
include/configs/mx6slevk.h
scripts/config_whitelist.txt

diff --combined MAINTAINERS
@@@ -93,10 -93,9 +93,9 @@@ S:   Maintaine
  T:    git git://git.denx.de/u-boot-imx.git
  F:    arch/arm/cpu/arm1136/mx*/
  F:    arch/arm/cpu/arm926ejs/mx*/
- F:    arch/arm/cpu/arm926ejs/imx/
  F:    arch/arm/cpu/armv7/mx*/
  F:    arch/arm/cpu/armv7/vf610/
- F:    arch/arm/cpu/imx-common/
+ F:    arch/arm/imx-common/
  F:    arch/arm/include/asm/arch-imx/
  F:    arch/arm/include/asm/arch-mx*/
  F:    arch/arm/include/asm/arch-vf610/
@@@ -174,12 -173,9 +173,12 @@@ F:       arch/arm/include/asm/arch-sti*
  ARM SUNXI
  M:    Jagan Teki <jagan@openedev.com>
  M:    Maxime Ripard <maxime.ripard@free-electrons.com>
 +S:    Maintained
  T:    git git://git.denx.de/u-boot-sunxi.git
  F:    arch/arm/cpu/armv7/sunxi/
  F:    arch/arm/include/asm/arch-sunxi/
 +F:    arch/arm/mach-sunxi/
 +F:    board/sunxi/
  
  ARM TEGRA
  M:    Tom Warren <twarren@nvidia.com>
@@@ -225,6 -221,12 +224,6 @@@ S:        Maintaine
  T:    git git://git.denx.de/u-boot-avr32.git
  F:    arch/avr32/
  
 -BLACKFIN
 -M:    Sonic Zhang <sonic.adi@gmail.com>
 -S:    Maintained
 -T:    git git://git.denx.de/u-boot-blackfin.git
 -F:    arch/blackfin/
 -
  BUILDMAN
  M:    Simon Glass <sjg@chromium.org>
  S:    Maintained
@@@ -311,6 -313,11 +310,6 @@@ S:        Maintaine
  T:    git git://git.denx.de/u-boot-mmc.git
  F:    drivers/mmc/
  
 -OPENRISC
 -M:    Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
 -S:    Maintained
 -F:    arch/openrisc/
 -
  PATMAN
  M:    Simon Glass <sjg@chromium.org>
  S:    Maintained
@@@ -412,6 -419,12 +411,6 @@@ S:        Maintaine
  T:    git git://git.denx.de/u-boot-sh.git
  F:    arch/sh/
  
 -SPARC
 -#M:   Francois Retief <fgretief@spaceteq.co.za>
 -S:    Orphaned (Since 2016-02)
 -T:    git git://git.denx.de/u-boot-sparc.git
 -F:    arch/sparc/
 -
  SPI
  M:    Jagan Teki <jagan@openedev.com>
  S:    Maintained
diff --combined arch/arm/Kconfig
@@@ -214,10 -214,6 +214,10 @@@ config ENABLE_ARM_SOC_BOOT0_HOO
          ARM_SOC_BOOT0_HOOK which contains the required assembler
          preprocessor code.
  
 +config ARM_CORTEX_CPU_IS_UP
 +      bool
 +      default n
 +
  config USE_ARCH_MEMCPY
        bool "Use an assembly optimized implementation of memcpy"
        default y
@@@ -563,14 -559,6 +563,14 @@@ config TARGET_BCMNS
        bool "Support bcmnsp"
        select CPU_V7
  
 +config TARGET_BCMNS2
 +      bool "Support Broadcom Northstar2"
 +      select ARM64
 +      help
 +        Support for Broadcom Northstar 2 SoCs.  NS2 is a quad-core 64-bit
 +        ARMv8 Cortex-A57 processors targeting a broad range of networking
 +        applications
 +
  config ARCH_EXYNOS
        bool "Samsung EXYNOS"
        select DM
@@@ -734,12 -722,6 +734,12 @@@ config OMAP54X
  config AM43XX
        bool "AM43XX SoC"
        select ARCH_OMAP2
 +      imply SPL_DM
 +      imply SPL_DM_SEQ_ALIAS
 +      imply SPL_OF_CONTROL
 +      imply SPL_OF_TRANSLATE
 +      imply SPL_SEPARATE_BSS
 +      imply SPL_SYS_MALLOC_SIMPLE
        imply SYS_THUMB_BUILD
        help
          Support for AM43xx SOC from Texas Instruments.
@@@ -1136,7 -1118,6 +1136,7 @@@ config ARCH_ST
        select DM_SERIAL
        select BLK
        select DM_MMC
 +      select DM_RESET
        help
          Support for STMicroelectronics STiH407/10 SoC family.
          This SoC is used on Linaro 96Board STiH410-B2260
@@@ -1242,6 -1223,8 +1242,8 @@@ source "arch/arm/cpu/armv8/Kconfig
  
  source "arch/arm/imx-common/Kconfig"
  
+ source "board/aries/m28evk/Kconfig"
+ source "board/aries/m53evk/Kconfig"
  source "board/bosch/shc/Kconfig"
  source "board/BuR/brxre1/Kconfig"
  source "board/BuR/brppt1/Kconfig"
@@@ -1256,14 -1239,11 +1258,12 @@@ source "board/broadcom/bcm23550_w1d/Kco
  source "board/broadcom/bcm28155_ap/Kconfig"
  source "board/broadcom/bcmcygnus/Kconfig"
  source "board/broadcom/bcmnsp/Kconfig"
 +source "board/broadcom/bcmns2/Kconfig"
  source "board/cavium/thunderx/Kconfig"
  source "board/cirrus/edb93xx/Kconfig"
  source "board/compulab/cm_t335/Kconfig"
  source "board/compulab/cm_t43/Kconfig"
  source "board/creative/xfi3/Kconfig"
- source "board/denx/m28evk/Kconfig"
- source "board/denx/m53evk/Kconfig"
  source "board/freescale/ls2080a/Kconfig"
  source "board/freescale/ls2080aqds/Kconfig"
  source "board/freescale/ls2080ardb/Kconfig"
@@@ -1289,7 -1269,6 +1289,7 @@@ source "board/freescale/mx53evk/Kconfig
  source "board/freescale/mx53loco/Kconfig"
  source "board/freescale/mx53smd/Kconfig"
  source "board/freescale/s32v234evb/Kconfig"
 +source "board/gdsys/a38x/Kconfig"
  source "board/grinn/chiliboard/Kconfig"
  source "board/gumstix/pepper/Kconfig"
  source "board/h2200/Kconfig"
diff --combined arch/arm/dts/Makefile
@@@ -29,20 -29,17 +29,20 @@@ dtb-$(CONFIG_EXYNOS5) += exynos5250-arn
  dtb-$(CONFIG_EXYNOS7420) += exynos7420-espresso7420.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += \
        rk3036-sdk.dtb \
 +      rk3288-evb.dtb \
 +      rk3288-fennec.dtb \
        rk3288-firefly.dtb \
 +      rk3288-miqi.dtb \
 +      rk3288-popmetal.dtb \
 +      rk3188-radxarock.dtb \
 +      rk3288-rock2-square.dtb \
 +      rk3288-tinker.dtb \
        rk3288-veyron-jerry.dtb \
        rk3288-veyron-mickey.dtb \
        rk3288-veyron-minnie.dtb \
 -      rk3288-rock2-square.dtb \
 -      rk3288-evb.dtb \
 -      rk3288-fennec.dtb \
 -      rk3288-tinker.dtb \
 -      rk3288-popmetal.dtb \
        rk3328-evb.dtb \
 -      rk3399-evb.dtb
 +      rk3399-evb.dtb \
 +      rk3399-puma.dtb
  dtb-$(CONFIG_ARCH_MESON) += \
        meson-gxbb-odroidc2.dtb
  dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \
@@@ -61,7 -58,6 +61,7 @@@
        tegra30-colibri.dtb \
        tegra30-tec-ng.dtb \
        tegra114-dalmore.dtb \
 +      tegra124-apalis.dtb \
        tegra124-jetson-tk1.dtb \
        tegra124-nyan-big.dtb \
        tegra124-cei-tk1-som.dtb \
  
  dtb-$(CONFIG_ARCH_MVEBU) +=                   \
        armada-3720-db.dtb                      \
 +      armada-3720-espressobin.dtb             \
        armada-375-db.dtb                       \
        armada-388-clearfog.dtb                 \
        armada-388-gp.dtb                       \
        armada-385-amc.dtb                      \
        armada-7040-db.dtb                      \
        armada-8040-db.dtb                      \
 +      armada-8040-mcbin.dtb                   \
        armada-xp-gp.dtb                        \
        armada-xp-maxbcm.dtb                    \
        armada-xp-synology-ds414.dtb            \
 -      armada-xp-theadorable.dtb
 +      armada-xp-theadorable.dtb               \
 +      armada-38x-controlcenterdc.dtb
  
  dtb-$(CONFIG_ARCH_UNIPHIER_LD11) += \
        uniphier-ld11-ref.dtb
@@@ -228,7 -221,6 +228,7 @@@ dtb-$(CONFIG_MACH_SUN5I) += 
        sun5i-a13-olinuxino-micro.dtb \
        sun5i-a13-q8-tablet.dtb \
        sun5i-a13-utoo-p66.dtb \
 +      sun5i-gr8-chip-pro.dtb \
        sun5i-r8-chip.dtb
  dtb-$(CONFIG_MACH_SUN6I) += \
        sun6i-a31-app4-evb1.dtb \
@@@ -302,17 -294,13 +302,17 @@@ dtb-$(CONFIG_MACH_SUN8I_H3) += 
        sun8i-h3-orangepi-pc-plus.dtb \
        sun8i-h3-orangepi-plus.dtb \
        sun8i-h3-orangepi-plus2e.dtb \
 -      sun8i-h3-nanopi-neo.dtb
 +      sun8i-h3-nanopi-neo.dtb \
 +      sun8i-h3-nanopi-neo-air.dtb
 +dtb-$(CONFIG_MACH_SUN50I_H5) += \
 +      sun50i-h5-orangepi-pc2.dtb
  dtb-$(CONFIG_MACH_SUN50I) += \
        sun50i-a64-pine64-plus.dtb \
        sun50i-a64-pine64.dtb
  dtb-$(CONFIG_MACH_SUN9I) += \
        sun9i-a80-optimus.dtb \
 -      sun9i-a80-cubieboard4.dtb
 +      sun9i-a80-cubieboard4.dtb \
 +      sun9i-a80-cx-a99.dtb
  
  dtb-$(CONFIG_VF610) += vf500-colibri.dtb \
        vf610-colibri.dtb \
  dtb-$(CONFIG_MX53) += imx53-cx9020.dtb
  
  dtb-$(CONFIG_MX6) += imx6ull-14x14-evk.dtb \
+       imx6sl-evk.dtb \
        imx6sll-evk.dtb \
        imx6dl-icore.dtb \
        imx6dl-icore-rqs.dtb \
        imx6q-icore.dtb \
        imx6q-icore-rqs.dtb \
+       imx6q-logicpd.dtb \
        imx6sx-sabreauto.dtb \
        imx6ul-geam-kit.dtb \
        imx6ul-isiot-emmc.dtb \
@@@ -1,5 -1,5 +1,5 @@@
  /*
-  * DENX M53 module
+  * Aries M53 module
   *
   * Copyright (C) 2012-2013 Marek Vasut <marex@denx.de>
   *
@@@ -59,15 -59,13 +59,15 @@@ int dram_init(void
        return 0;
  }
  
 -void dram_init_banksize(void)
 +int dram_init_banksize(void)
  {
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = mx53_dram_size[0];
  
        gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
        gd->bd->bi_dram[1].size = mx53_dram_size[1];
 +
 +      return 0;
  }
  
  static void setup_iomux_uart(void)
@@@ -381,7 -379,7 +381,7 @@@ int board_init(void
  
  int checkboard(void)
  {
-       puts("Board: DENX M53EVK\n");
+       puts("Board: Aries M53EVK\n");
  
        return 0;
  }
diff --combined drivers/net/phy/Kconfig
@@@ -15,6 -15,19 +15,19 @@@ if PHYLI
  config MV88E61XX_SWITCH
        bool "Marvel MV88E61xx Ethernet switch PHY support."
  
+ if MV88E61XX_SWITCH
+ config MV88E61XX_CPU_PORT
+       int "CPU Port"
+ config MV88E61XX_PHY_PORTS
+       hex "Bitmask of PHY Ports"
+ config MV88E61XX_FIXED_PORTS
+       hex "Bitmask of PHYless serdes Ports"
+ endif # MV88E61XX_SWITCH
  config PHYLIB_10G
        bool "Generic 10G PHY support"
  
@@@ -90,14 -103,4 +103,14 @@@ config PHY_VITESS
  config PHY_XILINX
        bool "Xilinx Ethernet PHYs support"
  
 +config PHY_FIXED
 +      bool "Fixed-Link PHY"
 +      depends on DM_ETH
 +      help
 +        Fixed PHY is used for having a 'fixed-link' to another MAC with a direct
 +        connection (MII, RGMII, ...).
 +        There is nothing like autoneogation and so
 +        on, the link is always up with fixed speed and fixed duplex-setting.
 +        More information: doc/device-tree-bindings/net/fixed-link.txt
 +
  endif #PHYLIB
  #define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
  
  #define CONFIG_CMDLINE_EDITING
 -#define CONFIG_STACKSIZE               (128 * 1024)
  
  /* Physical Memory Map */
  #define CONFIG_NR_DRAM_BANKS           1
  #define CONFIG_SYS_FSL_USDHC_NUM        3
  
  /* Framebuffer */
+ #ifdef CONFIG_VIDEO
  #define CONFIG_VIDEO_IPUV3
  #define CONFIG_VIDEO_BMP_RLE8
  #define CONFIG_SPLASH_SCREEN
  #define CONFIG_IPUV3_CLK                260000000
  #define CONFIG_IMX_HDMI
  #define CONFIG_IMX_VIDEO_SKIP
+ #endif
  
  #define CONFIG_PWM_IMX
  #define CONFIG_IMX6_PWM_PER_CLK         66000000
index 0000000,bb95dd8..175ddc4
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,178 +1,176 @@@
 -#define CONFIG_STACKSIZE               (128 * 1024)
 -
+ /*
+  * Copyright (C) 2017 Logic PD, Inc.
+  *
+  * Configuration settings for the LogicPD i.MX6 SOM.
+  *
+  * SPDX-License-Identifier:    GPL-2.0+
+  */
+ #ifndef __IMX6LOGIC_CONFIG_H
+ #define __IMX6LOGIC_CONFIG_H
+ #define CONFIG_MXC_UART_BASE   UART1_BASE
+ #define CONSOLE_DEV            "ttymxc0"
+ #include <config_distro_defaults.h>
+ #include "mx6_common.h"
+ /* Size of malloc() pool */
+ #define CONFIG_SYS_MALLOC_LEN          (10 * SZ_1M)
+ #define CONFIG_MXC_UART
+ /* MMC Configs */
+ #define CONFIG_SYS_FSL_ESDHC_ADDR      0
+ #define CONFIG_SYS_FSL_USDHC_NUM       2
+ #define CONFIG_MMCROOT         "/dev/mmcblk1p2" /* Dev kit SD card */
+ /* Ethernet Configs */
+ #define CONFIG_MII
+ #define CONFIG_FEC_XCV_TYPE            RMII
+ #define CONFIG_ETHPRIME                "FEC"
+ #define CONFIG_FEC_MXC_PHYADDR         0
+ #define CONFIG_PHYLIB
+ #define CONFIG_PHY_SMSC
+ /* Command definition */
+ #define CONFIG_CMD_BMODE
+ #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+       "script=boot.scr\0" \
+       "image=zImage\0" \
+       "bootm_size=0x10000000\0" \
+       "fdt_addr_r=0x18000000\0" \
+       "fdt_addr=0x18000000\0" \
+       "ramdisk_addr_r=0x13000000\0" \
+       "ramdiskaddr=0x13000000\0" \
+       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "ramdisk_file=rootfs.cpio.uboot\0" \
+       "boot_fdt=try\0" \
+       "ip_dyn=yes\0" \
+       "console=" CONSOLE_DEV "\0" \
+       "mmcdev=1\0" \
+       "mmcpart=1\0" \
+       "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+       "nandroot=ubi0:rootfs rootfstype=ubifs\0" \
+       "mmcargs=setenv bootargs console=${console},${baudrate}" \
+       " root=${mmcroot} ${mtdparts}\0" \
+       "nandargs=setenv bootargs console=${console},${baudrate}" \
+       " ubi.mtd=fs root=${nandroot} ${mtdparts}\0" \
+       "ramargs=setenv bootargs console=${console},${baudrate}" \
+       " root=/dev/ram rw ${mtdparts}\0"                    \
+       "loadbootscript=" \
+       "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
+       "bootscript=echo Running bootscript from mmc ...;" \
+       " source\0" \
+       "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image};" \
+       " setenv kernelsize ${filesize}\0" \
+       "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+       "loadramdisk=fatload mmc ${mmcdev}:${mmcpart} ${ramdiskaddr}" \
+       " ${ramdisk_file}; setenv ramdisksize ${filesize}\0" \
+       "mmcboot=echo Booting from mmc...; run mmcargs; run loadimage;" \
+       " run loadfdt; bootz ${loadaddr} - ${fdt_addr}\0" \
+       "mmcramboot=run ramargs; run loadimage;" \
+       " run loadfdt; run loadramdisk;" \
+       " bootz ${loadaddr} ${ramdiskaddr} ${fdt_addr}\0" \
+       "nandboot=echo Booting from nand ...; " \
+       " run nandargs;" \
+       " nand read ${loadaddr} kernel ${kernelsize};" \
+       " nand read ${fdt_addr} dtb;" \
+       " bootz ${loadaddr} - ${fdt_addr}\0" \
+       "nandramboot=echo Booting RAMdisk from nand ...; " \
+       " nand read ${ramdiskaddr} fs ${ramdisksize};" \
+       " nand read ${loadaddr} kernel ${kernelsize};" \
+       " nand read ${fdt_addr} dtb;" \
+       " run ramargs;" \
+       " bootz ${loadaddr} ${ramdiskaddr} ${fdt_addr}\0" \
+       "netargs=setenv bootargs console=${console},${baudrate} " \
+       "root=/dev/nfs" \
+       " ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
+       "netboot=echo Booting from net ...; " \
+       "run netargs; " \
+       "if test ${ip_dyn} = yes; then " \
+               "setenv get_cmd dhcp; " \
+       "else " \
+               "setenv get_cmd tftp; " \
+       "fi; " \
+       "${get_cmd} ${image}; " \
+       "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+               "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
+                       "bootz ${loadaddr} - ${fdt_addr}; " \
+               "else " \
+                       "if test ${boot_fdt} = try; then " \
+                               "bootz; " \
+                               "else " \
+                               "echo WARN: Cannot load the DT; " \
+                       "fi; " \
+               "fi; " \
+       "else " \
+              "bootz; " \
+       "fi;\0" \
+       "autoboot=mmc dev ${mmcdev};" \
+       "if mmc rescan; then " \
+               "if run loadbootscript; then " \
+                       "run bootscript; " \
+               "else " \
+               "if run loadimage; then " \
+                       "run mmcboot; " \
+               "else run netboot; " \
+               "fi; " \
+       "fi; " \
+       "else run netboot; fi"
+ #define CONFIG_BOOTCOMMAND \
+       "run autoboot"
+ #define CONFIG_ARP_TIMEOUT     200UL
+ #define CONFIG_SYS_MEMTEST_START       0x10000000
+ #define CONFIG_SYS_MEMTEST_END         0x10010000
+ #define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000
+ /* Physical Memory Map */
+ #define CONFIG_NR_DRAM_BANKS           1
+ #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
+ #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+ #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
+ #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+ #define CONFIG_SYS_INIT_SP_OFFSET \
+       (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
+ #define CONFIG_SYS_INIT_SP_ADDR \
+       (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
+ /* Environment organization */
+ #define CONFIG_ENV_SIZE                        (8 * 1024)
+ #define CONFIG_ENV_IS_IN_NAND
+ #define CONFIG_ENV_OFFSET             0x400000
+ #define CONFIG_ENV_SECT_SIZE          CONFIG_ENV_SIZE
+ /* NAND stuff */
+ #define CONFIG_CMD_NAND_TRIMFFS
+ #define CONFIG_SYS_MAX_NAND_DEVICE     1
+ #define CONFIG_SYS_NAND_BASE           0x40000000
+ #define CONFIG_SYS_NAND_5_ADDR_CYCLE
+ #define CONFIG_SYS_NAND_ONFI_DETECTION
+ #define CONFIG_SYS_NAND_U_BOOT_START  CONFIG_SYS_TEXT_BASE
+ #define CONFIG_SYS_NAND_U_BOOT_OFFS   0x200000
+ /* MTD device */
+ # define CONFIG_MTD_DEVICE
+ # define CONFIG_CMD_MTDPARTS
+ # define CONFIG_MTD_PARTITIONS
+ # define MTDIDS_DEFAULT               "nand0=gpmi-nand"
+ # define MTDPARTS_DEFAULT     "mtdparts=gpmi-nand:4m(uboot)," \
+                                       "1m(env),16m(kernel),1m(dtb),-(fs)"
+ /* DMA stuff, needed for GPMI/MXS NAND support */
+ #define CONFIG_APBH_DMA
+ #define CONFIG_APBH_DMA_BURST
+ #define CONFIG_APBH_DMA_BURST8
+ /* EEPROM  contains serial no, MAC addr and other Logic PD info */
+ #define CONFIG_I2C_EEPROM
+ #endif                         /* __IMX6LOGIC_CONFIG_H */
  #define CONFIG_SYS_FSL_ESDHC_ADDR     USDHC2_BASE_ADDR
  
  /* I2C Configs */
- #define CONFIG_SYS_I2C
  #define CONFIG_SYS_I2C_MXC
  #define CONFIG_SYS_I2C_MXC_I2C1               /* enable I2C bus 1 */
  #define CONFIG_SYS_I2C_MXC_I2C2               /* enable I2C bus 2 */
  #define CONFIG_SYS_I2C_MXC_I2C3               /* enable I2C bus 3 */
  #define CONFIG_SYS_I2C_SPEED            100000
  
- /* PMIC */
- #define CONFIG_POWER
- #define CONFIG_POWER_I2C
- #define CONFIG_POWER_PFUZE100
- #define CONFIG_POWER_PFUZE100_I2C_ADDR        0x08
  #define CONFIG_FEC_MXC
  #define CONFIG_MII
  #define IMX_FEC_BASE                  ENET_BASE_ADDR
  #define CONFIG_SYS_MEMTEST_START      0x80000000
  #define CONFIG_SYS_MEMTEST_END                (CONFIG_SYS_MEMTEST_START + SZ_512M)
  
 -#define CONFIG_STACKSIZE              SZ_128K
 -
  /* Physical Memory Map */
  #define CONFIG_NR_DRAM_BANKS          1
  #define PHYS_SDRAM                    MMDC0_ARB_BASE_ADDR
  /* Environment organization */
  #define CONFIG_ENV_SIZE                       SZ_8K
  
- #if defined CONFIG_SYS_BOOT_SPINOR
+ #if defined CONFIG_SPI_BOOT
  #define CONFIG_ENV_IS_IN_SPI_FLASH
  #define CONFIG_ENV_OFFSET               (768 * 1024)
  #define CONFIG_ENV_SECT_SIZE            (64 * 1024)
@@@ -66,6 -66,8 +66,6 @@@ CONFIG_ADDRES
  CONFIG_ADDR_AUTO_INCR_BIT
  CONFIG_ADDR_MAP
  CONFIG_ADDR_STREAMING
 -CONFIG_ADI_GPIO1
 -CONFIG_ADI_GPIO2
  CONFIG_ADNPESC1
  CONFIG_ADP_AG101P
  CONFIG_AEABI
@@@ -125,6 -127,7 +125,7 @@@ CONFIG_ARC_SERIA
  CONFIG_ARC_UART_BASE
  CONFIG_ARIA
  CONFIG_ARIA_FPGA
+ CONFIG_ARIES_M28_V10
  CONFIG_ARM926EJS
  CONFIG_ARMADA100
  CONFIG_ARMADA100_FEC
@@@ -234,10 -237,45 +235,10 @@@ CONFIG_BCM_SF2_ET
  CONFIG_BCM_SF2_ETH_DEFAULT_PORT
  CONFIG_BCM_SF2_ETH_GMAC
  CONFIG_BD_NUM_CPUS
 -CONFIG_BF506_UART0_PORTF
 -CONFIG_BF506_UART1_PORTG
 -CONFIG_BF50x
 -CONFIG_BF51x
 -CONFIG_BF527_EZKIT_REV_2_1
 -CONFIG_BF52x
 -CONFIG_BF548_ATAPI_ALTERNATIVE_PORT
 -CONFIG_BF54x
 -CONFIG_BF60x
 -CONFIG_BFIN_ATAPI_BASE_ADDR
  CONFIG_BFIN_ATA_MODE
 -CONFIG_BFIN_BOARD_VERSION_1_0
 -CONFIG_BFIN_BOOTROM_USES_EVT1
 -CONFIG_BFIN_BOOT_MODE
 -CONFIG_BFIN_CF_IDE
 -CONFIG_BFIN_CPU
 -CONFIG_BFIN_GET_DCLK_M
 -CONFIG_BFIN_GPIO_TRACK
 -CONFIG_BFIN_HDD_IDE
 -CONFIG_BFIN_IDE
 -CONFIG_BFIN_INS_LOWOVERHEAD
 -CONFIG_BFIN_LINKPORT
 -CONFIG_BFIN_MAC
  CONFIG_BFIN_MAC_PINS
 -CONFIG_BFIN_NFC
  CONFIG_BFIN_NFC_BOOTROM_ECC
 -CONFIG_BFIN_NFC_CTL_VAL
  CONFIG_BFIN_NFC_NO_HW_ECC
 -CONFIG_BFIN_SCRATCH_REG
 -CONFIG_BFIN_SDH
 -CONFIG_BFIN_SERIAL
 -CONFIG_BFIN_SOFT_SWITCH
 -CONFIG_BFIN_SPI
 -CONFIG_BFIN_SPI6XX
 -CONFIG_BFIN_SPI_GPIO_CS
 -CONFIG_BFIN_SPI_IDLE_VAL
 -CONFIG_BFIN_SPI_IMG_SIZE
 -CONFIG_BFIN_TRUE_IDE
 -CONFIG_BFIN_WATCHDOG
  CONFIG_BIOSEMU
  CONFIG_BITBANGMII_MULTI
  CONFIG_BKUP_FLASH
@@@ -275,7 -313,9 +276,7 @@@ CONFIG_BOOGE
  CONFIG_BOOM
  CONFIG_BOOTARGS
  CONFIG_BOOTARGS_AXM
 -CONFIG_BOOTARGS_ROOT
  CONFIG_BOOTARGS_TAURUS
 -CONFIG_BOOTARGS_VIDEO
  CONFIG_BOOTBLOCK
  CONFIG_BOOTCOMMAND
  CONFIG_BOOTCOUNT_ALEN
@@@ -346,12 -386,17 +347,12 @@@ CONFIG_BUILD_ENVCR
  CONFIG_BUILD_TARGET
  CONFIG_BUS_WIDTH
  CONFIG_BZIP2
 -CONFIG_CACHELINE_ALIGNED_L1
  CONFIG_CADDY2
  CONFIG_CALXEDA_XGMAC
  CONFIG_CAM5200
  CONFIG_CAM5200_NIOSFLASH
  CONFIG_CANMB
  CONFIG_CAN_DRIVER
 -CONFIG_CCLK_ACT_DIV
 -CONFIG_CCLK_DIV
 -CONFIG_CCLK_DIV_not_defined_properly
 -CONFIG_CCLK_HZ
  CONFIG_CDP_APPLIANCE_VLAN_TYPE
  CONFIG_CDP_CAPABILITIES
  CONFIG_CDP_DEVICE_ID
@@@ -365,6 -410,8 +366,6 @@@ CONFIG_CFG_DATA_SECTO
  CONFIG_CFG_FAT
  CONFIG_CFG_USB
  CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS
 -CONFIG_CF_ATASEL_DIS
 -CONFIG_CF_ATASEL_ENA
  CONFIG_CF_DSPI
  CONFIG_CF_SBF
  CONFIG_CF_SPI
@@@ -372,6 -419,8 +373,6 @@@ CONFIG_CF_V
  CONFIG_CF_V3
  CONFIG_CF_V4
  CONFIG_CF_V4E
 -CONFIG_CGU_CTL_VAL
 -CONFIG_CGU_DIV_VAL
  CONFIG_CHAIN_BOOT_CMD
  CONFIG_CHARON
  CONFIG_CHIP_SELECTS_PER_CTRL
@@@ -381,6 -430,8 +382,6 @@@ CONFIG_CIS8201_PH
  CONFIG_CI_UDC_HAS_HOSTPC
  CONFIG_CLK0_DIV
  CONFIG_CLK0_EN
 -CONFIG_CLKIN_HALF
 -CONFIG_CLKIN_HZ
  CONFIG_CLK_1000_200_200
  CONFIG_CLK_1000_330_165
  CONFIG_CLK_1000_400_200
@@@ -401,11 -452,13 +402,11 @@@ CONFIG_CMD_BEDBU
  CONFIG_CMD_BLOB
  CONFIG_CMD_BMODE
  CONFIG_CMD_BMP
 -CONFIG_CMD_BOOTLDR
  CONFIG_CMD_BSP
  CONFIG_CMD_CBFS
  CONFIG_CMD_CHIP_CONFIG
  CONFIG_CMD_CLEAR
  CONFIG_CMD_CLK
 -CONFIG_CMD_CPLBINFO
  CONFIG_CMD_CRAMFS
  CONFIG_CMD_DATE
  CONFIG_CMD_DEFAULTENV_VARS
@@@ -453,6 -506,7 +454,6 @@@ CONFIG_CMD_IOTRAC
  CONFIG_CMD_IRQ
  CONFIG_CMD_JFFS2
  CONFIG_CMD_KGDB
 -CONFIG_CMD_LDRINFO
  CONFIG_CMD_LOADY
  CONFIG_CMD_LZMADEC
  CONFIG_CMD_MAX6957
@@@ -465,6 -519,7 +466,6 @@@ CONFIG_CMD_NAND_LOCK_UNLOC
  CONFIG_CMD_NAND_TORTURE
  CONFIG_CMD_NAND_TRIMFFS
  CONFIG_CMD_ONENAND
 -CONFIG_CMD_OTP
  CONFIG_CMD_PCA953X
  CONFIG_CMD_PCA953X_INFO
  CONFIG_CMD_PCI
@@@ -481,6 -536,8 +482,6 @@@ CONFIG_CMD_SCS
  CONFIG_CMD_SDRAM
  CONFIG_CMD_SF_TEST
  CONFIG_CMD_SH_ZIMAGEBOOT
 -CONFIG_CMD_SOFTSWITCH
 -CONFIG_CMD_SPIBOOTLDR
  CONFIG_CMD_SPL
  CONFIG_CMD_SPL_NAND_OFS
  CONFIG_CMD_SPL_WRITE_SIZE
@@@ -494,6 -551,7 +495,6 @@@ CONFIG_CMD_TRAC
  CONFIG_CMD_TSI148
  CONFIG_CMD_UBIFS
  CONFIG_CMD_UNIVERSE
 -CONFIG_CMD_USB_STORAGE
  CONFIG_CMD_UUID
  CONFIG_CMD_ZBOOT
  CONFIG_CMD_ZFS
@@@ -532,6 -590,7 +533,6 @@@ CONFIG_CONS_SCIF
  CONFIG_CONTROL
  CONFIG_CONTROLCENTERD
  CONFIG_CON_ROT
 -CONFIG_CORE1_RUN
  CONFIG_CORE_COUNT
  CONFIG_CORTINA_FW_ADDR
  CONFIG_CORTINA_FW_LENGTH
@@@ -613,7 -672,9 +614,7 @@@ CONFIG_DBG_MONITO
  CONFIG_DB_784MP_GP
  CONFIG_DCACHE
  CONFIG_DCACHE_OFF
 -CONFIG_DCACHE_WB
  CONFIG_DCFG_ADDR
 -CONFIG_DCLK_DIV
  CONFIG_DDR_
  CONFIG_DDR_2HCLK
  CONFIG_DDR_2T_TIMING
@@@ -643,13 -704,19 +644,13 @@@ CONFIG_DDR_RFDC_FIXE
  CONFIG_DDR_RQDC_FIXED
  CONFIG_DDR_SPD
  CONFIG_DEBUG
 -CONFIG_DEBUG_DUMP
 -CONFIG_DEBUG_DUMP_SYMS
 -CONFIG_DEBUG_EARLY_SERIAL
  CONFIG_DEBUG_FS
  CONFIG_DEBUG_LED
  CONFIG_DEBUG_LOCK_ALLOC
 -CONFIG_DEBUG_NULL_PTR
  CONFIG_DEBUG_SECTION_MISMATCH
  CONFIG_DEBUG_SEMIHOSTING
 -CONFIG_DEBUG_SERIAL
  CONFIG_DEBUG_UART_LINFLEXUART
  CONFIG_DEBUG_WRITECOUNT
 -CONFIG_DEB_DMA_URGENT
  CONFIG_DEEP_SLEEP
  CONFIG_DEFAULT
  CONFIG_DEFAULT_CONSOLE
@@@ -661,7 -728,6 +662,6 @@@ CONFIG_DEFAULT_SPI_C
  CONFIG_DEFAULT_SPI_MODE
  CONFIG_DEF_HWCONFIG
  CONFIG_DELAY_ENVIRONMENT
- CONFIG_DENX_M28_V10
  CONFIG_DESIGNWARE_ETH
  CONFIG_DESIGNWARE_WATCHDOG
  CONFIG_DEVCONCENTER
@@@ -699,7 -765,15 +699,7 @@@ CONFIG_DMA_COHERENT_SIZ
  CONFIG_DMA_LPC32XX
  CONFIG_DMA_NONCOHERENT
  CONFIG_DMA_REQ_BIT
 -CONFIG_DMC_DDRCFG
 -CONFIG_DMC_DDRCTL
 -CONFIG_DMC_DDREMR1
 -CONFIG_DMC_DDRMR
 -CONFIG_DMC_DDRTR0
 -CONFIG_DMC_DDRTR1
 -CONFIG_DMC_DDRTR2
  CONFIG_DNET_AUTONEG_TIMEOUT
 -CONFIG_DNP5370_EXT_WD_DISABLE
  CONFIG_DP_DDR_CTRL
  CONFIG_DP_DDR_DIMM_SLOTS_PER_CTLR
  CONFIG_DP_DDR_NUM_CTRLS
@@@ -714,6 -788,7 +714,6 @@@ CONFIG_DRIVER_AX88796
  CONFIG_DRIVER_DM9000
  CONFIG_DRIVER_EP93XX_MAC
  CONFIG_DRIVER_ETHER
 -CONFIG_DRIVER_NAND_BFIN
  CONFIG_DRIVER_NE2000
  CONFIG_DRIVER_NE2000_BASE
  CONFIG_DRIVER_NE2000_CCR
@@@ -776,6 -851,7 +776,6 @@@ CONFIG_DW_ALTDESCRIPTO
  CONFIG_DW_AXI_BURST_LEN
  CONFIG_DW_GMAC_DEFAULT_DMA_PBL
  CONFIG_DW_MAC_FORCE_THRESHOLD_MODE
 -CONFIG_DW_PORTS
  CONFIG_DW_SERIAL
  CONFIG_DW_UDC
  CONFIG_DW_WDT_BASE
@@@ -784,7 -860,24 +784,7 @@@ CONFIG_DYNAMIC_MMC_DEVN
  CONFIG_E1000_NO_NVM
  CONFIG_E300
  CONFIG_E5500
 -CONFIG_EBCAW_VAL
  CONFIG_EBC_PPC4xx_IBM_VER1
 -CONFIG_EBIU_AMBCTL0_VAL
 -CONFIG_EBIU_AMBCTL1_VAL
 -CONFIG_EBIU_AMGCTL_VAL
 -CONFIG_EBIU_DDRCTL0_VAL
 -CONFIG_EBIU_DDRCTL1_VAL
 -CONFIG_EBIU_DDRCTL2_VAL
 -CONFIG_EBIU_DDRCTL3_VAL
 -CONFIG_EBIU_DDRQUE_VAL
 -CONFIG_EBIU_FCTL_VAL
 -CONFIG_EBIU_MBSCTL_VAL
 -CONFIG_EBIU_MODE_VAL
 -CONFIG_EBIU_RSTCTL_VAL
 -CONFIG_EBIU_SDBCTL_VAL
 -CONFIG_EBIU_SDGCTL_VAL
 -CONFIG_EBIU_SDRRC_VAL
 -CONFIG_EBSZ_VAL
  CONFIG_ECC
  CONFIG_ECC_INIT_VIA_DDRCONTROLLER
  CONFIG_ECC_MODE_MASK
@@@ -846,6 -939,7 +846,6 @@@ CONFIG_ENV_FLAGS_LIST_DEFAUL
  CONFIG_ENV_FLAGS_LIST_STATIC
  CONFIG_ENV_FLASHBOOT
  CONFIG_ENV_IS_EMBEDDED
 -CONFIG_ENV_IS_EMBEDDED_IN_LDR
  CONFIG_ENV_IS_IN_
  CONFIG_ENV_IS_IN_DATAFLASH
  CONFIG_ENV_IS_IN_EEPROM
@@@ -929,6 -1023,7 +929,6 @@@ CONFIG_ETHER_ON_SC
  CONFIG_ETHPRIME
  CONFIG_ETH_BUFSIZE
  CONFIG_ETH_RXSIZE
 -CONFIG_EXCEPTION_DEFER
  CONFIG_EXT4_WRITE
  CONFIG_EXTRA_BOOTARGS
  CONFIG_EXTRA_CLOCK
@@@ -1213,6 -1308,7 +1213,6 @@@ CONFIG_HAS_FSL_DR_US
  CONFIG_HAS_FSL_MPH_USB
  CONFIG_HAS_FSL_XHCI_USB
  CONFIG_HAS_POST
 -CONFIG_HAS_VR
  CONFIG_HAVE_ACPI_RESUME
  CONFIG_HAVE_OWN_RESET
  CONFIG_HCLK_FREQ
@@@ -1381,6 -1477,7 +1381,6 @@@ CONFIG_HVBOO
  CONFIG_HWCONFIG
  CONFIG_HW_ENV_SETTINGS
  CONFIG_HW_WATCHDOG
 -CONFIG_HW_WATCHDOG_TIMEOUT_INITCODE
  CONFIG_HW_WATCHDOG_TIMEOUT_MS
  CONFIG_I2C
  CONFIG_I2CFAST
@@@ -1408,6 -1505,7 +1408,6 @@@ CONFIG_I2C_RTC_ADD
  CONFIG_I2C_TIMEOUT
  CONFIG_IBM_EMAC4_V4
  CONFIG_ICACHE
 -CONFIG_ICACHE_OFF
  CONFIG_ICON
  CONFIG_ICS307_REFCLK_HZ
  CONFIG_IDE_8xx_DIRECT
@@@ -1468,6 -1566,7 +1468,6 @@@ CONFIG_IPAM390_GPIO_BOOTMOD
  CONFIG_IPAM390_GPIO_LED_GREEN
  CONFIG_IPAM390_GPIO_LED_RED
  CONFIG_IPEK01
 -CONFIG_IPIPE
  CONFIG_IPROC
  CONFIG_IPUV3_CLK
  CONFIG_IP_DEFRAG
@@@ -1493,7 -1592,9 +1493,7 @@@ CONFIG_JFFS2_PART_SIZ
  CONFIG_JFFS2_SUMMARY
  CONFIG_JRSTARTR_JR0
  CONFIG_JTAG_CONSOLE
 -CONFIG_JTAG_CONSOLE_TIMEOUT
  CONFIG_JUPITER
 -CONFIG_KALLSYMS
  CONFIG_KASAN
  CONFIG_KATMAI
  CONFIG_KCLK_DIS
@@@ -1659,6 -1760,8 +1659,6 @@@ CONFIG_LIBAT
  CONFIG_LIB_HW_RAND
  CONFIG_LIB_UUID
  CONFIG_LINUX
 -CONFIG_LINUX_CMDLINE_ADDR
 -CONFIG_LINUX_CMDLINE_SIZE
  CONFIG_LINUX_RESET_VEC
  CONFIG_LITTLETON_LCD
  CONFIG_LMB
@@@ -1697,6 -1800,11 +1697,6 @@@ CONFIG_LPC_BAS
  CONFIG_LPC_IO_BASE
  CONFIG_LPUART
  CONFIG_LPUART_32B_REG
 -CONFIG_LQ035Q1_LCD_MODE
 -CONFIG_LQ035Q1_SPI_BUS
 -CONFIG_LQ035Q1_SPI_CS
 -CONFIG_LQ035Q1_USE_RGB565_8_BIT_PPI
 -CONFIG_LQ035Q1_USE_RGB888_8_BIT_PPI
  CONFIG_LQ038J7DH53
  CONFIG_LS102XA
  CONFIG_LS102XA_STREAM_ID
@@@ -1777,9 -1885,11 +1777,9 @@@ CONFIG_MECP512
  CONFIG_MEMSIZE
  CONFIG_MEMSIZE_IN_BYTES
  CONFIG_MEMSIZE_MASK
 -CONFIG_MEM_ADD_WDTH
  CONFIG_MEM_HOLE_16M
  CONFIG_MEM_INIT_VALUE
  CONFIG_MEM_REMAP
 -CONFIG_MEM_SIZE
  CONFIG_MENUKEY
  CONFIG_MENUPROMPT
  CONFIG_MENU_SHOW
@@@ -1999,6 -2109,7 +1999,6 @@@ CONFIG_NAND_OMAP_EL
  CONFIG_NAND_OMAP_GPMC
  CONFIG_NAND_OMAP_GPMC_PREFETCH
  CONFIG_NAND_OMAP_GPMC_WSCFG
 -CONFIG_NAND_PLAT
  CONFIG_NAND_SECBOOT
  CONFIG_NAND_SPL
  CONFIG_NAND_U_BOOT
@@@ -2047,6 -2158,7 +2047,6 @@@ CONFIG_NS8382
  CONFIG_NS87308
  CONFIG_NUM_DSP_CPUS
  CONFIG_NUM_PAMU
 -CONFIG_OCLK_DIV
  CONFIG_ODROID_REV_AIN
  CONFIG_OFF_PADCONF
  CONFIG_OF_
@@@ -2097,12 -2209,15 +2097,12 @@@ CONFIG_PALMAS_SMPS7_FPW
  CONFIG_PALMAS_USB_SS_PWR
  CONFIG_PANIC_HANG
  CONFIG_PARAVIRT
 -CONFIG_PATA_BFIN
  CONFIG_PATI
  CONFIG_PB1000
  CONFIG_PB1100
  CONFIG_PB1500
  CONFIG_PB1X00
  CONFIG_PCA953X
 -CONFIG_PCA9564_BASE
 -CONFIG_PCA9564_I2C
  CONFIG_PCA9698
  CONFIG_PCI1
  CONFIG_PCI2
@@@ -2223,6 -2338,10 +2223,6 @@@ CONFIG_PLATINUM_TITANIU
  CONFIG_PLL
  CONFIG_PLL1_CLK_FREQ
  CONFIG_PLL1_DIV2_CLK_FREQ
 -CONFIG_PLL_BYPASS
 -CONFIG_PLL_CTL_VAL
 -CONFIG_PLL_DIV_VAL
 -CONFIG_PLL_LOCKCNT_VAL
  CONFIG_PLU405
  CONFIG_PM
  CONFIG_PM9261
@@@ -2261,7 -2380,10 +2261,7 @@@ CONFIG_POS
  CONFIG_POSTBOOTMENU
  CONFIG_POST_ALT_LIST
  CONFIG_POST_BSPEC1
 -CONFIG_POST_BSPEC1_GPIO_LEDS
  CONFIG_POST_BSPEC2
 -CONFIG_POST_BSPEC2_GPIO_BUTTONS
 -CONFIG_POST_BSPEC2_GPIO_NAMES
  CONFIG_POST_BSPEC3
  CONFIG_POST_BSPEC4
  CONFIG_POST_BSPEC5
@@@ -2433,6 -2555,7 +2433,6 @@@ CONFIG_ROOTPAT
  CONFIG_RSK7203
  CONFIG_RSK7264
  CONFIG_RSK7269
 -CONFIG_RTC_BFIN
  CONFIG_RTC_DS1307
  CONFIG_RTC_DS1337
  CONFIG_RTC_DS1338
@@@ -2517,6 -2640,10 +2517,6 @@@ CONFIG_SCIF_
  CONFIG_SCIF_CONSOLE
  CONFIG_SCIF_EXT_CLOCK
  CONFIG_SCIF_USE_EXT_CLK
 -CONFIG_SCLK0_DIV
 -CONFIG_SCLK1_DIV
 -CONFIG_SCLK_DIV
 -CONFIG_SCLK_HZ
  CONFIG_SCSI
  CONFIG_SCSI_AHCI
  CONFIG_SCSI_AHCI_PLAT
@@@ -2566,6 -2693,7 +2566,6 @@@ CONFIG_SFI
  CONFIG_SF_DATAFLASH
  CONFIG_SF_DEFAULT_BUS
  CONFIG_SF_DEFAULT_CS
 -CONFIG_SF_DEFAULT_HZ
  CONFIG_SF_DEFAULT_MODE
  CONFIG_SF_DEFAULT_SPEED
  CONFIG_SF_DUAL_FLASH
@@@ -2650,6 -2778,19 +2650,6 @@@ CONFIG_SMC911X_BAS
  CONFIG_SMC911X_NO_EEPROM
  CONFIG_SMC_91111_EXT_PHY
  CONFIG_SMC_AUTONEG_TIMEOUT
 -CONFIG_SMC_B0CTL_VAL
 -CONFIG_SMC_B0ETIM_VAL
 -CONFIG_SMC_B0TIM_VAL
 -CONFIG_SMC_B1CTL_VAL
 -CONFIG_SMC_B1ETIM_VAL
 -CONFIG_SMC_B1TIM_VAL
 -CONFIG_SMC_B2CTL_VAL
 -CONFIG_SMC_B2ETIM_VAL
 -CONFIG_SMC_B2TIM_VAL
 -CONFIG_SMC_B3CTL_VAL
 -CONFIG_SMC_B3ETIM_VAL
 -CONFIG_SMC_B3TIM_VAL
 -CONFIG_SMC_GCTL_VAL
  CONFIG_SMC_USE_32_BIT
  CONFIG_SMC_USE_IOFUNCS
  CONFIG_SMDK5420
@@@ -2697,6 -2838,7 +2697,6 @@@ CONFIG_SOFT_I2C_I2C5_SC
  CONFIG_SOFT_I2C_I2C5_SDA
  CONFIG_SOFT_I2C_I2C9_SCL
  CONFIG_SOFT_I2C_I2C9_SDA
 -CONFIG_SOFT_I2C_MULTI_BUS
  CONFIG_SOFT_I2C_READ_REPEATED_START
  CONFIG_SOFT_SPI
  CONFIG_SOFT_TWS
@@@ -2734,9 -2876,11 +2734,9 @@@ CONFIG_SPEAR_USBBOO
  CONFIG_SPEAR_USBTTY
  CONFIG_SPI
  CONFIG_SPI_ADDR
 -CONFIG_SPI_BAUD_INITBLOCK
  CONFIG_SPI_BOOTING
  CONFIG_SPI_CS_IS_VALID
  CONFIG_SPI_DATAFLASH_WRITE_VERIFY
 -CONFIG_SPI_FLASH_ALL
  CONFIG_SPI_FLASH_ISSI
  CONFIG_SPI_FLASH_QUAD
  CONFIG_SPI_FLASH_SIZE
@@@ -2859,6 -3003,10 +2859,6 @@@ CONFIG_SSP1_BAS
  CONFIG_SSP2_BASE
  CONFIG_SSP3_BASE
  CONFIG_STACKBASE
 -CONFIG_STACKSIZE
 -CONFIG_STACKSIZE_FIQ
 -CONFIG_STACKSIZE_IRQ
 -CONFIG_STAMP_CF
  CONFIG_STANDALONE_LOAD_ADDR
  CONFIG_STATIC_BOARD_REV
  CONFIG_STATIC_RELA
@@@ -3001,6 -3149,7 +3001,6 @@@ CONFIG_SYS_BCSR_ADD
  CONFIG_SYS_BCSR_BASE
  CONFIG_SYS_BCSR_BASE_PHYS
  CONFIG_SYS_BCSR_SIZE
 -CONFIG_SYS_BD_INFO_ADDR
  CONFIG_SYS_BD_REV
  CONFIG_SYS_BFTIC3_BASE
  CONFIG_SYS_BFTIC3_SIZE
@@@ -3673,6 -3822,7 +3673,6 @@@ CONFIG_SYS_FLASH
  CONFIG_SYS_FLASH1_BASE
  CONFIG_SYS_FLASH1_BASE_PHYS
  CONFIG_SYS_FLASH1_BASE_PHYS_EARLY
 -CONFIG_SYS_FLASH2_BASE
  CONFIG_SYS_FLASHBOOT
  CONFIG_SYS_FLASH_2ND_16BIT_DEV
  CONFIG_SYS_FLASH_2ND_ADDR
@@@ -4356,6 -4506,7 +4356,6 @@@ CONFIG_SYS_I2C_8574A_ADDR
  CONFIG_SYS_I2C_8574A_ADDR2
  CONFIG_SYS_I2C_8574_ADDR1
  CONFIG_SYS_I2C_8574_ADDR2
 -CONFIG_SYS_I2C_ADI
  CONFIG_SYS_I2C_BASE
  CONFIG_SYS_I2C_BASE0
  CONFIG_SYS_I2C_BASE1
@@@ -6049,6 -6200,7 +6049,6 @@@ CONFIG_SYS_SSD_BAS
  CONFIG_SYS_SSD_BASE_PHYS
  CONFIG_SYS_SST_SECT
  CONFIG_SYS_SST_SECTSZ
 -CONFIG_SYS_STACKSIZE
  CONFIG_SYS_STACK_LENGTH
  CONFIG_SYS_STACK_SIZE
  CONFIG_SYS_STATUS_C
@@@ -6301,6 -6453,7 +6301,6 @@@ CONFIG_TI816X_EVM_DDR
  CONFIG_TI816X_USE_EMIF0
  CONFIG_TI816X_USE_EMIF1
  CONFIG_TI81XX
 -CONFIG_TIMER_CLK_FREQ
  CONFIG_TIMESTAMP
  CONFIG_TIZEN
  CONFIG_TI_KEYSTONE_SERDES
@@@ -6376,6 -6529,9 +6376,6 @@@ CONFIG_TZSW_RESERVED_DRAM_SIZ
  CONFIG_T_SH7706LSR
  CONFIG_UART_BASE
  CONFIG_UART_BR_PRELIM
 -CONFIG_UART_CONSOLE
 -CONFIG_UART_CONSOLE_IS_JTAG
 -CONFIG_UART_MEM
  CONFIG_UART_OR_PRELIM
  CONFIG_UBIBLOCK
  CONFIG_UBIFS_SILENCE_MSG
@@@ -6446,6 -6602,8 +6446,6 @@@ CONFIG_USB_ATME
  CONFIG_USB_ATMEL_CLK_SEL_PLLB
  CONFIG_USB_ATMEL_CLK_SEL_UPLL
  CONFIG_USB_BIN_FIXUP
 -CONFIG_USB_BLACKFIN
 -CONFIG_USB_BLACKFIN_CLKIN
  CONFIG_USB_BOOTING
  CONFIG_USB_CABLE_CHECK
  CONFIG_USB_CLOCK
@@@ -6558,6 -6716,7 +6558,6 @@@ CONFIG_USB_XHCI_PC
  CONFIG_USER_LOWLEVEL_INIT
  CONFIG_USE_FDT
  CONFIG_USE_INTERRUPT
 -CONFIG_USE_IRQ
  CONFIG_USE_NAND
  CONFIG_USE_NETDEV
  CONFIG_USE_NOR
@@@ -6572,6 -6731,8 +6572,6 @@@ CONFIG_U_Q
  CONFIG_V38B
  CONFIG_VAL
  CONFIG_VAR_SIZE_SPL
 -CONFIG_VCO_HZ
 -CONFIG_VCO_MULT
  CONFIG_VCT_NOR
  CONFIG_VE8313
  CONFIG_VERY_BIG_RAM
@@@ -6612,6 -6773,10 +6612,6 @@@ CONFIG_VOL_MONITOR_INA22
  CONFIG_VOL_MONITOR_IR36021_READ
  CONFIG_VOL_MONITOR_IR36021_SET
  CONFIG_VOM405
 -CONFIG_VR_CTL_CLKBUF
 -CONFIG_VR_CTL_FREQ
 -CONFIG_VR_CTL_VAL
 -CONFIG_VR_CTL_VLEV
  CONFIG_VSC7385_ENET
  CONFIG_VSC7385_IMAGE
  CONFIG_VSC7385_IMAGE_SIZE
@@@ -6663,6 -6828,7 +6663,6 @@@ CONFIG_YAFFS_WINC
  CONFIG_YELLOWSTONE
  CONFIG_YELLOW_LED
  CONFIG_YOSEMITE
 -CONFIG_ZBOOT_32
  CONFIG_ZC770_XM010
  CONFIG_ZC770_XM011
  CONFIG_ZC770_XM012