From patchwork Thu Jun 12 00:12:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Levand X-Patchwork-Id: 4338871 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 060A19F314 for ; Thu, 12 Jun 2014 00:15:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 39330201D5 for ; Thu, 12 Jun 2014 00:15:37 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 65F4420320 for ; Thu, 12 Jun 2014 00:15:36 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wusdi-0008Sl-Nx; Thu, 12 Jun 2014 00:13:10 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WusdX-0008Qq-1U for linux-arm-kernel@bombadil.infradead.org; Thu, 12 Jun 2014 00:12:59 +0000 Received: from geoff by merlin.infradead.org with local (Exim 4.80.1 #2 (Red Hat Linux)) id 1WusdU-0007DI-Do; Thu, 12 Jun 2014 00:12:56 +0000 Message-Id: <8ad2293111bbd60ddecd071be34734c2b46415df.1402531738.git.geoff@infradead.org> In-Reply-To: References: From: Geoff Levand Patch-Date: Tue, 10 Jun 2014 17:53:09 -0700 Subject: [PATCH 2/2] configure: Fixes for --enable-xxx To: Catalin Marinas Date: Thu, 12 Jun 2014 00:12:56 +0000 Cc: linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY,URIBL_BLACK autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When the --enable-psci=no or --enable-gicv3=no form of configure option was passed our configure script was setting the option to yes. This changes the logic slightly to fix the problem. Signed-off-by: Geoff Levand --- configure.ac | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index b60f869..c61564b 100644 --- a/configure.ac +++ b/configure.ac @@ -41,12 +41,11 @@ AC_SUBST([KERNEL_IMAGE], [$KERN_IMAGE]) AC_SUBST([KERNEL_DTB], [$KERN_DTB]) # Allow a user to pass --enable-psci -USE_PSCI=no AC_ARG_ENABLE([psci], AS_HELP_STRING([--enable-psci], [enable the psci boot method]), - [USE_PSCI=yes], - [USE_PSCI=no]) -AM_CONDITIONAL([PSCI], [test "x$USE_PSCI" = "xyes"]) + [enable_psci=$enableval]) +AM_CONDITIONAL([PSCI], [test "x$enable_psci" = "xyes"]) +AS_IF([test "x$enable_psci" = "xyes"], [], [enable_psci=no]) # Allow a user to pass --with-cpu-ids C_CPU_IDS="0x0,0x1,0x2,0x3" @@ -69,12 +68,11 @@ AC_ARG_WITH([cmdline], AC_SUBST([CMDLINE], [$C_CMDLINE]) # Allow a user to pass --enable-gicv3 -USE_GICV3=no AC_ARG_ENABLE([gicv3], AS_HELP_STRING([--enable-gicv3], [enable GICv3 instead of GICv2]), - [USE_GICV3=yes], - [USE_GICV3=no]) -AM_CONDITIONAL([GICV3], [test "x$USE_GICV3" = "xyes"]) + [enable_gicv3=$enableval]) +AM_CONDITIONAL([GICV3], [test "x$enable_gicv3" = "xyes"]) +AS_IF([test "x$enable_gicv3" = "xyes"], [], [enable_gicv3=no]) # Ensure that we have all the needed programs AC_PROG_CC @@ -93,6 +91,7 @@ AC_CONFIG_FILES([Makefile]) AC_OUTPUT # Print the final config to the user. + echo "" echo " Boot wrapper configuration" echo " ==========================" @@ -101,7 +100,7 @@ echo " Linux kernel build dir: ${KERN_DIR}" echo " Device tree blob: ${KERN_DTB}" echo " Linux kernel command line: ${CMDLINE}" echo " Embedded initrd: ${FILESYSTEM:-NONE}" -echo " Use PSCI? ${USE_PSCI}" +echo " Use PSCI? $enable_psci" echo " CPU IDs: ${CPU_IDS}" -echo " Use GICv3? ${USE_GICV3}" +echo " Use GICv3? $enable_gicv3" echo ""