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

diff --combined Makefile
index 6547bc0eca63b249c8613ec8b3fb3855b4136d68,84b0c43440d0a55ef5b8db3f6735cd7359301077..476baf0c3fe3fdc8a718a506a8d32f98774f5780
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -46,12 -46,7 +46,7 @@@ HOSTARCH := $(shell uname -m | 
  HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]' | \
            sed -e 's/\(cygwin\).*/cygwin/')
  
- # Set shell to bash if possible, otherwise fall back to sh
- SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
-       else if [ -x /bin/bash ]; then echo /bin/bash; \
-       else echo sh; fi; fi)
- 
- export        HOSTARCH HOSTOS SHELL
+ export        HOSTARCH HOSTOS
  
  # Deal with colliding definitions from tcsh etc.
  VENDOR=
@@@ -273,6 -268,7 +268,7 @@@ LIBS-y += disk/libdisk.
  LIBS-y += drivers/bios_emulator/libatibiosemu.o
  LIBS-y += drivers/block/libblock.o
  LIBS-$(CONFIG_BOOTCOUNT_LIMIT) += drivers/bootcount/libbootcount.o
+ LIBS-y += drivers/crypto/libcrypto.o
  LIBS-y += drivers/dma/libdma.o
  LIBS-y += drivers/fpga/libfpga.o
  LIBS-y += drivers/gpio/libgpio.o
@@@ -314,7 -310,7 +310,7 @@@ endi
  LIBS-y += drivers/rtc/librtc.o
  LIBS-y += drivers/serial/libserial.o
  LIBS-y += drivers/sound/libsound.o
 -LIBS-$(CONFIG_GENERIC_LPC_TPM) += drivers/tpm/libtpm.o
 +LIBS-y += drivers/tpm/libtpm.o
  LIBS-y += drivers/twserial/libtws.o
  LIBS-y += drivers/usb/eth/libusb_eth.o
  LIBS-y += drivers/usb/gadget/libusb_gadget.o
@@@ -487,12 -483,19 +483,19 @@@ $(obj)u-boot.dis:       $(obj)u-boo
  
  
  $(obj)u-boot-with-spl.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
-               $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(or $(CONFIG_SPL_PAD_TO),0) \
-                       -O binary $(obj)spl/u-boot-spl \
-                       $(obj)spl/u-boot-spl-pad.bin
+               $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(CONFIG_SPL_PAD_TO) \
+                       -I binary -O binary $< $(obj)spl/u-boot-spl-pad.bin
                cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > $@
                rm $(obj)spl/u-boot-spl-pad.bin
  
+ $(obj)u-boot-with-spl.imx: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
+               $(MAKE) -C $(SRCTREE)/arch/arm/imx-common \
+                       $(OBJTREE)/u-boot-with-spl.imx
+ 
+ $(obj)u-boot-with-nand-spl.imx: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
+               $(MAKE) -C $(SRCTREE)/arch/arm/imx-common \
+                       $(OBJTREE)/u-boot-with-nand-spl.imx
+ 
  $(obj)u-boot.ubl:       $(obj)u-boot-with-spl.bin
                $(obj)tools/mkimage -n $(UBL_CONFIG) -T ublimage \
                -e $(CONFIG_SYS_TEXT_BASE) -d $< $(obj)u-boot.ubl
@@@ -782,23 -785,6 +785,6 @@@ $(obj).boards.depend:     boards.cf
  lcname        = $(shell echo $(1) | sed -e 's/\(.*\)_config/\L\1/')
  ucname        = $(shell echo $(1) | sed -e 's/\(.*\)_config/\U\1/')
  
- #########################################################################
- ## ARM1176 Systems
- #########################################################################
- smdk6400_noUSB_config \
- smdk6400_config       :       unconfig
-       @mkdir -p $(obj)include $(obj)board/samsung/smdk6400
-       @mkdir -p $(obj)nand_spl/board/samsung/smdk6400
-       @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
-       @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
-       @if [ -z "$(findstring smdk6400_noUSB_config,$@)" ]; then                       \
-               echo "RAM_TEXT = 0x57e00000" >> $(obj)board/samsung/smdk6400/config.tmp;\
-       else                                                                            \
-               echo "RAM_TEXT = 0xc7e00000" >> $(obj)board/samsung/smdk6400/config.tmp;\
-       fi
-       @$(MKCONFIG) smdk6400 arm arm1176 smdk6400 samsung s3c64xx
-       @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
- 
  #########################################################################
  #########################################################################
  
@@@ -857,6 -843,8 +843,8 @@@ clobber:   tid
        @rm -f $(obj)u-boot.kwb
        @rm -f $(obj)u-boot.pbl
        @rm -f $(obj)u-boot.imx
+       @rm -f $(obj)u-boot-with-spl.imx
+       @rm -f $(obj)u-boot-with-nand-spl.imx
        @rm -f $(obj)u-boot.ubl
        @rm -f $(obj)u-boot.ais
        @rm -f $(obj)u-boot.dtb

diff --combined include/configs/exynos5250-dt.h
index 7378487b3f194f983d29c6408eb3d277dec9bc16,3aed696c2e421c45a5d8c1b988bc7028b02356ff..020048a33a7c9b4000de3fc7cac0139215e9c544
--- 1/include/configs/exynos5250-dt.h
--- 2/include/configs/exynos5250-dt.h
+++ b/include/configs/exynos5250-dt.h
@@@ -46,6 -46,10 +46,10 @@@
  /* Keep L2 Cache Disabled */
  #define CONFIG_SYS_DCACHE_OFF
  
+ /* Enable ACE acceleration for SHA1 and SHA256 */
+ #define CONFIG_EXYNOS_ACE_SHA
+ #define CONFIG_SHA_HW_ACCEL
+ 
  #define CONFIG_SYS_SDRAM_BASE         0x40000000
  #define CONFIG_SYS_TEXT_BASE          0x43E00000
  
@@@ -114,6 -118,7 +118,7 @@@
  #define CONFIG_CMD_EXT2
  #define CONFIG_CMD_FAT
  #define CONFIG_CMD_NET
+ #define CONFIG_CMD_HASH
  
  #define CONFIG_BOOTDELAY              3
  #define CONFIG_ZERO_BOOTDELAY_CHECK
@@@ -129,13 -134,6 +134,13 @@@
  #define CONFIG_USB_EHCI_EXYNOS
  #define CONFIG_USB_STORAGE
  
 +/* TPM */
 +#define CONFIG_TPM
 +#define CONFIG_CMD_TPM
 +#define CONFIG_INFINEON_TPM_I2C
 +#define CONFIG_INFINEON_TPM_I2C_BUS 3
 +#define CONFIG_INFINEON_TPM_I2C_ADDR 0x20
 +
  /* MMC SPL */
  #define CONFIG_SPL
  #define COPY_BL2_FNPTR_ADDR   0x02020030
@@@ -143,7 -141,7 +148,7 @@@
  /* specific .lds file */
  #define CONFIG_SPL_LDSCRIPT   "board/samsung/smdk5250/smdk5250-uboot-spl.lds"
  #define CONFIG_SPL_TEXT_BASE  0x02023400
- #define CONFIG_SPL_MAX_SIZE   (14 * 1024)
+ #define CONFIG_SPL_MAX_FOOTPRINT      (14 * 1024)
  
  #define CONFIG_BOOTCOMMAND    "mmc read 40007000 451 2000; bootm 40007000"
  
@@@ -332,4 -330,7 +337,7 @@@
  #define LCD_BPP                       LCD_COLOR16
  #endif
  
+ /* Enable Time Command */
+ #define CONFIG_CMD_TIME
+ 
  #endif        /* __CONFIG_H */

diff --combined include/fdtdec.h
index 39fbdf144b284466b7db68b2a0fd17cec5c57eb2,844991ec4e6a2d479eff40936495a97695511664..4e8032ba6cdfd4632ff5bec1a25b793c7defe4ce
--- 1/include/fdtdec.h
--- 2/include/fdtdec.h
+++ b/include/fdtdec.h
@@@ -87,10 -87,11 +87,12 @@@ enum fdt_compat_id 
        COMPAT_SAMSUNG_EXYNOS_EHCI,     /* Exynos EHCI controller */
        COMPAT_SAMSUNG_EXYNOS_USB_PHY,  /* Exynos phy controller for usb2.0 */
        COMPAT_SAMSUNG_EXYNOS_TMU,      /* Exynos TMU */
+       COMPAT_SAMSUNG_EXYNOS_FIMD,     /* Exynos Display controller */
+       COMPAT_SAMSUNG_EXYNOS5_DP,      /* Exynos Display port controller */
        COMPAT_MAXIM_MAX77686_PMIC,     /* MAX77686 PMIC */
        COMPAT_GENERIC_SPI_FLASH,       /* Generic SPI Flash chip */
        COMPAT_MAXIM_98095_CODEC,       /* MAX98095 Codec */
 +      COMPAT_INFINEON_SLB9635_TPM,    /* Infineon SLB9635 TPM */
  
        COMPAT_COUNT,
  };

diff --combined lib/Makefile
index d57775d7c4679cc0663fca87cf2fa299aeef698b,5d71b80e23466fb86b8f877441e5e5db9337a941..e901cc7cafbb5dbbd3ba308a691bcba0f361fc50
--- 1/lib/Makefile
--- 2/lib/Makefile
+++ b/lib/Makefile
@@@ -27,7 -27,6 +27,6 @@@ LIB   = $(obj)libgeneric.
  
  ifndef CONFIG_SPL_BUILD
  COBJS-$(CONFIG_ADDR_MAP) += addr_map.o
- COBJS-$(CONFIG_BCH) += bch.o
  COBJS-$(CONFIG_AES) += aes.o
  COBJS-$(CONFIG_BZIP2) += bzlib.o
  COBJS-$(CONFIG_BZIP2) += bzlib_crctable.o
@@@ -54,7 -53,6 +53,7 @@@ COBJS-y += qsort.
  COBJS-$(CONFIG_SHA1) += sha1.o
  COBJS-$(CONFIG_SHA256) += sha256.o
  COBJS-y       += strmhz.o
 +COBJS-$(CONFIG_TPM) += tpm.o
  COBJS-$(CONFIG_RBTREE)        += rbtree.o
  endif
  
@@@ -68,6 -66,7 +67,7 @@@ COBJS-$(CONFIG_SPL_NET_SUPPORT) += errn
  COBJS-$(CONFIG_SPL_NET_SUPPORT) += hashtable.o
  COBJS-$(CONFIG_SPL_NET_SUPPORT) += net_utils.o
  endif
+ COBJS-$(CONFIG_BCH) += bch.o
  COBJS-y += crc32.o
  COBJS-y += ctype.o
  COBJS-y += div64.o

diff --combined lib/fdtdec.c
index e93743c87a80f0a3afc3d9b719fecba473ea1777,403babd3124cb8f8b8539a6254d9ff6dd0df1672..92fbefe04574787efa4dabdfce9e46aeb9eea979
--- 1/lib/fdtdec.c
--- 2/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@@ -60,10 -60,11 +60,12 @@@ static const char * const compat_names[
        COMPAT(SAMSUNG_EXYNOS_EHCI, "samsung,exynos-ehci"),
        COMPAT(SAMSUNG_EXYNOS_USB_PHY, "samsung,exynos-usb-phy"),
        COMPAT(SAMSUNG_EXYNOS_TMU, "samsung,exynos-tmu"),
+       COMPAT(SAMSUNG_EXYNOS_FIMD, "samsung,exynos-fimd"),
+       COMPAT(SAMSUNG_EXYNOS5_DP, "samsung,exynos5-dp"),
        COMPAT(MAXIM_MAX77686_PMIC, "maxim,max77686_pmic"),
        COMPAT(GENERIC_SPI_FLASH, "spi-flash"),
        COMPAT(MAXIM_98095_CODEC, "maxim,max98095-codec"),
 +      COMPAT(INFINEON_SLB9635_TPM, "infineon,slb9635-tpm"),
  };
  
  const char *fdtdec_get_compatible(enum fdt_compat_id id)