From: Tom Rini <trini@konsulko.com>
Date: Tue, 3 Aug 2021 13:07:01 +0000 (-0400)
Subject: Merge https://source.denx.de/u-boot/custodians/u-boot-samsung
X-Git-Tag: v2021.10-rc2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b91c70433386d133c842729c5d9b109cdcc79399;p=pandora-u-boot.git

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

b91c70433386d133c842729c5d9b109cdcc79399
diff --cc configs/smdkv310_defconfig
index fcc655c1f57,6b738b47d8f..ac84fde7d31
--- a/configs/smdkv310_defconfig
+++ b/configs/smdkv310_defconfig
@@@ -28,5 -28,5 +28,4 @@@ CONFIG_MMC_SDHCI_SDMA=
  CONFIG_MMC_SDHCI_S5P=y
  CONFIG_MTD=y
  CONFIG_SMC911X=y
- CONFIG_SMC911X_BASE=0x5000000
  CONFIG_USB=y
 -CONFIG_DM_USB=y