Add a PSCI configure option

The boot-wrapper can be build with or without support for
PSCI. Therefore add that as a configure option (which defaults to not
using PSCI) and set the appropriate options in the makefile.

Signed-off-by: Matthew Leach <matthew.leach@arm.com>
[Mark: fix indentation]
Signed-off-by: Mark Rutland <mark.rutland@arm.com>

diff --git a/Makefile.am b/Makefile.am
index fd66c8c710e97b034323fc2f148ac7f79f77a767..b754f736cafbf1916652be23d293fb0d85277d87 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,13 @@ DEFINES              += -DSYSREGS_BASE=$(SYSREGS_BASE)
 DEFINES                += -DUART_BASE=$(UART_BASE)
 
 BOOTLOADER     := boot.S
+
+if PSCI
 BOOTMETHOD     := psci.o
+else
+BOOTMETHOD     := spin.o
+endif
+
 MBOX_OFFSET    := 0xfff8
 KERNEL_OFFSET  := 0x80000
 LD_SCRIPT      := model.lds.S

diff --git a/configure.ac b/configure.ac
index fdb5e17c4150fa2ab0c9e07bd17d34916e88b923..a94bfac60cfb9252278cf2a375a6cc9caea9a660 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,15 @@ m4_foreach([checkfile], [CHECKFILES],
 AC_SUBST([KERNEL_IMAGE], [$KERN_DIR$KERN_IMAGE])
 AC_SUBST([KERNEL_DTB], [$KERN_DIR$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"])
+
+
 # Allow a user to pass --with-initrd
 AC_ARG_WITH([initrd],
        AS_HELP_STRING([--with-initrd], [embed an initrd in the kernel image]),
@@ -72,4 +81,5 @@ echo ""
 echo "  Linux kernel build dir:            ${KERN_DIR}"
 echo "  Linux kernel command line:         ${CMDLINE}"
 echo "  Embedded initrd:                   ${FILESYSTEM:-NONE}"
+echo "  Use PSCI?                          ${USE_PSCI}"
 echo ""