diff options
| author | Geoff Levand <geoff@infradead.org> | 2014-06-12 01:12:56 +0100 |
|---|---|---|
| committer | Mark Rutland <mark.rutland@arm.com> | 2014-06-18 18:11:53 +0100 |
| commit | 877b6eea207b0d89a236abc152a301cdb5f0d358 (patch) | |
| tree | a1c7d2924d3441a8fdc2bb446c27735a243a75ea | |
| parent | 5ba492c144223079f475090ff4f8a72e9e5e44e7 (diff) | |
| download | boot-wrapper-aarch64-877b6eea207b0d89a236abc152a301cdb5f0d358.tar.gz | |
configure: Fixes for --enable-xxx
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 <geoff@infradead.org>
[Mark: fit with exiting USE_FEATURE naming scheme, fix whitespace]
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index b60f869..929da13 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]) + [USE_PSCI=$enableval]) AM_CONDITIONAL([PSCI], [test "x$USE_PSCI" = "xyes"]) +AS_IF([test "x$USE_PSCI" = "xyes"], [], [USE_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]) + [USE_GICV3=$enableval]) AM_CONDITIONAL([GICV3], [test "x$USE_GICV3" = "xyes"]) +AS_IF([test "x$USE_GICV3" = "xyes"], [], [USE_GICV3=no]) # Ensure that we have all the needed programs AC_PROG_CC |