Allow the passing of CPUIDs in the configure script

Add the --with-cpu-ids switch to the configure script to allow the
user to manually set the CPU IDs that are passed to PSCI.

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 b754f736cafbf1916652be23d293fb0d85277d87..763eb58f63ff3af12ffc54d2a80131189129c282 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,6 @@ SYSREGS_BASE  := 0x1c010000
 GIC_DIST_BASE  := 0x2c001000
 GIC_CPU_BASE   := 0x2c002000
 CNTFRQ         := 0x01800000   # 24Mhz
-CPU_IDS                ?= 0x0,0x1,0x2,0x3
 
 DEFINES                = -DCNTFRQ=$(CNTFRQ)
 DEFINES                += -DCPU_IDS=$(CPU_IDS)

diff --git a/configure.ac b/configure.ac
index 7a6aaf6a0f5a31a220672cc30681aa3f603d7704..70718ae03b696418e02c1978255a269c673c7d25 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,12 @@ AC_ARG_ENABLE([psci],
        [USE_PSCI=no])
 AM_CONDITIONAL([PSCI], [test "x$USE_PSCI" = "xyes"])
 
+# Allow a user to pass --with-cpu-ids
+C_CPU_IDS="0x0,0x1,0x2,0x3"
+AC_ARG_WITH(cpu-ids,
+       AS_HELP_STRING([--with-cpu-ids], [Specify a comma seperated list of CPU IDs]),
+       [C_CPU_IDS="$withval"])
+AC_SUBST([CPU_IDS], [$C_CPU_IDS])
 
 # Allow a user to pass --with-initrd
 AC_ARG_WITH([initrd],
@@ -82,4 +88,5 @@ echo "  Linux kernel build dir:            ${KERN_DIR}"
 echo "  Linux kernel command line:         ${CMDLINE}"
 echo "  Embedded initrd:                   ${FILESYSTEM:-NONE}"
 echo "  Use PSCI?                          ${USE_PSCI}"
+echo "  CPU IDs:                           ${CPU_IDS}"
 echo ""