aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2015-05-07 16:59:31 -0700
committerPatrick Georgi <pgeorgi@google.com>2015-05-19 20:33:06 +0200
commit59e7b42af7984ad87638b2b639e9022d6483ed3a (patch)
tree90204812eaca7189de7a2dde080e19ba4ac4664d /src
parent404df444271b998948f6ef40f518cbb2fa27c493 (diff)
downloadcoreboot-59e7b42af7984ad87638b2b639e9022d6483ed3a.tar.gz
coreboot-59e7b42af7984ad87638b2b639e9022d6483ed3a.tar.xz
coreboot-59e7b42af7984ad87638b2b639e9022d6483ed3a.zip
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 <pgeorgi@chromium.org> Original-Commit-Id: 5067e47bc03f04ad2dba044f022716e0fc62bb9e Original-Change-Id: I1b2038acc0d054716a3c580ce97ea8e9a45abfa2 Original-Signed-off-by: Julius Werner <jwerner@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/270783 Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/10241 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src')
-rw-r--r--src/arch/arm64/Makefile.inc14
-rw-r--r--src/console/Makefile.inc6
-rw-r--r--src/soc/nvidia/tegra132/Makefile.inc16
3 files changed, 18 insertions, 18 deletions
diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc
index 8787d424b..92bb058f8 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 cae8f605b..60760a04c 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 44976d17b..8e0f6db17 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