[Sound-open-firmware] [PATCH] makefile: link reset vector to main image if there is no boot ldr
Reset vector linked to main image is not executed if there is boot ldr in the path. Signed-off-by: Marcin Maka <marcin.maka@linux.intel.com> --- src/arch/xtensa/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/arch/xtensa/Makefile.am b/src/arch/xtensa/Makefile.am index 44883ad..d966691 100644 --- a/src/arch/xtensa/Makefile.am +++ b/src/arch/xtensa/Makefile.am @@ -61,7 +61,6 @@ sof_LDADD = \ ../../audio/libaudio.a \ ../../drivers/libdrivers.a \ ../../math/libsof_math.a \ - libreset.a \ xtos/libxtos.a \ xtos/libxlevel2.a \ xtos/libxlevel3.a \ @@ -70,6 +69,11 @@ sof_LDADD = \ hal/libhal.a \ -lgcc +if !BUILD_BOOTLOADER +sof_LDADD += \ + libreset.a +endif + sof_LDFLAGS = \ $(ARCH_LDFLAGS) -Wl,-Map=sof-$(FW_NAME).map \ -T ../../platform/$(PLATFORM)/$(PLATFORM_LDSCRIPT) -- 2.7.4
On Tue, 2018-05-29 at 10:58 +0200, Marcin Maka wrote:
Reset vector linked to main image is not executed if there is boot ldr in the path.
Signed-off-by: Marcin Maka <marcin.maka@linux.intel.com> --- src/arch/xtensa/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/arch/xtensa/Makefile.am b/src/arch/xtensa/Makefile.am index 44883ad..d966691 100644 --- a/src/arch/xtensa/Makefile.am +++ b/src/arch/xtensa/Makefile.am @@ -61,7 +61,6 @@ sof_LDADD = \ ../../audio/libaudio.a \ ../../drivers/libdrivers.a \ ../../math/libsof_math.a \ - libreset.a \ xtos/libxtos.a \ xtos/libxlevel2.a \ xtos/libxlevel3.a \ @@ -70,6 +69,11 @@ sof_LDADD = \ hal/libhal.a \ -lgcc
+if !BUILD_BOOTLOADER +sof_LDADD += \ + libreset.a +endif + sof_LDFLAGS = \ $(ARCH_LDFLAGS) -Wl,-Map=sof-$(FW_NAME).map \ -T ../../platform/$(PLATFORM)/$(PLATFORM_LDSCRIPT)
Applied. Thanks Liam
participants (2)
-
Liam Girdwood -
Marcin Maka