diff options
| author | Matthew Leach <Matthew.Leach@arm.com> | 2014-01-23 17:29:27 +0000 |
|---|---|---|
| committer | Mark Rutland <mark.rutland@arm.com> | 2014-03-12 11:15:58 +0000 |
| commit | 7613f81fc03cd91fe90977165e48875ab98c2e68 (patch) | |
| tree | dcab936efc03cb07e6156870838bfe3cb11fa51c | |
| parent | bae4ae6a834cd15bf50f0ddc9a7331d8b0ac7168 (diff) | |
| download | boot-wrapper-aarch64-7613f81fc03cd91fe90977165e48875ab98c2e68.tar.gz | |
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>
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 10 |
2 files changed, 16 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index fd66c8c..b754f73 100644 --- 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 fdb5e17..a94bfac 100644 --- 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 "" |