Patchwork [PULL,0/3] ARM: at91: Kconfig cleanup for prepare add of Cortex-A5 Sama5

login
register
mail settings
Submitter Jean-Christophe PLAGNIOL-VILLARD
Date March 7, 2013, 1:08 p.m.
Message ID <20130307130842.GA4590@game.jcrosoft.org>
Download mbox
Permalink /patch/225845/
State New
Headers show

Pull-request

git://github.com/at91linux/linux-at91.git delivery/at91_3.9_dt_cleanup

Comments

Jean-Christophe PLAGNIOL-VILLARD - March 7, 2013, 1:08 p.m.
HI,

	The folowing patch serie

	move the non dt Kconfig to Kconfig.non_dt as they are plan for removal

	and update the Kconfig scheme to simplify the adding of the up comming
	Cortex-A5 SAMA5D3x series

please pull
The following changes since commit 6dbe51c251a327e012439c4772097a13df43c5b8:

  Linux 3.9-rc1 (2013-03-03 15:11:05 -0800)

are available in the git repository at:

  git://github.com/at91linux/linux-at91.git delivery/at91_3.9_dt_cleanup

for you to fetch changes up to 8ca98913f4b4e0b38d4442551d63681f4fdd0224:

  ARM: at91: renamme rm9200 dt file (2013-03-07 20:20:41 +0800)

----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (3):
      ARM: at91: move non DT Kconfig to Kconfig.non_dt
      ARM: at91: rename board-dt to more specific name board-dt-sam9
      ARM: at91: renamme rm9200 dt file

 arch/arm/configs/at91_dt_defconfig                          |    2 +-
 arch/arm/configs/at91sam9260_defconfig                      |    2 +-
 arch/arm/configs/at91sam9g20_defconfig                      |    2 +-
 arch/arm/configs/at91sam9g45_defconfig                      |    2 +-
 arch/arm/mach-at91/Kconfig                                  |  398 ++-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 arch/arm/mach-at91/Kconfig.non_dt                           |  399 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 arch/arm/mach-at91/Makefile                                 |    4 +--
 arch/arm/mach-at91/{board-rm9200-dt.c => board-dt-rm9200.c} |    0
 arch/arm/mach-at91/{board-dt.c => board-dt-sam9.c}          |    0
 9 files changed, 407 insertions(+), 402 deletions(-)
 create mode 100644 arch/arm/mach-at91/Kconfig.non_dt
 rename arch/arm/mach-at91/{board-rm9200-dt.c => board-dt-rm9200.c} (100%)
 rename arch/arm/mach-at91/{board-dt.c => board-dt-sam9.c} (100%)

Best Regards,
J.
Nicolas Ferre - March 13, 2013, 2:17 p.m.
On 03/07/2013 03:21 PM, Jean-Christophe PLAGNIOL-VILLARD :
> as we will introduce the Cortex-A5 sama5 support

We may need more arguments here (Cf. discussion about the sama5d3
support). Let's discuss this and modify this commit message quickly.

Bye,

> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> Cc: Ludovic Desroches <ludovic.desroches@atmel.com>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
>  arch/arm/configs/at91_dt_defconfig                 |    2 +-
>  arch/arm/configs/at91sam9260_defconfig             |    2 +-
>  arch/arm/configs/at91sam9g20_defconfig             |    2 +-
>  arch/arm/configs/at91sam9g45_defconfig             |    2 +-
>  arch/arm/mach-at91/Kconfig                         |    2 +-
>  arch/arm/mach-at91/Makefile                        |    2 +-
>  arch/arm/mach-at91/{board-dt.c => board-dt-sam9.c} |    0
>  7 files changed, 6 insertions(+), 6 deletions(-)
>  rename arch/arm/mach-at91/{board-dt.c => board-dt-sam9.c} (100%)
> 
> diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig
> index 1ea9590..047f2a4 100644
> --- a/arch/arm/configs/at91_dt_defconfig
> +++ b/arch/arm/configs/at91_dt_defconfig
> @@ -20,7 +20,7 @@ CONFIG_SOC_AT91SAM9263=y
>  CONFIG_SOC_AT91SAM9G45=y
>  CONFIG_SOC_AT91SAM9X5=y
>  CONFIG_SOC_AT91SAM9N12=y
> -CONFIG_MACH_AT91SAM_DT=y
> +CONFIG_MACH_AT91SAM9_DT=y
>  CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
>  CONFIG_AT91_TIMER_HZ=128
>  CONFIG_AEABI=y
> diff --git a/arch/arm/configs/at91sam9260_defconfig b/arch/arm/configs/at91sam9260_defconfig
> index 0ea5d2c..05618eb 100644
> --- a/arch/arm/configs/at91sam9260_defconfig
> +++ b/arch/arm/configs/at91sam9260_defconfig
> @@ -22,7 +22,7 @@ CONFIG_MACH_QIL_A9260=y
>  CONFIG_MACH_CPU9260=y
>  CONFIG_MACH_FLEXIBITY=y
>  CONFIG_MACH_SNAPPER_9260=y
> -CONFIG_MACH_AT91SAM_DT=y
> +CONFIG_MACH_AT91SAM9_DT=y
>  CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
>  # CONFIG_ARM_THUMB is not set
>  CONFIG_ZBOOT_ROM_TEXT=0x0
> diff --git a/arch/arm/configs/at91sam9g20_defconfig b/arch/arm/configs/at91sam9g20_defconfig
> index 3b18810..892e828 100644
> --- a/arch/arm/configs/at91sam9g20_defconfig
> +++ b/arch/arm/configs/at91sam9g20_defconfig
> @@ -22,7 +22,7 @@ CONFIG_MACH_PCONTROL_G20=y
>  CONFIG_MACH_GSIA18S=y
>  CONFIG_MACH_USB_A9G20=y
>  CONFIG_MACH_SNAPPER_9260=y
> -CONFIG_MACH_AT91SAM_DT=y
> +CONFIG_MACH_AT91SAM9_DT=y
>  CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
>  # CONFIG_ARM_THUMB is not set
>  CONFIG_AEABI=y
> diff --git a/arch/arm/configs/at91sam9g45_defconfig b/arch/arm/configs/at91sam9g45_defconfig
> index 606d48f..5f551b7 100644
> --- a/arch/arm/configs/at91sam9g45_defconfig
> +++ b/arch/arm/configs/at91sam9g45_defconfig
> @@ -18,7 +18,7 @@ CONFIG_MODULE_UNLOAD=y
>  CONFIG_ARCH_AT91=y
>  CONFIG_ARCH_AT91SAM9G45=y
>  CONFIG_MACH_AT91SAM9M10G45EK=y
> -CONFIG_MACH_AT91SAM_DT=y
> +CONFIG_MACH_AT91SAM9_DT=y
>  CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
>  CONFIG_AT91_SLOW_CLOCK=y
>  CONFIG_AEABI=y
> diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
> index 98c2e05..440682b 100644
> --- a/arch/arm/mach-at91/Kconfig
> +++ b/arch/arm/mach-at91/Kconfig
> @@ -108,7 +108,7 @@ config MACH_AT91RM9200_DT
>  	  Select this if you want to experiment device-tree with
>  	  an Atmel RM9200 Evaluation Kit.
>  
> -config MACH_AT91SAM_DT
> +config MACH_AT91SAM9_DT
>  	bool "Atmel AT91SAM Evaluation Kits with device-tree support"
>  	depends on SOC_AT91SAM9
>  	select USE_OF
> diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
> index 39218ca..5eca35a 100644
> --- a/arch/arm/mach-at91/Makefile
> +++ b/arch/arm/mach-at91/Makefile
> @@ -88,7 +88,7 @@ obj-$(CONFIG_MACH_AT91SAM9M10G45EK) += board-sam9m10g45ek.o
>  
>  # AT91SAM board with device-tree
>  obj-$(CONFIG_MACH_AT91RM9200_DT) += board-rm9200-dt.o
> -obj-$(CONFIG_MACH_AT91SAM_DT) += board-dt.o
> +obj-$(CONFIG_MACH_AT91SAM9_DT) += board-dt-sam9.o
>  
>  # AT91X40 board-specific support
>  obj-$(CONFIG_MACH_AT91EB01)	+= board-eb01.o
> diff --git a/arch/arm/mach-at91/board-dt.c b/arch/arm/mach-at91/board-dt-sam9.c
> similarity index 100%
> rename from arch/arm/mach-at91/board-dt.c
> rename to arch/arm/mach-at91/board-dt-sam9.c
>
Nicolas Ferre - March 13, 2013, 2:22 p.m.
On 03/07/2013 03:21 PM, Jean-Christophe PLAGNIOL-VILLARD :
> to follow the same scheme board-dt-<socs>.c

Well not <socs> as each and every SoC will not have its own board file.
I confess that finding a proper name is not easy, what about:

Rename the board-rm9200-dt.c file so that we follow the pattern for
Device Tree board files: board-dt-<name of SoC sharing same core>.c

Best regards,

> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> Cc: Ludovic Desroches <ludovic.desroches@atmel.com>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
>  arch/arm/mach-at91/Makefile                                 |    2 +-
>  arch/arm/mach-at91/{board-rm9200-dt.c => board-dt-rm9200.c} |    0
>  2 files changed, 1 insertion(+), 1 deletion(-)
>  rename arch/arm/mach-at91/{board-rm9200-dt.c => board-dt-rm9200.c} (100%)
> 
> diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
> index 5eca35a..505fed9 100644
> --- a/arch/arm/mach-at91/Makefile
> +++ b/arch/arm/mach-at91/Makefile
> @@ -87,7 +87,7 @@ obj-$(CONFIG_MACH_SNAPPER_9260)	+= board-snapper9260.o
>  obj-$(CONFIG_MACH_AT91SAM9M10G45EK) += board-sam9m10g45ek.o
>  
>  # AT91SAM board with device-tree
> -obj-$(CONFIG_MACH_AT91RM9200_DT) += board-rm9200-dt.o
> +obj-$(CONFIG_MACH_AT91RM9200_DT) += board-dt-rm9200.o
>  obj-$(CONFIG_MACH_AT91SAM9_DT) += board-dt-sam9.o
>  
>  # AT91X40 board-specific support
> diff --git a/arch/arm/mach-at91/board-rm9200-dt.c b/arch/arm/mach-at91/board-dt-rm9200.c
> similarity index 100%
> rename from arch/arm/mach-at91/board-rm9200-dt.c
> rename to arch/arm/mach-at91/board-dt-rm9200.c
>
Nicolas Ferre - March 13, 2013, 4:30 p.m.
On 03/13/2013 03:22 PM, Nicolas Ferre :
> On 03/07/2013 03:21 PM, Jean-Christophe PLAGNIOL-VILLARD :
>> to follow the same scheme board-dt-<socs>.c
> 
> Well not <socs> as each and every SoC will not have its own board file.
> I confess that finding a proper name is not easy, what about:
> 
> Rename the board-rm9200-dt.c file so that we follow the pattern for
> Device Tree board files: board-dt-<name of SoC sharing same core>.c

Queued in at91-3.10-soc with this modified commit message.

Thanks, best regards,


> Best regards,
> 
>> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
>> Cc: Ludovic Desroches <ludovic.desroches@atmel.com>
>> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
>> ---
>>  arch/arm/mach-at91/Makefile                                 |    2 +-
>>  arch/arm/mach-at91/{board-rm9200-dt.c => board-dt-rm9200.c} |    0
>>  2 files changed, 1 insertion(+), 1 deletion(-)
>>  rename arch/arm/mach-at91/{board-rm9200-dt.c => board-dt-rm9200.c} (100%)
>>
>> diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
>> index 5eca35a..505fed9 100644
>> --- a/arch/arm/mach-at91/Makefile
>> +++ b/arch/arm/mach-at91/Makefile
>> @@ -87,7 +87,7 @@ obj-$(CONFIG_MACH_SNAPPER_9260)	+= board-snapper9260.o
>>  obj-$(CONFIG_MACH_AT91SAM9M10G45EK) += board-sam9m10g45ek.o
>>  
>>  # AT91SAM board with device-tree
>> -obj-$(CONFIG_MACH_AT91RM9200_DT) += board-rm9200-dt.o
>> +obj-$(CONFIG_MACH_AT91RM9200_DT) += board-dt-rm9200.o
>>  obj-$(CONFIG_MACH_AT91SAM9_DT) += board-dt-sam9.o
>>  
>>  # AT91X40 board-specific support
>> diff --git a/arch/arm/mach-at91/board-rm9200-dt.c b/arch/arm/mach-at91/board-dt-rm9200.c
>> similarity index 100%
>> rename from arch/arm/mach-at91/board-rm9200-dt.c
>> rename to arch/arm/mach-at91/board-dt-rm9200.c
>>
> 
>
Nicolas Ferre - March 13, 2013, 4:32 p.m.
On 03/13/2013 03:17 PM, Nicolas Ferre :
> On 03/07/2013 03:21 PM, Jean-Christophe PLAGNIOL-VILLARD :
>> as we will introduce the Cortex-A5 sama5 support
> 
> We may need more arguments here (Cf. discussion about the sama5d3
> support). Let's discuss this and modify this commit message quickly.

Queued to at91-3.10-soc with following commit message:

"
We will produce a board-dt file per SoC core type. That will ease code
readability and will prevent from including superfluous code for supporting
machines that will never be compiled together (particularly the ARM9 and C-A5
upcoming SoCs).
"

Thanks, best regards,

>> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
>> Cc: Ludovic Desroches <ludovic.desroches@atmel.com>
>> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
>> ---
>>  arch/arm/configs/at91_dt_defconfig                 |    2 +-
>>  arch/arm/configs/at91sam9260_defconfig             |    2 +-
>>  arch/arm/configs/at91sam9g20_defconfig             |    2 +-
>>  arch/arm/configs/at91sam9g45_defconfig             |    2 +-
>>  arch/arm/mach-at91/Kconfig                         |    2 +-
>>  arch/arm/mach-at91/Makefile                        |    2 +-
>>  arch/arm/mach-at91/{board-dt.c => board-dt-sam9.c} |    0
>>  7 files changed, 6 insertions(+), 6 deletions(-)
>>  rename arch/arm/mach-at91/{board-dt.c => board-dt-sam9.c} (100%)
>>
>> diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig
>> index 1ea9590..047f2a4 100644
>> --- a/arch/arm/configs/at91_dt_defconfig
>> +++ b/arch/arm/configs/at91_dt_defconfig
>> @@ -20,7 +20,7 @@ CONFIG_SOC_AT91SAM9263=y
>>  CONFIG_SOC_AT91SAM9G45=y
>>  CONFIG_SOC_AT91SAM9X5=y
>>  CONFIG_SOC_AT91SAM9N12=y
>> -CONFIG_MACH_AT91SAM_DT=y
>> +CONFIG_MACH_AT91SAM9_DT=y
>>  CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
>>  CONFIG_AT91_TIMER_HZ=128
>>  CONFIG_AEABI=y
>> diff --git a/arch/arm/configs/at91sam9260_defconfig b/arch/arm/configs/at91sam9260_defconfig
>> index 0ea5d2c..05618eb 100644
>> --- a/arch/arm/configs/at91sam9260_defconfig
>> +++ b/arch/arm/configs/at91sam9260_defconfig
>> @@ -22,7 +22,7 @@ CONFIG_MACH_QIL_A9260=y
>>  CONFIG_MACH_CPU9260=y
>>  CONFIG_MACH_FLEXIBITY=y
>>  CONFIG_MACH_SNAPPER_9260=y
>> -CONFIG_MACH_AT91SAM_DT=y
>> +CONFIG_MACH_AT91SAM9_DT=y
>>  CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
>>  # CONFIG_ARM_THUMB is not set
>>  CONFIG_ZBOOT_ROM_TEXT=0x0
>> diff --git a/arch/arm/configs/at91sam9g20_defconfig b/arch/arm/configs/at91sam9g20_defconfig
>> index 3b18810..892e828 100644
>> --- a/arch/arm/configs/at91sam9g20_defconfig
>> +++ b/arch/arm/configs/at91sam9g20_defconfig
>> @@ -22,7 +22,7 @@ CONFIG_MACH_PCONTROL_G20=y
>>  CONFIG_MACH_GSIA18S=y
>>  CONFIG_MACH_USB_A9G20=y
>>  CONFIG_MACH_SNAPPER_9260=y
>> -CONFIG_MACH_AT91SAM_DT=y
>> +CONFIG_MACH_AT91SAM9_DT=y
>>  CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
>>  # CONFIG_ARM_THUMB is not set
>>  CONFIG_AEABI=y
>> diff --git a/arch/arm/configs/at91sam9g45_defconfig b/arch/arm/configs/at91sam9g45_defconfig
>> index 606d48f..5f551b7 100644
>> --- a/arch/arm/configs/at91sam9g45_defconfig
>> +++ b/arch/arm/configs/at91sam9g45_defconfig
>> @@ -18,7 +18,7 @@ CONFIG_MODULE_UNLOAD=y
>>  CONFIG_ARCH_AT91=y
>>  CONFIG_ARCH_AT91SAM9G45=y
>>  CONFIG_MACH_AT91SAM9M10G45EK=y
>> -CONFIG_MACH_AT91SAM_DT=y
>> +CONFIG_MACH_AT91SAM9_DT=y
>>  CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
>>  CONFIG_AT91_SLOW_CLOCK=y
>>  CONFIG_AEABI=y
>> diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
>> index 98c2e05..440682b 100644
>> --- a/arch/arm/mach-at91/Kconfig
>> +++ b/arch/arm/mach-at91/Kconfig
>> @@ -108,7 +108,7 @@ config MACH_AT91RM9200_DT
>>  	  Select this if you want to experiment device-tree with
>>  	  an Atmel RM9200 Evaluation Kit.
>>  
>> -config MACH_AT91SAM_DT
>> +config MACH_AT91SAM9_DT
>>  	bool "Atmel AT91SAM Evaluation Kits with device-tree support"
>>  	depends on SOC_AT91SAM9
>>  	select USE_OF
>> diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
>> index 39218ca..5eca35a 100644
>> --- a/arch/arm/mach-at91/Makefile
>> +++ b/arch/arm/mach-at91/Makefile
>> @@ -88,7 +88,7 @@ obj-$(CONFIG_MACH_AT91SAM9M10G45EK) += board-sam9m10g45ek.o
>>  
>>  # AT91SAM board with device-tree
>>  obj-$(CONFIG_MACH_AT91RM9200_DT) += board-rm9200-dt.o
>> -obj-$(CONFIG_MACH_AT91SAM_DT) += board-dt.o
>> +obj-$(CONFIG_MACH_AT91SAM9_DT) += board-dt-sam9.o
>>  
>>  # AT91X40 board-specific support
>>  obj-$(CONFIG_MACH_AT91EB01)	+= board-eb01.o
>> diff --git a/arch/arm/mach-at91/board-dt.c b/arch/arm/mach-at91/board-dt-sam9.c
>> similarity index 100%
>> rename from arch/arm/mach-at91/board-dt.c
>> rename to arch/arm/mach-at91/board-dt-sam9.c
>>
> 
>