diff options
| -rw-r--r-- | src/arch/armv7/Kconfig | 6 | ||||
| -rw-r--r-- | src/arch/armv7/Makefile.inc | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/arch/armv7/Kconfig b/src/arch/armv7/Kconfig index a7f5b23e8e..e272474604 100644 --- a/src/arch/armv7/Kconfig +++ b/src/arch/armv7/Kconfig @@ -11,6 +11,12 @@ config ARCH_RAMSTAGE_ARMV7 bool default n +# If a custom bootblock is necessary, this option should be "select"-ed by +# the thing that needs it, probably the CPU. +config ARM_BOOTBLOCK_CUSTOM + bool + default n + config CPU_HAS_BOOTBLOCK_INIT bool default n diff --git a/src/arch/armv7/Makefile.inc b/src/arch/armv7/Makefile.inc index a18398a58c..2022f2078b 100644 --- a/src/arch/armv7/Makefile.inc +++ b/src/arch/armv7/Makefile.inc @@ -51,11 +51,12 @@ endif # CONFIG_ARCH_ARMV7 ifeq ($(CONFIG_ARCH_BOOTBLOCK_ARMV7),y) -bootblock-y += id.S +ifneq ($(CONFIG_ARM_BOOTBLOCK_CUSTOM),y) bootblock-y += bootblock.S - +bootblock-$(CONFIG_BOOTBLOCK_SIMPLE) += bootblock_simple.c +endif +bootblock-y += id.S $(obj)/arch/arm/id.bootblock.o: $(obj)/build.h -bootblock-y += $(call strip_quotes,$(CONFIG_BOOTBLOCK_SOURCE)) bootblock-y += stages.c bootblock-y += cache.c |