Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com> --- depond on Arm Kconfig reorganisation patch series arch/arm/Makefile | 4 ++-- arch/arm/configs/a9m2410_defconfig | 2 +- arch/arm/configs/a9m2440_defconfig | 2 +- arch/arm/configs/at91sam9260ek_defconfig | 2 +- arch/arm/configs/at91sam9263ek_defconfig | 4 ++-- arch/arm/configs/eukrea_cpuimx27_defconfig | 2 +- arch/arm/configs/freescale_mx25_3stack_defconfig | 2 +- arch/arm/configs/freescale_mx35_3stack_defconfig | 2 +- arch/arm/configs/mmccpu_defconfig | 2 +- arch/arm/configs/mx21ads_defconfig | 2 +- arch/arm/configs/mx27ads_defconfig | 2 +- arch/arm/configs/netx_nxdb500_defconfig | 2 +- .../arm/configs/omap3530_beagle_per_uart_defconfig | 2 +- arch/arm/configs/pca100_defconfig | 2 +- arch/arm/configs/pcm037_defconfig | 2 +- arch/arm/configs/pcm038_defconfig | 2 +- arch/arm/configs/pcm043_defconfig | 2 +- arch/arm/configs/pm9263_defconfig | 2 +- arch/arm/mach-at91/Kconfig | 8 ++++---- 19 files changed, 24 insertions(+), 24 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 7248e08..9f0f7ec 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -17,8 +17,8 @@ board-$(CONFIG_MACH_IMX27ADS) := imx27ads board-$(CONFIG_MACH_NXDB500) := netx board-$(CONFIG_MACH_PCM037) := pcm037 board-$(CONFIG_MACH_OMAP) := omap -board-$(CONFIG_MACH_AT91SAM9260_EK):= at91sam9260ek -board-$(CONFIG_MACH_AT91SAM9263_EK):= at91sam9263ek +board-$(CONFIG_MACH_AT91SAM9260EK):= at91sam9260ek +board-$(CONFIG_MACH_AT91SAM9263EK):= at91sam9263ek board-$(CONFIG_MACH_PM9263) := pm9263 board-$(CONFIG_MACH_FREESCALE_MX35_3STACK) := freescale-mx35-3-stack board-$(CONFIG_MACH_FREESCALE_MX25_3STACK) := freescale-mx25-3-stack diff --git a/arch/arm/configs/a9m2410_defconfig b/arch/arm/configs/a9m2410_defconfig index 94244c7..5152c74 100644 --- a/arch/arm/configs/a9m2410_defconfig +++ b/arch/arm/configs/a9m2410_defconfig @@ -20,7 +20,7 @@ CONFIG_ARM920T=y # CONFIG_MACH_NXDB500 is not set # CONFIG_MACH_PCM037 is not set # CONFIG_MACH_OMAP is not set -# CONFIG_MACH_AT91SAM9260_EK is not set +# CONFIG_MACH_AT91SAM9260EK is not set # CONFIG_MACH_PM9263 is not set CONFIG_MACH_A9M2410=y # CONFIG_MACH_A9M2440 is not set diff --git a/arch/arm/configs/a9m2440_defconfig b/arch/arm/configs/a9m2440_defconfig index 5d4d2bd..2667f46 100644 --- a/arch/arm/configs/a9m2440_defconfig +++ b/arch/arm/configs/a9m2440_defconfig @@ -20,7 +20,7 @@ CONFIG_ARM920T=y # CONFIG_MACH_NXDB500 is not set # CONFIG_MACH_PCM037 is not set # CONFIG_MACH_OMAP is not set -# CONFIG_MACH_AT91SAM9260_EK is not set +# CONFIG_MACH_AT91SAM9260EK is not set # CONFIG_MACH_PM9263 is not set # CONFIG_MACH_A9M2410 is not set CONFIG_MACH_A9M2440=y diff --git a/arch/arm/configs/at91sam9260ek_defconfig b/arch/arm/configs/at91sam9260ek_defconfig index 492005f..bb1e607 100644 --- a/arch/arm/configs/at91sam9260ek_defconfig +++ b/arch/arm/configs/at91sam9260ek_defconfig @@ -19,7 +19,7 @@ CONFIG_ARCH_AT91SAM9260=y # CONFIG_MACH_NXDB500 is not set # CONFIG_MACH_PCM037 is not set # CONFIG_MACH_OMAP is not set -CONFIG_MACH_AT91SAM9260_EK=y +CONFIG_MACH_AT91SAM9260EK=y # CONFIG_MACH_PM9263 is not set # diff --git a/arch/arm/configs/at91sam9263ek_defconfig b/arch/arm/configs/at91sam9263ek_defconfig index 90fcd32..95436e3 100644 --- a/arch/arm/configs/at91sam9263ek_defconfig +++ b/arch/arm/configs/at91sam9263ek_defconfig @@ -23,8 +23,8 @@ CONFIG_ARCH_AT91SAM9263=y # CONFIG_MACH_NXDB500 is not set # CONFIG_MACH_PCM037 is not set # CONFIG_MACH_OMAP is not set -# CONFIG_MACH_AT91SAM9260_EK is not set -CONFIG_MACH_AT91SAM9263_EK=y +# CONFIG_MACH_AT91SAM9260EK is not set +CONFIG_MACH_AT91SAM9263EK=y # CONFIG_MACH_PM9263 is not set # CONFIG_MACH_A9M2410 is not set # CONFIG_MACH_A9M2440 is not set diff --git a/arch/arm/configs/eukrea_cpuimx27_defconfig b/arch/arm/configs/eukrea_cpuimx27_defconfig index 465db18..42d2666 100644 --- a/arch/arm/configs/eukrea_cpuimx27_defconfig +++ b/arch/arm/configs/eukrea_cpuimx27_defconfig @@ -20,7 +20,7 @@ CONFIG_ARM926EJS=y # CONFIG_MACH_NXDB500 is not set # CONFIG_MACH_PCM037 is not set # CONFIG_MACH_OMAP is not set -# CONFIG_MACH_AT91SAM9260_EK is not set +# CONFIG_MACH_AT91SAM9260EK is not set # CONFIG_MACH_PM9263 is not set # CONFIG_MACH_A9M2410 is not set # CONFIG_MACH_A9M2440 is not set diff --git a/arch/arm/configs/freescale_mx25_3stack_defconfig b/arch/arm/configs/freescale_mx25_3stack_defconfig index 6ef3ffb..940fed2 100644 --- a/arch/arm/configs/freescale_mx25_3stack_defconfig +++ b/arch/arm/configs/freescale_mx25_3stack_defconfig @@ -21,7 +21,7 @@ CONFIG_MACH_FREESCALE_MX25_3STACK=y # CONFIG_MACH_NXDB500 is not set # CONFIG_MACH_PCM037 is not set # CONFIG_MACH_OMAP is not set -# CONFIG_MACH_AT91SAM9260_EK is not set +# CONFIG_MACH_AT91SAM9260EK is not set # CONFIG_MACH_PM9263 is not set # diff --git a/arch/arm/configs/freescale_mx35_3stack_defconfig b/arch/arm/configs/freescale_mx35_3stack_defconfig index e5621bc..6dbea50 100644 --- a/arch/arm/configs/freescale_mx35_3stack_defconfig +++ b/arch/arm/configs/freescale_mx35_3stack_defconfig @@ -20,7 +20,7 @@ CONFIG_MACH_FREESCALE_MX35_3STACK=y # CONFIG_MACH_NXDB500 is not set # CONFIG_MACH_PCM037 is not set # CONFIG_MACH_OMAP is not set -# CONFIG_MACH_AT91SAM9260_EK is not set +# CONFIG_MACH_AT91SAM9260EK is not set # CONFIG_MACH_PM9263 is not set # diff --git a/arch/arm/configs/mmccpu_defconfig b/arch/arm/configs/mmccpu_defconfig index 5d31fc0..f6f9c39 100644 --- a/arch/arm/configs/mmccpu_defconfig +++ b/arch/arm/configs/mmccpu_defconfig @@ -22,7 +22,7 @@ CONFIG_ARCH_AT91SAM9263=y # CONFIG_MACH_NXDB500 is not set # CONFIG_MACH_PCM037 is not set # CONFIG_MACH_OMAP is not set -# CONFIG_MACH_AT91SAM9260_EK is not set +# CONFIG_MACH_AT91SAM9260EK is not set # CONFIG_MACH_PM9263 is not set # CONFIG_MACH_PCA100 is not set CONFIG_MACH_MMCCPU=y diff --git a/arch/arm/configs/mx21ads_defconfig b/arch/arm/configs/mx21ads_defconfig index 4ea532c..1bc2784 100644 --- a/arch/arm/configs/mx21ads_defconfig +++ b/arch/arm/configs/mx21ads_defconfig @@ -20,7 +20,7 @@ CONFIG_MACH_IMX21ADS=y # CONFIG_MACH_NXDB500 is not set # CONFIG_MACH_PCM037 is not set # CONFIG_MACH_OMAP is not set -# CONFIG_MACH_AT91SAM9260_EK is not set +# CONFIG_MACH_AT91SAM9260EK is not set # CONFIG_MACH_PM9263 is not set # CONFIG_MACH_PCA100 is not set diff --git a/arch/arm/configs/mx27ads_defconfig b/arch/arm/configs/mx27ads_defconfig index 479ddc8..2d40eab 100644 --- a/arch/arm/configs/mx27ads_defconfig +++ b/arch/arm/configs/mx27ads_defconfig @@ -19,7 +19,7 @@ CONFIG_MACH_IMX27ADS=y # CONFIG_MACH_NXDB500 is not set # CONFIG_MACH_PCM037 is not set # CONFIG_MACH_OMAP is not set -# CONFIG_MACH_AT91SAM9260_EK is not set +# CONFIG_MACH_AT91SAM9260EK is not set # CONFIG_MACH_PM9263 is not set CONFIG_IMX_CLKO=y diff --git a/arch/arm/configs/netx_nxdb500_defconfig b/arch/arm/configs/netx_nxdb500_defconfig index 863a4be..248fce0 100644 --- a/arch/arm/configs/netx_nxdb500_defconfig +++ b/arch/arm/configs/netx_nxdb500_defconfig @@ -18,7 +18,7 @@ CONFIG_ARCH_NETX=y CONFIG_MACH_NXDB500=y # CONFIG_MACH_PCM037 is not set # CONFIG_MACH_OMAP is not set -# CONFIG_MACH_AT91SAM9260_EK is not set +# CONFIG_MACH_AT91SAM9260EK is not set CONFIG_NETX_SDRAM_CTRL=0x010D0121 CONFIG_NETX_SDRAM_TIMING_CTRL=0x03C13261 CONFIG_NETX_MEM_CTRL=0x0203030F diff --git a/arch/arm/configs/omap3530_beagle_per_uart_defconfig b/arch/arm/configs/omap3530_beagle_per_uart_defconfig index ea36d48..b64e631 100644 --- a/arch/arm/configs/omap3530_beagle_per_uart_defconfig +++ b/arch/arm/configs/omap3530_beagle_per_uart_defconfig @@ -18,7 +18,7 @@ CONFIG_ARCH_OMAP=y # CONFIG_MACH_NXDB500 is not set # CONFIG_MACH_PCM037 is not set CONFIG_MACH_OMAP=y -# CONFIG_MACH_AT91SAM9260_EK is not set +# CONFIG_MACH_AT91SAM9260EK is not set # # OMAP Features diff --git a/arch/arm/configs/pca100_defconfig b/arch/arm/configs/pca100_defconfig index bde5760..ea13596 100644 --- a/arch/arm/configs/pca100_defconfig +++ b/arch/arm/configs/pca100_defconfig @@ -19,7 +19,7 @@ CONFIG_ARM926EJS=y # CONFIG_MACH_NXDB500 is not set # CONFIG_MACH_PCM037 is not set # CONFIG_MACH_OMAP is not set -# CONFIG_MACH_AT91SAM9260_EK is not set +# CONFIG_MACH_AT91SAM9260EK is not set # CONFIG_MACH_PM9263 is not set CONFIG_MACH_PCA100=y # CONFIG_MACH_MMCCPU is not set diff --git a/arch/arm/configs/pcm037_defconfig b/arch/arm/configs/pcm037_defconfig index 5c6c37a..c35d7aa 100644 --- a/arch/arm/configs/pcm037_defconfig +++ b/arch/arm/configs/pcm037_defconfig @@ -18,7 +18,7 @@ CONFIG_ARCH_IMX31=y # CONFIG_MACH_NXDB500 is not set CONFIG_MACH_PCM037=y # CONFIG_MACH_OMAP is not set -# CONFIG_MACH_AT91SAM9260_EK is not set +# CONFIG_MACH_AT91SAM9260EK is not set # # Arm specific settings diff --git a/arch/arm/configs/pcm038_defconfig b/arch/arm/configs/pcm038_defconfig index cd2c7e5..ffe6fe8 100644 --- a/arch/arm/configs/pcm038_defconfig +++ b/arch/arm/configs/pcm038_defconfig @@ -21,7 +21,7 @@ CONFIG_MACH_PCM038=y # CONFIG_MACH_NXDB500 is not set # CONFIG_MACH_PCM037 is not set # CONFIG_MACH_OMAP is not set -# CONFIG_MACH_AT91SAM9260_EK is not set +# CONFIG_MACH_AT91SAM9260EK is not set # CONFIG_MACH_PM9263 is not set # CONFIG_MACH_A9M2410 is not set # CONFIG_MACH_A9M2440 is not set diff --git a/arch/arm/configs/pcm043_defconfig b/arch/arm/configs/pcm043_defconfig index ced8ee4..0367929 100644 --- a/arch/arm/configs/pcm043_defconfig +++ b/arch/arm/configs/pcm043_defconfig @@ -19,7 +19,7 @@ CONFIG_MACH_PCM043=y # CONFIG_MACH_NXDB500 is not set # CONFIG_MACH_PCM037 is not set # CONFIG_MACH_OMAP is not set -# CONFIG_MACH_AT91SAM9260_EK is not set +# CONFIG_MACH_AT91SAM9260EK is not set # CONFIG_MACH_PM9263 is not set # CONFIG_MACH_PCA100 is not set diff --git a/arch/arm/configs/pm9263_defconfig b/arch/arm/configs/pm9263_defconfig index c1e5954..a443b95 100644 --- a/arch/arm/configs/pm9263_defconfig +++ b/arch/arm/configs/pm9263_defconfig @@ -19,7 +19,7 @@ CONFIG_ARCH_AT91SAM9263=y # CONFIG_MACH_NXDB500 is not set # CONFIG_MACH_PCM037 is not set # CONFIG_MACH_OMAP is not set -# CONFIG_MACH_AT91SAM9260_EK is not set +# CONFIG_MACH_AT91SAM9260EK is not set CONFIG_MACH_PM9263=y # diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index cd2645e..ecada4a 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -5,8 +5,8 @@ config ARCH_TEXT_BASE default 0x23f00000 config BOARDINFO - default "Atmel 91SAM9260-EK" if MACH_AT91SAM9260_EK - default "Atmel at91sam9263-ek" if MACH_AT91SAM9263_EK + default "Atmel 91SAM9260-EK" if MACH_AT91SAM9260EK + default "Atmel at91sam9263-ek" if MACH_AT91SAM9263EK default "Bucyrus MMC-CPU" if MACH_MMCCPU default "Ronetix PM9263" if MACH_PM9263 @@ -34,7 +34,7 @@ choice prompt "AT91SAM9260 Board Type" -config MACH_AT91SAM9260_EK +config MACH_AT91SAM9260EK bool "Atmel AT91SAM9260-EK" help Say y here if you are using Atmel's AT91SAM9260-EK Evaluation board @@ -50,7 +50,7 @@ if ARCH_AT91SAM9263 choice prompt "AT91SAM9263 Board Type" -config MACH_AT91SAM9263_EK +config MACH_AT91SAM9263EK bool "Atmel AT91SAM9263-EK" help Say y here if you are using Atmel's AT91SAM9263-EK Evaluation board -- 1.6.5
