Merge branch 'rmobile' of git://git.denx.de/u-boot-sh
authorTom Rini <trini@konsulko.com>
Wed, 11 Oct 2017 00:14:38 +0000 (20:14 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 11 Oct 2017 00:14:38 +0000 (20:14 -0400)
1  2 
configs/r8a7795_salvator-x_defconfig
configs/r8a7795_ulcb_defconfig
configs/r8a7796_salvator-x_defconfig
configs/r8a7796_ulcb_defconfig

index 5b6a7daf5561b8e82c73c81b56960da95dc12722,0391e34639f00931ee028ab84d340eabe5a9c401..e32aceba5497215c892884eb55299a57a309d8b8
@@@ -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
index 2c3bce291fe013fff7f6e92fbeb4300400a88624,643df71d37e4461b251f578a7488c3e9e51c6d74..50d36891cc3c63a56fa6901fd88305634574fed9
@@@ -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
index d8e532a8713a4603a69786e29c2de1d51d341a70,83ef46c13a081ac34a54361edc086cd4bf3b2948..8f22645efbd019ba5016a7d00117efbab2a57466
@@@ -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
index 459d9d304ec767c0c0abe293dbb28ba02c977cb7,b7d6088224aaeeffaa395785b78824fa2ffde69c..c8edfabc91156c579d93a2c442d1e45b78e0f98e
@@@ -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