From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans de Goede Date: Mon, 27 Oct 2014 09:48:31 +0100 Subject: [U-Boot] [PATCH 1/2] ARM: Add arch/arm/cpu/armv7/Kconfig with non-secure and virt options In-Reply-To: <20141027003559.GR25506@bill-the-cat> References: <1414175656-14491-1-git-send-email-hdegoede@redhat.com> <1414175656-14491-2-git-send-email-hdegoede@redhat.com> <20141027003559.GR25506@bill-the-cat> Message-ID: <544E06DF.3050504@redhat.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi, On 10/27/2014 01:35 AM, Tom Rini wrote: > On Fri, Oct 24, 2014 at 08:34:15PM +0200, Hans de Goede wrote: > >> Add arch/arm/cpu/armv7/Kconfig with non-secure and virt options, so that >> we can have CONFIG_ARMV7_SEC_BY_DEFAULT as a proper Kconfig option. >> >> Signed-off-by: Hans de Goede >> --- >> arch/arm/Kconfig | 2 ++ >> arch/arm/cpu/armv7/Kconfig | 20 ++++++++++++++++++++ >> include/configs/arndale.h | 2 -- >> include/configs/sun7i.h | 2 -- >> include/configs/vexpress_ca15_tc2.h | 2 -- > > The only problem I see is you aren't also updating the defconfigs for > the boards in question, which results in a behavior change which we > don't want. The new Kconfig options have "default y", and the boards where using those settings before. Or are you referring to the fact that CONFIG_ARMV7_NONSEC is getting set for arndale and vexpress_ca15_tc2 now too ? That is intentional ARMV7_VIRT depends on CONFIG_ARMV7_NONSEC. So far this has been somewhat unelegantly solved by writing every #ifdef CONFIG_ARMV7_NONSEC as: #if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT) So that setting CONFIG_ARMV7_VIRT automatically also includes all the NONSEC bits, note that after this patch we could simply these to just: #ifdef CONFIG_ARMV7_NONSEC Which would also more correctly reflect when the code should be enabled. Regards, Hans