From: Tom Rini <trini@konsulko.com>
Date: Tue, 9 Nov 2021 13:51:00 +0000 (-0500)
Subject: Merge https://source.denx.de/u-boot/custodians/u-boot-samsung
X-Git-Tag: v2022.01~54
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e8e9c6f48400989c5fc54467576f8d535bd713e6;p=platform%2Fkernel%2Fu-boot.git

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>
---

e8e9c6f48400989c5fc54467576f8d535bd713e6
diff --cc board/samsung/espresso7420/Kconfig
index 62251c5,62251c5..6a088a2
--- a/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 4a1ecbb,4a1ecbb..464f927
--- a/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 */