[U-Boot] [PATCH] sunxi: Rename CONFIG_SUNXI to CONFIG_ARCH_SUNXI

[Hans de Goede]

Hi,

On 13-10-16 10:49, Jagan Teki wrote:
> CONFIG_SUNXI -> CONFIG_ARCH_SUNXI
> and removed CONFIG_SUNIX from config_whitelist.txt
>
> Cc: Simon Glass <sjg at chromium.org>
> Cc: Ian Campbell <ijc at hellion.org.uk>
> Cc: Hans de Goede <hdegoede at redhat.com>
> Signed-off-by: Jagan Teki <jteki at openedev.com>

Thank you I've applied this to my tree and will
include it in my next pull-req.

Regards,

Hans


> ---
>  Makefile                       | 2 +-
>  arch/arm/cpu/armv7/Makefile    | 2 +-
>  drivers/i2c/mvtwsi.c           | 6 +++---
>  include/configs/sunxi-common.h | 1 -
>  scripts/Makefile.spl           | 2 +-
>  scripts/config_whitelist.txt   | 1 -
>  tools/Makefile                 | 2 +-
>  7 files changed, 7 insertions(+), 9 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index dcba7db..e88c8b3 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1096,7 +1096,7 @@ u-boot-x86-16bit.bin: u-boot FORCE
>  	$(call if_changed,objcopy)
>  endif
>
> -ifneq ($(CONFIG_SUNXI),)
> +ifneq ($(CONFIG_ARCH_SUNXI),)
>  OBJCOPYFLAGS_u-boot-sunxi-with-spl.bin = -I binary -O binary \
>  				   --pad-to=$(CONFIG_SPL_PAD_TO) --gap-fill=0xff
>  u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.img FORCE
> diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile
> index 0d4bfbc..d182200 100644
> --- a/arch/arm/cpu/armv7/Makefile
> +++ b/arch/arm/cpu/armv7/Makefile
> @@ -12,7 +12,7 @@ obj-y	+= cache_v7.o cache_v7_asm.o
>  obj-y	+= cpu.o cp15.o
>  obj-y	+= syslib.o
>
> -ifneq ($(CONFIG_AM43XX)$(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TEGRA)$(CONFIG_MX6)$(CONFIG_MX7)$(CONFIG_TI81XX)$(CONFIG_AT91FAMILY)$(CONFIG_SUNXI)$(CONFIG_ARCH_SOCFPGA),)
> +ifneq ($(CONFIG_AM43XX)$(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TEGRA)$(CONFIG_MX6)$(CONFIG_MX7)$(CONFIG_TI81XX)$(CONFIG_AT91FAMILY)$(CONFIG_ARCH_SUNXI)$(CONFIG_ARCH_SOCFPGA),)
>  ifneq ($(CONFIG_SKIP_LOWLEVEL_INIT),y)
>  obj-y	+= lowlevel_init.o
>  endif
> diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c
> index 60c8ea1..cea3da0 100644
> --- a/drivers/i2c/mvtwsi.c
> +++ b/drivers/i2c/mvtwsi.c
> @@ -29,7 +29,7 @@ DECLARE_GLOBAL_DATA_PTR;
>  #include <asm/arch/orion5x.h>
>  #elif (defined(CONFIG_KIRKWOOD) || defined(CONFIG_ARCH_MVEBU))
>  #include <asm/arch/soc.h>
> -#elif defined(CONFIG_SUNXI)
> +#elif defined(CONFIG_ARCH_SUNXI)
>  #include <asm/arch/i2c.h>
>  #else
>  #error Driver mvtwsi not supported by SoC or board
> @@ -40,7 +40,7 @@ DECLARE_GLOBAL_DATA_PTR;
>   * TWSI register structure
>   */
>
> -#ifdef CONFIG_SUNXI
> +#ifdef CONFIG_ARCH_SUNXI
>
>  struct  mvtwsi_registers {
>  	u32 slave_address;
> @@ -399,7 +399,7 @@ static int twsi_stop(struct mvtwsi_registers *twsi, uint tick)
>   */
>  static uint twsi_calc_freq(const int n, const int m)
>  {
> -#ifdef CONFIG_SUNXI
> +#ifdef CONFIG_ARCH_SUNXI
>  	return CONFIG_SYS_TCLK / (10 * (m + 1) * (1 << n));
>  #else
>  	return CONFIG_SYS_TCLK / (10 * (m + 1) * (2 << n));
> diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
> index d261fb3..a6ca80a 100644
> --- a/include/configs/sunxi-common.h
> +++ b/include/configs/sunxi-common.h
> @@ -35,7 +35,6 @@
>  /*
>   * High Level Configuration Options
>   */
> -#define CONFIG_SUNXI		/* sunxi family */
>  #ifdef CONFIG_SPL_BUILD
>  #define CONFIG_SYS_THUMB_BUILD	/* Thumbs mode to save space in SPL */
>  #endif
> diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
> index e8cf9f3..e0b0117 100644
> --- a/scripts/Makefile.spl
> +++ b/scripts/Makefile.spl
> @@ -166,7 +166,7 @@ ifdef CONFIG_ARCH_SOCFPGA
>  ALL-y	+= $(obj)/$(SPL_BIN).sfp
>  endif
>
> -ifdef CONFIG_SUNXI
> +ifdef CONFIG_ARCH_SUNXI
>  ALL-y	+= $(obj)/sunxi-spl.bin
>  endif
>
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 3621c91..5dc2ed7 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -4372,7 +4372,6 @@ CONFIG_STV0991_HZ
>  CONFIG_STV0991_HZ_CLOCK
>  CONFIG_ST_SMI
>  CONFIG_SUN4
> -CONFIG_SUNXI
>  CONFIG_SUNXI_AHCI
>  CONFIG_SUNXI_EMAC
>  CONFIG_SUNXI_GMAC
> diff --git a/tools/Makefile b/tools/Makefile
> index e6f7993..556f397 100644
> --- a/tools/Makefile
> +++ b/tools/Makefile
> @@ -169,7 +169,7 @@ hostprogs-$(CONFIG_MX23) += mxsboot
>  hostprogs-$(CONFIG_MX28) += mxsboot
>  HOSTCFLAGS_mxsboot.o := -pedantic
>
> -hostprogs-$(CONFIG_SUNXI) += mksunxiboot
> +hostprogs-$(CONFIG_ARCH_SUNXI) += mksunxiboot
>
>  hostprogs-$(CONFIG_NETCONSOLE) += ncb
>  hostprogs-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1
>