New patch to review for coreboot: 1cdf218 arm64: Reorganize payload entry code and related Kconfigs

[Patrick Georgi]

Patrick Georgi ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10241

-gerrit

commit 1cdf21857683e2723b4ed1dc41a17d8e67b3a227
Author: Julius Werner 
Date:   Thu May 7 16:59:31 2015 -0700

arm64: Reorganize payload entry code and related Kconfigs

Remove the secmon Kconfig guard from Makefiles that add to the secmon
    class since they are redundant (the class is simply not used when
    compiling without secmon) to improve readability/ease-of-use.

[pg: taken out of the patch linked below]

Change-Id: I2f0ad8a923ca32fcade748ac8ee50c23cf9bafb9
    Signed-off-by: Patrick Georgi 
    Original-Commit-Id: 5067e47bc03f04ad2dba044f022716e0fc62bb9e
    Original-Change-Id: I1b2038acc0d054716a3c580ce97ea8e9a45abfa2
    Original-Signed-off-by: Julius Werner 
    Original-Reviewed-on: https://chromium-review.googlesource.com/270783
    Original-Reviewed-by: Aaron Durbin 
---
 src/arch/arm64/Makefile.inc          | 14 +++++++-------
 src/console/Makefile.inc             |  6 +++---
 src/soc/nvidia/tegra132/Makefile.inc | 16 ++++++++--------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc
index 8787d42..92bb058 100644
--- a/src/arch/arm64/Makefile.inc
+++ b/src/arch/arm64/Makefile.inc
@@ -161,13 +161,13 @@ rmodules_arm64-y += ../../lib/memcpy.c
 rmodules_arm64-y += ../../lib/memmove.c
 rmodules_arm64-y += eabi_compat.c

-secmon-$(CONFIG_ARCH_USE_SECURE_MONITOR) += stage_entry.S
-secmon-$(CONFIG_ARCH_USE_SECURE_MONITOR) += cpu-stubs.c
-secmon-$(CONFIG_ARCH_USE_SECURE_MONITOR) += startup.c
-secmon-$(CONFIG_ARCH_USE_SECURE_MONITOR) += ../../lib/malloc.c
-secmon-$(CONFIG_ARCH_USE_SECURE_MONITOR) += ../../lib/memset.c
-secmon-$(CONFIG_ARCH_USE_SECURE_MONITOR) += ../../lib/memcmp.c
-secmon-$(CONFIG_ARCH_USE_SECURE_MONITOR) += ../../lib/memcpy.c
+secmon-y += stage_entry.S
+secmon-y += cpu-stubs.c
+secmon-y += startup.c
+secmon-y += ../../lib/malloc.c
+secmon-y += ../../lib/memset.c
+secmon-y += ../../lib/memcmp.c
+secmon-y += ../../lib/memcpy.c

ramstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c

diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc
index cae8f60..60760a0 100644
--- a/src/console/Makefile.inc
+++ b/src/console/Makefile.inc
@@ -21,6 +21,6 @@ bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += vtxprintf.c printk.c
 bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += init.c console.c
 bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += die.c

-secmon-$(CONFIG_ARCH_USE_SECURE_MONITOR) += vtxprintf.c printk.c
-secmon-$(CONFIG_ARCH_USE_SECURE_MONITOR) += init.c console.c
-secmon-$(CONFIG_ARCH_USE_SECURE_MONITOR) += die.c
+secmon-y += vtxprintf.c printk.c
+secmon-y += init.c console.c
+secmon-y += die.c
diff --git a/src/soc/nvidia/tegra132/Makefile.inc b/src/soc/nvidia/tegra132/Makefile.inc
index 44976d1..8e0f6db 100644
--- a/src/soc/nvidia/tegra132/Makefile.inc
+++ b/src/soc/nvidia/tegra132/Makefile.inc
@@ -98,14 +98,14 @@ ramstage-$(CONFIG_DRIVERS_UART) += uart.c
 ramstage-y += ../tegra/usb.c
 ramstage-$(CONFIG_ARCH_USE_SECURE_MONITOR) += secmon.c

-secmon-$(CONFIG_ARCH_USE_SECURE_MONITOR) += 32bit_reset.S
-secmon-$(CONFIG_ARCH_USE_SECURE_MONITOR) += cpu.c
-secmon-$(CONFIG_ARCH_USE_SECURE_MONITOR) += cpu_lib.S
-secmon-$(CONFIG_ARCH_USE_SECURE_MONITOR) += flow_ctrl.c
-secmon-$(CONFIG_ARCH_USE_SECURE_MONITOR) += power.c
-secmon-$(CONFIG_ARCH_USE_SECURE_MONITOR) += psci.c
-secmon-$(CONFIG_ARCH_USE_SECURE_MONITOR) += uart.c
-secmon-$(CONFIG_ARCH_USE_SECURE_MONITOR) += gic.c
+secmon-y += 32bit_reset.S
+secmon-y += cpu.c
+secmon-y += cpu_lib.S
+secmon-y += flow_ctrl.c
+secmon-y += power.c
+secmon-y += psci.c
+secmon-y += uart.c
+secmon-y += gic.c

modules_arm-y += monotonic_timer.c
 VBOOT_STUB_DEPS += $(obj)/soc/nvidia/tegra132/monotonic_timer.rmodules_arm.o