[U-Boot] [PATCH V2 4/4] Removed unused define, CONFIG_ARMV7.

Albert ARIBAUD
2011-08-04T06:33:58Z

Hi Christopher,

Le 07/07/2011 16:37, Christopher Harvey a ?crit :
> Signed-off-by: Christopher Harvey<charvey@matrox.com>
> ---
>
> V2:
>
> Removed left over newlines.
>
> Made sure that this isn't the only "High level option", so everything
> looks ok around the sed'd text.
>
> include/configs/am3517_crane.h | 1 -
> include/configs/am3517_evm.h | 1 -
> include/configs/ca9x4_ct_vxp.h | 3 ---
> include/configs/cm_t35.h | 1 -
> include/configs/devkit8000.h | 1 -
> include/configs/dig297.h | 1 -
> include/configs/igep0020.h | 1 -
> include/configs/igep0030.h | 1 -
> include/configs/omap3_beagle.h | 1 -
> include/configs/omap3_evm.h | 1 -
> include/configs/omap3_overo.h | 1 -
> include/configs/omap3_pandora.h | 1 -
> include/configs/omap3_sdp3430.h | 1 -
> include/configs/omap3_zoom1.h | 1 -
> include/configs/omap3_zoom2.h | 1 -
> include/configs/omap4_panda.h | 1 -
> include/configs/omap4_sdp4430.h | 1 -
> include/configs/s5p_goni.h | 1 -
> include/configs/s5pc210_universal.h | 1 -
> include/configs/smdkc100.h | 1 -
> include/configs/smdkv310.h | 1 -
> 21 files changed, 0 insertions(+), 23 deletions(-)
>
> diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
> index 09cb951..743768e 100644
> --- a/include/configs/am3517_crane.h
> +++ b/include/configs/am3517_crane.h
> @@ -28,7 +28,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_OMAP34XX 1 /* which is a 34XX */
> #define CONFIG_OMAP3_AM3517CRANE 1 /* working with CRANEBOARD */
> diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
> index 80ad342..7304c13 100644
> --- a/include/configs/am3517_evm.h
> +++ b/include/configs/am3517_evm.h
> @@ -28,7 +28,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_OMAP34XX 1 /* which is a 34XX */
> #define CONFIG_OMAP3_AM3517EVM 1 /* working with AM3517EVM */
> diff --git a/include/configs/ca9x4_ct_vxp.h b/include/configs/ca9x4_ct_vxp.h
> index f0ac79a..8c57eab 100644
> --- a/include/configs/ca9x4_ct_vxp.h
> +++ b/include/configs/ca9x4_ct_vxp.h
> @@ -32,9 +32,6 @@
> #define CONFIG_REVISION_TAG 1
> #define CONFIG_SYS_TEXT_BASE 0x60800000
>
> -/* High Level Configuration Options */
> -#define CONFIG_ARMV7 1
> -
> #define CONFIG_SYS_MEMTEST_START 0x60000000
> #define CONFIG_SYS_MEMTEST_END 0x20000000
> #define CONFIG_SYS_HZ 1000
> diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
> index 93a1b26..16a5f5b 100644
> --- a/include/configs/cm_t35.h
> +++ b/include/configs/cm_t35.h
> @@ -36,7 +36,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_OMAP34XX 1 /* which is a 34XX */
> #define CONFIG_OMAP3430 1 /* which is in a 3430 */
> diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
> index 125c690..cf77606 100644
> --- a/include/configs/devkit8000.h
> +++ b/include/configs/devkit8000.h
> @@ -32,7 +32,6 @@
> #define __CONFIG_H
>
> /* 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_OMAP34XX 1 /* which is a 34XX */
> #define CONFIG_OMAP3430 1 /* which is in a 3430 */
> diff --git a/include/configs/dig297.h b/include/configs/dig297.h
> index 7aeb24e..b68f073 100644
> --- a/include/configs/dig297.h
> +++ b/include/configs/dig297.h
> @@ -35,7 +35,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_OMAP34XX /* which is a 34XX */
> #define CONFIG_OMAP3430 /* which is in a 3430 */
> diff --git a/include/configs/igep0020.h b/include/configs/igep0020.h
> index 5af9bec..b6534e4 100644
> --- a/include/configs/igep0020.h
> +++ b/include/configs/igep0020.h
> @@ -25,7 +25,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_OMAP34XX 1 /* which is a 34XX */
> #define CONFIG_OMAP3430 1 /* which is in a 3430 */
> diff --git a/include/configs/igep0030.h b/include/configs/igep0030.h
> index 92144af..d85e5ae 100644
> --- a/include/configs/igep0030.h
> +++ b/include/configs/igep0030.h
> @@ -25,7 +25,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_OMAP34XX 1 /* which is a 34XX */
> #define CONFIG_OMAP3430 1 /* which is in a 3430 */
> diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
> index 9fd80ed..d7cbc2f 100644
> --- a/include/configs/omap3_beagle.h
> +++ b/include/configs/omap3_beagle.h
> @@ -31,7 +31,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_OMAP34XX 1 /* which is a 34XX */
> #define CONFIG_OMAP3430 1 /* which is in a 3430 */
> diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
> index 13a4fbf..afa18aa 100644
> --- a/include/configs/omap3_evm.h
> +++ b/include/configs/omap3_evm.h
> @@ -36,7 +36,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_OMAP34XX 1 /* which is a 34XX */
> #define CONFIG_OMAP3430 1 /* which is in a 3430 */
> diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
> index 242b317..d6e0a06 100644
> --- a/include/configs/omap3_overo.h
> +++ b/include/configs/omap3_overo.h
> @@ -23,7 +23,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_OMAP34XX 1 /* which is a 34XX */
> #define CONFIG_OMAP3430 1 /* which is in a 3430 */
> diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
> index 39c87a8..bd55abc 100644
> --- a/include/configs/omap3_pandora.h
> +++ b/include/configs/omap3_pandora.h
> @@ -26,7 +26,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_OMAP34XX 1 /* which is a 34XX */
> #define CONFIG_OMAP3430 1 /* which is in a 3430 */
> diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h
> index 55bbcd4..e1d8c78 100644
> --- a/include/configs/omap3_sdp3430.h
> +++ b/include/configs/omap3_sdp3430.h
> @@ -36,7 +36,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_OMAP34XX 1 /* which is a 34XX */
> #define CONFIG_OMAP3430 1 /* which is in a 3430 */
> diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
> index 9183849..aeac7c7 100644
> --- a/include/configs/omap3_zoom1.h
> +++ b/include/configs/omap3_zoom1.h
> @@ -32,7 +32,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_OMAP34XX 1 /* which is a 34XX */
> #define CONFIG_OMAP3430 1 /* which is in a 3430 */
> diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h
> index 3573edf..2a56182 100644
> --- a/include/configs/omap3_zoom2.h
> +++ b/include/configs/omap3_zoom2.h
> @@ -33,7 +33,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_OMAP34XX 1 /* which is a 34XX */
> #define CONFIG_OMAP3430 1 /* which is in a 3430 */
> diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h
> index 1daffb7..d96c589 100644
> --- a/include/configs/omap4_panda.h
> +++ b/include/configs/omap4_panda.h
> @@ -30,7 +30,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_OMAP44XX 1 /* which is a 44XX */
> #define CONFIG_OMAP4430 1 /* which is in a 4430 */
> diff --git a/include/configs/omap4_sdp4430.h b/include/configs/omap4_sdp4430.h
> index 68ffa87..8c97dc3 100644
> --- a/include/configs/omap4_sdp4430.h
> +++ b/include/configs/omap4_sdp4430.h
> @@ -31,7 +31,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_OMAP44XX 1 /* which is a 44XX */
> #define CONFIG_OMAP4430 1 /* which is in a 4430 */
> diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
> index d648ce8..a5aa859 100644
> --- a/include/configs/s5p_goni.h
> +++ b/include/configs/s5p_goni.h
> @@ -28,7 +28,6 @@
> #define __CONFIG_H
>
> /* High Level Configuration Options */
> -#define CONFIG_ARMV7 1 /* This is an ARM V7 CPU core */
> #define CONFIG_SAMSUNG 1 /* in a SAMSUNG core */
> #define CONFIG_S5P 1 /* which is in a S5P Family */
> #define CONFIG_S5PC110 1 /* which is in a S5PC110 */
> diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
> index bbe104b..4031016 100644
> --- a/include/configs/s5pc210_universal.h
> +++ b/include/configs/s5pc210_universal.h
> @@ -30,7 +30,6 @@
> * High Level Configuration Options
> * (easy to change)
> */
> -#define CONFIG_ARMV7 1 /* This is an ARM V7 CPU core */
> #define CONFIG_SAMSUNG 1 /* in a SAMSUNG core */
> #define CONFIG_S5P 1 /* which is in a S5P Family */
> #define CONFIG_S5PC210 1 /* which is in a S5PC210 */
> diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
> index 70e23b5..19dde1b 100644
> --- a/include/configs/smdkc100.h
> +++ b/include/configs/smdkc100.h
> @@ -32,7 +32,6 @@
> * High Level Configuration Options
> * (easy to change)
> */
> -#define CONFIG_ARMV7 1 /* This is an ARM V7 CPU core */
> #define CONFIG_SAMSUNG 1 /* in a SAMSUNG core */
> #define CONFIG_S5P 1 /* which is in a S5P Family */
> #define CONFIG_S5PC100 1 /* which is in a S5PC100 */
> diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
> index a7f5850..1ba3256 100644
> --- a/include/configs/smdkv310.h
> +++ b/include/configs/smdkv310.h
> @@ -26,7 +26,6 @@
> #define __CONFIG_H
>
> /* High Level Configuration Options */
> -#define CONFIG_ARMV7 1 /*This is an ARM V7 CPU core */
> #define CONFIG_SAMSUNG 1 /* in a SAMSUNG core */
> #define CONFIG_S5P 1 /* S5P Family */
> #define CONFIG_S5PC210 1 /* which is in a S5PC210 SoC */

Applied to u-boot-arm/master, thanks!

Amicalement,
--
Albert.