[U-Boot] [PATCH 6/7] serial: uniphier: move CONFIG_UNIPHIER_SERIAL to Kconfig

[Simon Glass]

On 22 October 2014 03:14, Masahiro Yamada <yamada.m at jp.panasonic.com> wrote:
> Signed-off-by: Masahiro Yamada <yamada.m at jp.panasonic.com>

Acked-by: Simon Glass <sjg at chromium.org>

See below for query:

> ---
>
>  configs/ph1_ld4_defconfig  | 1 +
>  configs/ph1_pro4_defconfig | 1 +
>  configs/ph1_sld8_defconfig | 1 +
>  drivers/serial/Kconfig     | 6 ++++++
>  include/configs/ph1_ld4.h  | 4 +---
>  include/configs/ph1_pro4.h | 4 +---
>  include/configs/ph1_sld8.h | 4 +---
>  7 files changed, 12 insertions(+), 9 deletions(-)
>
> diff --git a/configs/ph1_ld4_defconfig b/configs/ph1_ld4_defconfig
> index c8404f8..e6aba42 100644
> --- a/configs/ph1_ld4_defconfig
> +++ b/configs/ph1_ld4_defconfig
> @@ -7,4 +7,5 @@ CONFIG_NAND_DENALI=y
>  CONFIG_SYS_NAND_DENALI_64BIT=y
>  CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
>  CONFIG_DM_SERIAL=y
> +CONFIG_UNIPHIER_SERIAL=y
>  S:CONFIG_SPL_NAND_DENALI=y
> diff --git a/configs/ph1_pro4_defconfig b/configs/ph1_pro4_defconfig
> index 5c051e3..334ec4b 100644
> --- a/configs/ph1_pro4_defconfig
> +++ b/configs/ph1_pro4_defconfig
> @@ -7,4 +7,5 @@ CONFIG_NAND_DENALI=y
>  CONFIG_SYS_NAND_DENALI_64BIT=y
>  CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
>  CONFIG_DM_SERIAL=y
> +CONFIG_UNIPHIER_SERIAL=y
>  S:CONFIG_SPL_NAND_DENALI=y
> diff --git a/configs/ph1_sld8_defconfig b/configs/ph1_sld8_defconfig
> index 2c636e6..4e8f354 100644
> --- a/configs/ph1_sld8_defconfig
> +++ b/configs/ph1_sld8_defconfig
> @@ -7,4 +7,5 @@ CONFIG_NAND_DENALI=y
>  CONFIG_SYS_NAND_DENALI_64BIT=y
>  CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
>  CONFIG_DM_SERIAL=y
> +CONFIG_UNIPHIER_SERIAL=y
>  S:CONFIG_SPL_NAND_DENALI=y
> diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
> index 6a392ba..a0b6e02 100644
> --- a/drivers/serial/Kconfig
> +++ b/drivers/serial/Kconfig
> @@ -4,3 +4,9 @@ config DM_SERIAL
>         help
>           If you want to use driver model for serial drivers, say Y.
>           To use legacy serial drivers, say N.
> +
> +config UNIPHIER_SERIAL
> +       bool "UniPhier on-chip UART support"
> +       depends on ARCH_UNIPHIER && DM_SERIAL
> +       help
> +         Support for the on-chip UARTs on the Panasonic UniPhier platform.
> diff --git a/include/configs/ph1_ld4.h b/include/configs/ph1_ld4.h
> index a546865..005a853 100644
> --- a/include/configs/ph1_ld4.h
> +++ b/include/configs/ph1_ld4.h
> @@ -28,9 +28,7 @@
>   *   SoC UART     : enable CONFIG_UNIPHIER_SERIAL
>   *   On-board UART: enable CONFIG_SYS_NS16550_SERIAL
>   */
> -#if 1
> -#define CONFIG_UNIPHIER_SERIAL
> -#else
> +#if 0
>  #define CONFIG_SYS_NS16550_SERIAL
>  #endif
>
> diff --git a/include/configs/ph1_pro4.h b/include/configs/ph1_pro4.h
> index 85c14ba..7dd6fd2 100644
> --- a/include/configs/ph1_pro4.h
> +++ b/include/configs/ph1_pro4.h
> @@ -28,9 +28,7 @@
>   *   SoC UART     : enable CONFIG_UNIPHIER_SERIAL
>   *   On-board UART: enable CONFIG_SYS_NS16550_SERIAL
>   */
> -#if 1
> -#define CONFIG_UNIPHIER_SERIAL
> -#else
> +#if 0
>  #define CONFIG_SYS_NS16550_SERIAL
>  #endif
>
> diff --git a/include/configs/ph1_sld8.h b/include/configs/ph1_sld8.h
> index 41e2299..1062aac 100644
> --- a/include/configs/ph1_sld8.h
> +++ b/include/configs/ph1_sld8.h
> @@ -28,9 +28,7 @@
>   *   SoC UART     : enable CONFIG_UNIPHIER_SERIAL
>   *   On-board UART: enable CONFIG_SYS_NS16550_SERIAL
>   */
> -#if 1
> -#define CONFIG_UNIPHIER_SERIAL
> -#else
> +#if 0
>  #define CONFIG_SYS_NS16550_SERIAL
>  #endif

Why not just remove this code?

Regards,
Simon