Merge https://source.denx.de/u-boot/custodians/u-boot-samsung

[trini: Migrate CONFIG_EXYNOS7420 as part of merging, so espresso7420
still builds]

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

diff --cc board/samsung/espresso7420/Kconfig
index 62251c5126dc652434e970925405cd71140f5de3,62251c5126dc652434e970925405cd71140f5de3..6a088a2702849dd978557cce6e47e8c03d4d05cd
--- 1/board/samsung/espresso7420/Kconfig
--- 2/board/samsung/espresso7420/Kconfig
+++ b/board/samsung/espresso7420/Kconfig
@@@ -1,5 -1,5 +1,8 @@@
  if TARGET_ESPRESSO7420
  
++config EXYNOS7420
++      def_bool y
++
  config SYS_BOARD
        default "espresso7420"
        help

diff --cc include/configs/exynos7420-common.h
index 4a1ecbb832c6d18ec465acfa26311367da6c73d2,4a1ecbb832c6d18ec465acfa26311367da6c73d2..464f927431a044d5f188e5bba2a6ff9033759b51
--- 1/include/configs/exynos7420-common.h
--- 2/include/configs/exynos7420-common.h
+++ b/include/configs/exynos7420-common.h
@@@ -10,7 -10,7 +10,6 @@@
  
  /* High Level Configuration Options */
  #define CONFIG_SAMSUNG                        /* in a SAMSUNG core */
--#define CONFIG_EXYNOS7420             /* Exynos7 Family */
  #define CONFIG_S5P
  
  #include <asm/arch/cpu.h>             /* get chip and board defs */