Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq

diff --combined Kconfig
index d0318cc87975e719383457772da7a75bf85ffc26,fb012cfb3ebd20b1bf954cd95b6e40b7b83733a7..91a0618dbbea4000c2c0e9c0046f4c9bf1899495
--- 1/Kconfig
--- 2/Kconfig
+++ b/Kconfig
@@@ -8,13 -8,15 +8,13 @@@ config UBOOTVERSIO
        string
        option env="UBOOTVERSION"
  
 -config KCONFIG_OBJDIR
 -      string
 -      option env="KCONFIG_OBJDIR"
 +# Allow defaults in arch-specific code to override any given here
 +source "arch/Kconfig"
  
  menu "General setup"
  
  config LOCALVERSION
        string "Local version - append to U-Boot release"
 -      depends on !SPL_BUILD
        help
          Append an extra string to the end of your U-Boot version.
          This will show up on your boot log, for example.
@@@ -25,6 -27,7 +25,6 @@@
  
  config LOCALVERSION_AUTO
        bool "Automatically append version information to the version string"
 -      depends on !SPL_BUILD
        default y
        help
          This will try to automatically determine if the current tree is a
@@@ -45,6 -48,7 +45,6 @@@
  
  config CC_OPTIMIZE_FOR_SIZE
        bool "Optimize for size"
 -      depends on !SPL_BUILD
        default y
        help
          Enabling this option will pass "-Os" instead of "-O2" to gcc
@@@ -83,6 -87,16 +83,6 @@@ endmenu              # General setu
  
  menu "Boot images"
  
 -config SPL_BUILD
 -      bool
 -      depends on $KCONFIG_OBJDIR="spl" || $KCONFIG_OBJDIR="tpl"
 -      default y
 -
 -config TPL_BUILD
 -      bool
 -      depends on $KCONFIG_OBJDIR="tpl"
 -      default y
 -
  config SUPPORT_SPL
        bool
  
@@@ -92,19 -106,23 +92,19 @@@ config SUPPORT_TP
  config SPL
        bool
        depends on SUPPORT_SPL
 -      prompt "Enable SPL" if !SPL_BUILD
 -      default y if SPL_BUILD
 +      prompt "Enable SPL"
        help
          If you want to build SPL as well as the normal image, say Y.
  
  config TPL
        bool
        depends on SPL && SUPPORT_TPL
 -      prompt "Enable TPL" if !SPL_BUILD
 -      default y if TPL_BUILD
 -      default n
 +      prompt "Enable TPL"
        help
          If you want to build TPL as well as the normal image and SPL, say Y.
  
  config FIT
        bool "Support Flattened Image Tree"
 -      depends on !SPL_BUILD
        help
          This option allows to boot the new uImage structrure,
          Flattened Image Tree.  FIT is formally a FDT, which can include
@@@ -123,11 -141,14 +123,13 @@@ config FIT_SIGNATUR
        select RSA
        help
          This option enables signature verification of FIT uImages,
-         using a hash signed and verified using RSA.
+         using a hash signed and verified using RSA. If
+         CONFIG_SHA_PROG_HW_ACCEL is defined, i.e support for progressive
+         hashing is available using hardware, RSA library will use it.
          See doc/uImage.FIT/signature.txt for more details.
  
  config SYS_EXTRA_OPTIONS
        string "Extra Options (DEPRECATED)"
 -      depends on !SPL_BUILD
        help
          The old configuration infrastructure (= mkconfig + boards.cfg)
          provided the extra options field. If you have something like
@@@ -153,6 -174,8 +155,6 @@@ config SYS_CLK_FRE
  
  endmenu               # Boot images
  
 -source "arch/Kconfig"
 -
  source "common/Kconfig"
  
  source "dts/Kconfig"

diff --combined drivers/net/Makefile
index da5e2bc3ab7c3fb8611b58ba207922b62837f507,6e1ccdbb3d2ce9ff7a4800d297c77381ab885e8b..b8b08034eb8ae1e299b9cdf26d035cfd9e7f30c9
--- 1/drivers/net/Makefile
--- 2/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@@ -33,6 -33,7 +33,6 @@@ obj-$(CONFIG_FTMAC110) += ftmac110.
  obj-$(CONFIG_FTMAC100) += ftmac100.o
  obj-$(CONFIG_GRETH) += greth.o
  obj-$(CONFIG_DRIVER_TI_KEYSTONE_NET) += keystone_net.o
 -obj-$(CONFIG_DRIVER_KS8695ETH) += ks8695eth.o
  obj-$(CONFIG_KS8851_MLL) += ks8851_mll.o
  obj-$(CONFIG_LAN91C96) += lan91c96.o
  obj-$(CONFIG_MACB) += macb.o
@@@ -64,5 -65,5 +64,5 @@@ obj-$(CONFIG_XILINX_EMACLITE) += xilinx
  obj-$(CONFIG_XILINX_LL_TEMAC) += xilinx_ll_temac.o xilinx_ll_temac_mdio.o \
                xilinx_ll_temac_fifo.o xilinx_ll_temac_sdma.o
  obj-$(CONFIG_ZYNQ_GEM) += zynq_gem.o
- obj-$(CONFIG_FSL_MC_ENET) += fsl_mc/
+ obj-$(CONFIG_FSL_MC_ENET) += fsl-mc/
  obj-$(CONFIG_VSC9953) += vsc9953.o