[U-Boot] [PATCH 1/5] ARM: remove CONFIG_ARMV7 defines

Nobuhiro Iwamatsu iwamatsu at nigauri.org
Thu Nov 6 07:01:48 CET 2014


Hi,

2014-11-06 14:59 GMT+09:00 Masahiro Yamada <yamada.m at jp.panasonic.com>:
> Some (not all) of ARMv7 boards define CONFIG_ARMV7, which is useless.
> Besides, it is never referenced.
>
> Signed-off-by: Masahiro Yamada <yamada.m at jp.panasonic.com>

Acked-by: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>

> ---
>
>  arch/arm/include/asm/arch-at91/sama5d3.h | 1 -
>  include/configs/alt.h                    | 1 -
>  include/configs/armadillo-800eva.h       | 1 -
>  include/configs/bcm28155_ap.h            | 3 +--
>  include/configs/bcm_ep_board.h           | 2 --
>  include/configs/koelsch.h                | 1 -
>  include/configs/ks2_evm.h                | 1 -
>  include/configs/lager.h                  | 1 -
>  include/configs/omap3_mvblx.h            | 1 -
>  include/configs/socfpga_common.h         | 1 -
>  include/configs/tao3530.h                | 1 -
>  include/configs/zynq-common.h            | 3 ---
>  12 files changed, 1 insertion(+), 16 deletions(-)
>
> diff --git a/arch/arm/include/asm/arch-at91/sama5d3.h b/arch/arm/include/asm/arch-at91/sama5d3.h
> index f7bc4ad..227ba80 100644
> --- a/arch/arm/include/asm/arch-at91/sama5d3.h
> +++ b/arch/arm/include/asm/arch-at91/sama5d3.h
> @@ -16,7 +16,6 @@
>  /*
>   * defines to be used in other places
>   */
> -#define CONFIG_ARMV7           /* ARM A5 Core */
>  #define CONFIG_AT91FAMILY      /* it's a member of AT91 */
>
>  /*
> diff --git a/include/configs/alt.h b/include/configs/alt.h
> index 7bd649f..ceb0446 100644
> --- a/include/configs/alt.h
> +++ b/include/configs/alt.h
> @@ -11,7 +11,6 @@
>  #define __ALT_H
>
>  #undef DEBUG
> -#define CONFIG_ARMV7
>  #define CONFIG_R8A7794
>  #define CONFIG_RMOBILE_BOARD_STRING "Alt"
>  #define CONFIG_SH_GPIO_PFC
> diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
> index b073b97..72469f3 100644
> --- a/include/configs/armadillo-800eva.h
> +++ b/include/configs/armadillo-800eva.h
> @@ -10,7 +10,6 @@
>  #define __ARMADILLO_800EVA_H
>
>  #undef DEBUG
> -#define CONFIG_ARMV7
>  #define CONFIG_R8A7740
>  #define CONFIG_RMOBILE_BOARD_STRING "Armadillo-800EVA Board\n"
>  #define CONFIG_SH_GPIO_PFC
> diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h
> index bf09939..1045779 100644
> --- a/include/configs/bcm28155_ap.h
> +++ b/include/configs/bcm28155_ap.h
> @@ -10,8 +10,7 @@
>  #include <linux/sizes.h>
>  #include <asm/arch/sysmap.h>
>
> -/* Architecture, CPU, chip, mach, etc */
> -#define CONFIG_ARMV7
> +/* CPU, chip, mach, etc */
>  #define CONFIG_KONA
>  #define CONFIG_SKIP_LOWLEVEL_INIT
>  #define CONFIG_SYS_GENERIC_BOARD
> diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h
> index 827844e..fb85c72 100644
> --- a/include/configs/bcm_ep_board.h
> +++ b/include/configs/bcm_ep_board.h
> @@ -9,8 +9,6 @@
>
>  #include <asm/arch/configs.h>
>
> -/* Architecture, CPU, chip, etc */
> -#define CONFIG_ARMV7
>  #define CONFIG_SKIP_LOWLEVEL_INIT
>
>  #define CONFIG_SYS_GENERIC_BOARD
> diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
> index 3ccadd0..6f67d34 100644
> --- a/include/configs/koelsch.h
> +++ b/include/configs/koelsch.h
> @@ -10,7 +10,6 @@
>  #define __KOELSCH_H
>
>  #undef DEBUG
> -#define CONFIG_ARMV7
>  #define CONFIG_R8A7791
>  #define CONFIG_RMOBILE_BOARD_STRING "Koelsch"
>  #define CONFIG_SH_GPIO_PFC
> diff --git a/include/configs/ks2_evm.h b/include/configs/ks2_evm.h
> index b0c91d8..96452c8 100644
> --- a/include/configs/ks2_evm.h
> +++ b/include/configs/ks2_evm.h
> @@ -20,7 +20,6 @@
>  #define CONFIG_SYS_THUMB_BUILD
>
>  /* SoC Configuration */
> -#define CONFIG_ARMV7
>  #define CONFIG_ARCH_CPU_INIT
>  #define CONFIG_SYS_ARCH_TIMER
>  #define CONFIG_SYS_TEXT_BASE           0x0c001000
> diff --git a/include/configs/lager.h b/include/configs/lager.h
> index a814b4c..ebf1a95 100644
> --- a/include/configs/lager.h
> +++ b/include/configs/lager.h
> @@ -11,7 +11,6 @@
>  #define __LAGER_H
>
>  #undef DEBUG
> -#define CONFIG_ARMV7
>  #define CONFIG_R8A7790
>  #define CONFIG_RMOBILE_BOARD_STRING "Lager"
>  #define CONFIG_SH_GPIO_PFC
> diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h
> index f3c21c4..bf1d34d 100644
> --- a/include/configs/omap3_mvblx.h
> +++ b/include/configs/omap3_mvblx.h
> @@ -18,7 +18,6 @@
>  /*
>   * High Level Configuration Options
>   */
> -#define CONFIG_ARMV7           1       /* This is an ARM V7 CPU core */
>  #define CONFIG_OMAP            1       /* in a TI OMAP core */
>  #define CONFIG_MVBLX           1       /* working with mvBlueLYNX-X */
>  #define CONFIG_MACH_TYPE       MACH_TYPE_MVBLX
> diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
> index 83a1bcd..bbd576a 100644
> --- a/include/configs/socfpga_common.h
> +++ b/include/configs/socfpga_common.h
> @@ -11,7 +11,6 @@
>  /* Virtual target or real hardware */
>  #undef CONFIG_SOCFPGA_VIRTUAL_TARGET
>
> -#define CONFIG_ARMV7
>  #define CONFIG_SYS_THUMB_BUILD
>
>  #define CONFIG_SOCFPGA
> diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
> index d687717..a160329 100644
> --- a/include/configs/tao3530.h
> +++ b/include/configs/tao3530.h
> @@ -16,7 +16,6 @@
>  /*
>   * High Level Configuration Options
>   */
> -#define CONFIG_ARMV7                   /* This is an ARM V7 CPU core */
>  #define CONFIG_OMAP                    /* in a TI OMAP core */
>
>  #define CONFIG_OMAP_GPIO
> diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
> index 2bc1562..c39c568 100644
> --- a/include/configs/zynq-common.h
> +++ b/include/configs/zynq-common.h
> @@ -10,9 +10,6 @@
>  #ifndef __CONFIG_ZYNQ_COMMON_H
>  #define __CONFIG_ZYNQ_COMMON_H
>
> -/* High Level configuration Options */
> -#define CONFIG_ARMV7
> -
>  /* CPU clock */
>  #ifndef CONFIG_CPU_FREQ_HZ
>  # define CONFIG_CPU_FREQ_HZ    800000000
> --
> 1.9.1
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot



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


More information about the U-Boot mailing list