From: Tom Rini <trini@konsulko.com>
Date: Wed, 11 Oct 2017 00:14:38 +0000 (-0400)
Subject: Merge branch 'rmobile' of git://git.denx.de/u-boot-sh
X-Git-Tag: v2017.11-rc2~59
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2ee87b0c1a5439e4ad6467cb8d5e8fb58922ca4b;p=u-boot

Merge branch 'rmobile' of git://git.denx.de/u-boot-sh
---

2ee87b0c1a5439e4ad6467cb8d5e8fb58922ca4b
diff --cc configs/r8a7795_salvator-x_defconfig
index 5b6a7daf55,0391e34639..e32aceba54
--- a/configs/r8a7795_salvator-x_defconfig
+++ b/configs/r8a7795_salvator-x_defconfig
@@@ -12,6 -12,8 +12,7 @@@ CONFIG_DEFAULT_FDT_FILE="r8a7795-salvat
  CONFIG_VERSION_VARIABLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
 -# CONFIG_CMD_IMLS is not set
+ CONFIG_CMD_GPIO=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_SDRAM=y
  CONFIG_CMD_USB=y
diff --cc configs/r8a7795_ulcb_defconfig
index 2c3bce291f,643df71d37..50d36891cc
--- a/configs/r8a7795_ulcb_defconfig
+++ b/configs/r8a7795_ulcb_defconfig
@@@ -12,6 -12,8 +12,7 @@@ CONFIG_DEFAULT_FDT_FILE="r8a7795-h3ulcb
  CONFIG_VERSION_VARIABLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
 -# CONFIG_CMD_IMLS is not set
+ CONFIG_CMD_GPIO=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_USB=y
  CONFIG_CMD_DHCP=y
diff --cc configs/r8a7796_salvator-x_defconfig
index d8e532a871,83ef46c13a..8f22645efb
--- a/configs/r8a7796_salvator-x_defconfig
+++ b/configs/r8a7796_salvator-x_defconfig
@@@ -13,6 -13,8 +13,7 @@@ CONFIG_DEFAULT_FDT_FILE="r8a7796-salvat
  CONFIG_VERSION_VARIABLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
 -# CONFIG_CMD_IMLS is not set
+ CONFIG_CMD_GPIO=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_SDRAM=y
  CONFIG_CMD_USB=y
diff --cc configs/r8a7796_ulcb_defconfig
index 459d9d304e,b7d6088224..c8edfabc91
--- a/configs/r8a7796_ulcb_defconfig
+++ b/configs/r8a7796_ulcb_defconfig
@@@ -13,6 -13,8 +13,7 @@@ CONFIG_DEFAULT_FDT_FILE="r8a7796-m3ulcb
  CONFIG_VERSION_VARIABLE=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
 -# CONFIG_CMD_IMLS is not set
+ CONFIG_CMD_GPIO=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_USB=y
  CONFIG_CMD_DHCP=y