[U-Boot] [PATCH 2/2] ARM: rmobile: Enable OF_CONTROL on RCar Gen3

[Nobuhiro Iwamatsu]

Applied to rmobile branch, thanks!

2017-07-22 6:17 GMT+09:00 Marek Vasut <marek.vasut at gmail.com>:
> Since the DTs are now in place, enable OF control so that they get
> bundled into the U-Boot.
>
> Signed-off-by: Marek Vasut <marek.vasut+renesas at gmail.com>
> Cc: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
> ---
>  arch/arm/mach-rmobile/Kconfig        | 1 +
>  configs/r8a7795_salvator-x_defconfig | 2 +-
>  configs/r8a7795_ulcb_defconfig       | 2 +-
>  configs/r8a7796_salvator-x_defconfig | 2 +-
>  configs/r8a7796_ulcb_defconfig       | 2 +-
>  5 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-rmobile/Kconfig b/arch/arm/mach-rmobile/Kconfig
> index 4b05d78839..8922554d59 100644
> --- a/arch/arm/mach-rmobile/Kconfig
> +++ b/arch/arm/mach-rmobile/Kconfig
> @@ -11,6 +11,7 @@ config RCAR_32
>  config RCAR_GEN3
>         bool "Renesas ARM SoCs R-Car Gen3 (64bit)"
>         select ARM64
> +       select OF_CONTROL
>
>  endchoice
>
> diff --git a/configs/r8a7795_salvator-x_defconfig b/configs/r8a7795_salvator-x_defconfig
> index c0e3999f96..a562431208 100644
> --- a/configs/r8a7795_salvator-x_defconfig
> +++ b/configs/r8a7795_salvator-x_defconfig
> @@ -3,6 +3,7 @@ CONFIG_ARCH_RMOBILE=y
>  CONFIG_SYS_MALLOC_F_LEN=0x2000
>  CONFIG_RCAR_GEN3=y
>  CONFIG_TARGET_SALVATOR_X=y
> +CONFIG_DEFAULT_DEVICE_TREE="r8a7795-salvator-x"
>  CONFIG_DEFAULT_FDT_FILE="r8a7795-salvator-x.dtb"
>  CONFIG_VERSION_VARIABLE=y
>  CONFIG_CMD_BOOTZ=y
> @@ -19,4 +20,3 @@ CONFIG_RENESAS_RAVB=y
>  CONFIG_USB=y
>  CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_STORAGE=y
> -CONFIG_OF_LIBFDT=y
> diff --git a/configs/r8a7795_ulcb_defconfig b/configs/r8a7795_ulcb_defconfig
> index fd5fd55b80..46715f952b 100644
> --- a/configs/r8a7795_ulcb_defconfig
> +++ b/configs/r8a7795_ulcb_defconfig
> @@ -3,6 +3,7 @@ CONFIG_ARCH_RMOBILE=y
>  CONFIG_SYS_MALLOC_F_LEN=0x2000
>  CONFIG_RCAR_GEN3=y
>  CONFIG_TARGET_ULCB=y
> +CONFIG_DEFAULT_DEVICE_TREE="r8a7795-h3ulcb"
>  CONFIG_DEFAULT_FDT_FILE="r8a7795-h3ulcb.dtb"
>  CONFIG_VERSION_VARIABLE=y
>  CONFIG_CMD_BOOTZ=y
> @@ -18,4 +19,3 @@ CONFIG_RENESAS_RAVB=y
>  CONFIG_USB=y
>  CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_STORAGE=y
> -CONFIG_OF_LIBFDT=y
> diff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig
> index d57305112b..4927e45588 100644
> --- a/configs/r8a7796_salvator-x_defconfig
> +++ b/configs/r8a7796_salvator-x_defconfig
> @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
>  CONFIG_RCAR_GEN3=y
>  CONFIG_R8A7796=y
>  CONFIG_TARGET_SALVATOR_X=y
> +CONFIG_DEFAULT_DEVICE_TREE="r8a7796-salvator-x"
>  CONFIG_DEFAULT_FDT_FILE="r8a7796-salvator-x.dtb"
>  CONFIG_VERSION_VARIABLE=y
>  CONFIG_CMD_BOOTZ=y
> @@ -20,4 +21,3 @@ CONFIG_RENESAS_RAVB=y
>  CONFIG_USB=y
>  CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_STORAGE=y
> -CONFIG_OF_LIBFDT=y
> diff --git a/configs/r8a7796_ulcb_defconfig b/configs/r8a7796_ulcb_defconfig
> index 96f903bb52..0bec182577 100644
> --- a/configs/r8a7796_ulcb_defconfig
> +++ b/configs/r8a7796_ulcb_defconfig
> @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
>  CONFIG_RCAR_GEN3=y
>  CONFIG_R8A7796=y
>  CONFIG_TARGET_ULCB=y
> +CONFIG_DEFAULT_DEVICE_TREE="r8a7796-m3ulcb"
>  CONFIG_DEFAULT_FDT_FILE="r8a7796-m3ulcb.dtb"
>  CONFIG_VERSION_VARIABLE=y
>  CONFIG_CMD_BOOTZ=y
> @@ -19,4 +20,3 @@ CONFIG_RENESAS_RAVB=y
>  CONFIG_USB=y
>  CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_STORAGE=y
> -CONFIG_OF_LIBFDT=y
> --
> 2.11.0
>



-- 
Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6