Merge git://git.denx.de/u-boot-fsl-qoriq

trini: Drop local memset() from
examples/standalone/mem_to_mem_idma2intr.c

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --cc Makefile
Simple merge

diff --cc README
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c
Simple merge

diff --cc arch/arm/cpu/armv8/fsl-layerscape/cpu.c
Simple merge

diff --cc arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c
Simple merge

diff --cc arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
Simple merge

diff --cc arch/arm/dts/Makefile
Simple merge

diff --cc arch/arm/include/asm/fsl_secure_boot.h
Simple merge

diff --cc arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
Simple merge

diff --cc arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
Simple merge

diff --cc drivers/net/fm/fm.c
Simple merge

diff --cc examples/standalone/mem_to_mem_idma2intr.c
index 17da8db9b91fd36218d708e5718a86657ffcfe90,17da8db9b91fd36218d708e5718a86657ffcfe90..ce6e6c4a1071aa6b68c4dee7a9b323aefb30c42b
--- 1/examples/standalone/mem_to_mem_idma2intr.c
--- 2/examples/standalone/mem_to_mem_idma2intr.c
+++ b/examples/standalone/mem_to_mem_idma2intr.c
@@@ -186,13 -186,13 +186,6 @@@ int ctrlc (void
        }
        return 0;
  }
--void * memset(void * s,int c,size_t count)
--{
--      char *xs = (char *) s;
--      while (count--)
--              *xs++ = c;
--      return s;
--}
  int memcmp(const void * cs,const void * ct,size_t count)
  {
        const unsigned char *su1, *su2;

diff --cc include/configs/ls1021aqds.h
Simple merge

diff --cc include/configs/ls2080a_common.h
Simple merge