From patchwork Wed Mar 27 19:01:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2352821 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 5A88E3FC8C for ; Wed, 27 Mar 2013 19:08:45 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UKveR-0003QP-4q; Wed, 27 Mar 2013 19:04:47 +0000 Received: from moutng.kundenserver.de ([212.227.17.8]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UKveN-0003Oc-4a for linux-arm-kernel@lists.infradead.org; Wed, 27 Mar 2013 19:04:43 +0000 Received: from klappe2.localnet (HSI-KBW-46-223-90-92.hsi.kabel-badenwuerttemberg.de [46.223.90.92]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0Lfneo-1V0N5l1fPG-00orIf; Wed, 27 Mar 2013 20:02:03 +0100 From: Arnd Bergmann To: Nicolas Ferre Subject: Re: [GIT PULL] at91: soc for 3.10 #2 Date: Wed, 27 Mar 2013 19:01:59 +0000 User-Agent: KMail/1.12.2 (Linux/3.8.0-13-generic; KDE/4.3.2; x86_64; ; ) References: <5152B357.3020500@atmel.com> In-Reply-To: <5152B357.3020500@atmel.com> MIME-Version: 1.0 Message-Id: <201303271902.00068.arnd@arndb.de> X-Provags-ID: V02:K0:rk792K/swKdDwX1SMTVFDxkFgxPW2qvjXlDFoVeLokC IzQ96pBXJ6Ng45JYrvVoxdbCJMNteZZPD9SNYeH5n0ZKH9yZLY TtS1cqhjhIAz5TE/bZeXnisF1YO2BI3bMs0fSc0yM0b5XGk6VE bP4C774wIZMr1fU5oiUl/VaUjaeX3OT2prQ992byzpvr9Uo03/ Dg2KyxMKZUNAdn8Be1s74VrDhH/GSe1bGjnXwlZ7Q9GJSpvFKa ZgL8EWom0gG+vLSaYONXenQUdvUWl8RXUNB61c1wDpka2f2MlV 52CBA0UMPD14+k2XsKLjzo33VbMRNaTW2RbYk4MUAN5hxc3FMx +AjoTSi3RW4O3ee4w58c= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130327_150443_448084_070080E8 X-CRM114-Status: GOOD ( 12.05 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.17.8 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Marc Zyngier , Linux Kernel list , Ludovic Desroches , Olof Johansson , Jean-Christophe PLAGNIOL-VILLARD , linux-arm-kernel X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On Wednesday 27 March 2013, Nicolas Ferre wrote: > ---------------------------------------------------------------- > Introduction of new Atmel Cortex-A5: SAMA5D3 family. > - Modify AT91 Kconfig to plit ARMv4/5 and ARMv7 arch > - Modify PMC driver (clocks) > - Core SAMA5 support > - Board file, DT files and defconfig Looks really good. Olof said he'd take over merging tomorrow, so I'll leave it for him. > ---------------------------------------------------------------- > Ludovic Desroches (6): > ARM: at91: change name template in AT91_SOC_START macro > ARM: at91: add AT91_SAM9_TIME entry to select at91sam926x_time.c compilation > ARM: at91: introduce the core type choice to split ARMv4/5 and ARMv7 arch > ARM: at91: introduce SAMA5 support > ARM: at91: dt: add device tree files for SAMA5D3 family > ARM: at91: add defconfig for SAMA5 There is one obvious change that would be nice to include here, can you add this on top (either Nicolas or Olof)? 8<--------- Subject: ARM: at91: make ATAGS support conditional on CONFIG_ATAGS We have the global CONFIG_ATAGS symbol that is used to determine whether ATAGS based boot is possible or not. Since we are splitting out the legacy boards from the main Kconfig on at91, we can use that symbol to easily hide the old options. Signed-off-by: Arnd Bergmann Acked-by: Nicolas Ferre diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 0280238..119a0a4 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -137,8 +137,9 @@ config SOC_AT91SAM9N12 Select this if you are using Atmel's AT91SAM9N12 SoC. # ---------------------------------------------------------- - +if ATAGS source arch/arm/mach-at91/Kconfig.non_dt +endif endif # SOC_SAM_V4_V5 comment "Generic Board Type"