2014-11-10 20:45:59

by Alexandre Belloni

Subject: [PATCH] ARM: at91: remove CONFIG_MACH_SAMA5_DT

CONFIG_MACH_SAMA5_DT is useless as the only way to boot on sama5 based boards is
to use device tree.

Signed-off-by: Alexandre Belloni <[email protected]>
---
arch/arm/configs/sama5_defconfig | 1 -
arch/arm/mach-at91/Kconfig | 10 +---------
arch/arm/mach-at91/Makefile | 2 +-
3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig
index c9089c927daf..299ca18bbd75 100644
--- a/arch/arm/configs/sama5_defconfig
+++ b/arch/arm/configs/sama5_defconfig
@@ -20,7 +20,6 @@ CONFIG_ARCH_AT91=y
CONFIG_SOC_SAM_V7=y
CONFIG_SOC_SAMA5D3=y
CONFIG_SOC_SAMA5D4=y
-CONFIG_MACH_SAMA5_DT=y
CONFIG_AEABI=y
CONFIG_UACCESS_WITH_MEMCPY=y
CONFIG_ZBOOT_ROM_TEXT=0x0
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 0e6d548b70d9..81ddd7d31d1e 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -58,6 +58,7 @@ config SOC_SAMA5
select USE_OF
select MEMORY
select ATMEL_SDRAMC
+ select PHYLIB if NETDEVICES

menu "Atmel AT91 System-on-Chip"

@@ -221,15 +222,6 @@ config MACH_AT91SAM9_DT
Select this if you want to experiment device-tree with
an Atmel Evaluation Kit.

-config MACH_SAMA5_DT
- bool "Atmel SAMA5 Evaluation Kits with device-tree support"
- depends on SOC_SAMA5
- select USE_OF
- select PHYLIB if NETDEVICES
- help
- Select this if you want to experiment device-tree with
- an Atmel Evaluation Kit.
-
# ----------------------------------------------------------

comment "AT91 Feature Selections"
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index 1b9ae0257a6e..25ae74837d23 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -80,7 +80,7 @@ obj-$(CONFIG_MACH_AT91RM9200_DT) += board-dt-rm9200.o
obj-$(CONFIG_MACH_AT91SAM9_DT) += board-dt-sam9.o

# SAMA5 board with device-tree
-obj-$(CONFIG_MACH_SAMA5_DT) += board-dt-sama5.o
+obj-$(CONFIG_SOC_SAMA5) += board-dt-sama5.o

# AT91X40 board-specific support
obj-$(CONFIG_MACH_AT91EB01) += board-eb01.o
--
2.1.0

2014-11-13 09:31:13

by Nicolas Ferre

Subject: Re: [PATCH] ARM: at91: remove CONFIG_MACH_SAMA5_DT

On 10/11/2014 21:45, Alexandre Belloni :
> CONFIG_MACH_SAMA5_DT is useless as the only way to boot on sama5 based boards is
> to use device tree.
>
> Signed-off-by: Alexandre Belloni <[email protected]>

Acked-by: Nicolas Ferre <[email protected]>

queued on at91-3.19-cleanup. Thanks.

> ---
> arch/arm/configs/sama5_defconfig | 1 -
> arch/arm/mach-at91/Kconfig | 10 +---------
> arch/arm/mach-at91/Makefile | 2 +-
> 3 files changed, 2 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig
> index c9089c927daf..299ca18bbd75 100644
> --- a/arch/arm/configs/sama5_defconfig
> +++ b/arch/arm/configs/sama5_defconfig
> @@ -20,7 +20,6 @@ CONFIG_ARCH_AT91=y
> CONFIG_SOC_SAM_V7=y
> CONFIG_SOC_SAMA5D3=y
> CONFIG_SOC_SAMA5D4=y
> -CONFIG_MACH_SAMA5_DT=y
> CONFIG_AEABI=y
> CONFIG_UACCESS_WITH_MEMCPY=y
> CONFIG_ZBOOT_ROM_TEXT=0x0
> diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
> index 0e6d548b70d9..81ddd7d31d1e 100644
> --- a/arch/arm/mach-at91/Kconfig
> +++ b/arch/arm/mach-at91/Kconfig
> @@ -58,6 +58,7 @@ config SOC_SAMA5
> select USE_OF
> select MEMORY
> select ATMEL_SDRAMC
> + select PHYLIB if NETDEVICES
>
> menu "Atmel AT91 System-on-Chip"
>
> @@ -221,15 +222,6 @@ config MACH_AT91SAM9_DT
> Select this if you want to experiment device-tree with
> an Atmel Evaluation Kit.
>
> -config MACH_SAMA5_DT
> - bool "Atmel SAMA5 Evaluation Kits with device-tree support"
> - depends on SOC_SAMA5
> - select USE_OF
> - select PHYLIB if NETDEVICES
> - help
> - Select this if you want to experiment device-tree with
> - an Atmel Evaluation Kit.
> -
> # ----------------------------------------------------------
>
> comment "AT91 Feature Selections"
> diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
> index 1b9ae0257a6e..25ae74837d23 100644
> --- a/arch/arm/mach-at91/Makefile
> +++ b/arch/arm/mach-at91/Makefile
> @@ -80,7 +80,7 @@ obj-$(CONFIG_MACH_AT91RM9200_DT) += board-dt-rm9200.o
> obj-$(CONFIG_MACH_AT91SAM9_DT) += board-dt-sam9.o
>
> # SAMA5 board with device-tree
> -obj-$(CONFIG_MACH_SAMA5_DT) += board-dt-sama5.o
> +obj-$(CONFIG_SOC_SAMA5) += board-dt-sama5.o
>
> # AT91X40 board-specific support
> obj-$(CONFIG_MACH_AT91EB01) += board-eb01.o
>


--
Nicolas Ferre

2014-11-13 09:34:32

by Boris Brezillon

Subject: Re: [PATCH] ARM: at91: remove CONFIG_MACH_SAMA5_DT

On Mon, 10 Nov 2014 21:45:53 +0100
Alexandre Belloni <[email protected]> wrote:

> CONFIG_MACH_SAMA5_DT is useless as the only way to boot on sama5 based boards is
> to use device tree.
>
> Signed-off-by: Alexandre Belloni <[email protected]>
> ---
> arch/arm/configs/sama5_defconfig | 1 -
> arch/arm/mach-at91/Kconfig | 10 +---------
> arch/arm/mach-at91/Makefile | 2 +-
> 3 files changed, 2 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig
> index c9089c927daf..299ca18bbd75 100644
> --- a/arch/arm/configs/sama5_defconfig
> +++ b/arch/arm/configs/sama5_defconfig
> @@ -20,7 +20,6 @@ CONFIG_ARCH_AT91=y
> CONFIG_SOC_SAM_V7=y
> CONFIG_SOC_SAMA5D3=y
> CONFIG_SOC_SAMA5D4=y
> -CONFIG_MACH_SAMA5_DT=y
> CONFIG_AEABI=y
> CONFIG_UACCESS_WITH_MEMCPY=y
> CONFIG_ZBOOT_ROM_TEXT=0x0
> diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
> index 0e6d548b70d9..81ddd7d31d1e 100644
> --- a/arch/arm/mach-at91/Kconfig
> +++ b/arch/arm/mach-at91/Kconfig
> @@ -58,6 +58,7 @@ config SOC_SAMA5
> select USE_OF
> select MEMORY
> select ATMEL_SDRAMC
> + select PHYLIB if NETDEVICES

Is this really related to this commit ?

--
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

2014-11-13 09:54:21

by Alexandre Belloni

Subject: Re: [PATCH] ARM: at91: remove CONFIG_MACH_SAMA5_DT

On 13/11/2014 at 10:34:25 +0100, Boris Brezillon wrote :
> > diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
> > index 0e6d548b70d9..81ddd7d31d1e 100644
> > --- a/arch/arm/mach-at91/Kconfig
> > +++ b/arch/arm/mach-at91/Kconfig
> > @@ -58,6 +58,7 @@ config SOC_SAMA5
> > select USE_OF
> > select MEMORY
> > select ATMEL_SDRAMC
> > + select PHYLIB if NETDEVICES
>
> Is this really related to this commit ?
>

Yes, I simply moved it from CONFIG_MACH_SAMA5_DT to CONFIG_SOC_SAMA5 to
keep the same functionalities (and probably avoid compilation breakage).


--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

2014-11-13 09:57:36

by Boris Brezillon

Subject: Re: [PATCH] ARM: at91: remove CONFIG_MACH_SAMA5_DT

On Thu, 13 Nov 2014 10:54:14 +0100
Alexandre Belloni <[email protected]> wrote:

> On 13/11/2014 at 10:34:25 +0100, Boris Brezillon wrote :
> > > diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
> > > index 0e6d548b70d9..81ddd7d31d1e 100644
> > > --- a/arch/arm/mach-at91/Kconfig
> > > +++ b/arch/arm/mach-at91/Kconfig
> > > @@ -58,6 +58,7 @@ config SOC_SAMA5
> > > select USE_OF
> > > select MEMORY
> > > select ATMEL_SDRAMC
> > > + select PHYLIB if NETDEVICES
> >
> > Is this really related to this commit ?
> >
>
> Yes, I simply moved it from CONFIG_MACH_SAMA5_DT to CONFIG_SOC_SAMA5 to
> keep the same functionalities (and probably avoid compilation breakage).
>
>

Okay, my bad, I didn't notice it came from the CONFIG_MACH_SAMA5_DT.


--
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com