From: nicolas.ferre@atmel.com (Nicolas Ferre)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: at91: remove CONFIG_MACH_SAMA5_DT
Date: Thu, 13 Nov 2014 10:31:05 +0100 [thread overview]
Message-ID: <54647A59.6080709@atmel.com> (raw)
In-Reply-To: <1415652353-15985-1-git-send-email-alexandre.belloni@free-electrons.com>
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 <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
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
next prev parent reply other threads:[~2014-11-13 9:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-10 20:45 [PATCH] ARM: at91: remove CONFIG_MACH_SAMA5_DT Alexandre Belloni
2014-11-13 9:31 ` Nicolas Ferre [this message]
2014-11-13 9:34 ` Boris Brezillon
2014-11-13 9:54 ` Alexandre Belloni
2014-11-13 9:57 ` Boris Brezillon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54647A59.6080709@atmel.com \
--to=nicolas.ferre@atmel.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).