From 7b1cf2dfac6642a33a17bf86008668ffbedceb76 Mon Sep 17 00:00:00 2001
From: Masayuki Ishikawa <masayuki.ishikawa@gmail.com>
Date: Mon, 24 Jan 2022 16:25:41 +0900
Subject: [PATCH] arch: arm: Fix make export for armv7-a SoCs

Summary:
- I noticed that make export does not work with swama5d4-ek:knsh
- This commit fixes this issue.
- NOTE: apps/Makefile also needs to be updated.

Impact:
- CONFIG_BUILD_KERNEL=y only

Testing:
- Build (make and make export) with sama5d4-ek:knsh

Signed-off-by: Masayuki Ishikawa <Masayuki.Ishikawa@jp.sony.com>
---
 arch/arm/src/a1x/Make.defs    | 3 +++
 arch/arm/src/am335x/Make.defs | 3 +++
 arch/arm/src/armv7-a/crt0.c   | 2 ++
 arch/arm/src/imx6/Make.defs   | 3 +++
 arch/arm/src/sama5/Make.defs  | 3 +++
 5 files changed, 14 insertions(+)

diff --git a/arch/arm/src/a1x/Make.defs b/arch/arm/src/a1x/Make.defs
index a547ebecdc2..6db3eba59c9 100644
--- a/arch/arm/src/a1x/Make.defs
+++ b/arch/arm/src/a1x/Make.defs
@@ -24,6 +24,9 @@
 HEAD_ASRC  = arm_vectortab.S
 
 ifeq ($(CONFIG_BUILD_KERNEL),y)
+crt0$(OBJEXT): crt0.c
+	$(CC) $(CFLAGS) -c armv7-a$(DELIM)crt0.c -o crt0$(OBJEXT)
+
 STARTUP_OBJS = crt0$(OBJEXT)
 endif
 
diff --git a/arch/arm/src/am335x/Make.defs b/arch/arm/src/am335x/Make.defs
index df6f7fec44c..838cda9e682 100644
--- a/arch/arm/src/am335x/Make.defs
+++ b/arch/arm/src/am335x/Make.defs
@@ -24,6 +24,9 @@
 HEAD_ASRC  = arm_vectortab.S
 
 ifeq ($(CONFIG_BUILD_KERNEL),y)
+crt0$(OBJEXT): crt0.c
+	$(CC) $(CFLAGS) -c armv7-a$(DELIM)crt0.c -o crt0$(OBJEXT)
+
 STARTUP_OBJS = crt0$(OBJEXT)
 endif
 
diff --git a/arch/arm/src/armv7-a/crt0.c b/arch/arm/src/armv7-a/crt0.c
index a372868857d..35fe970e0ea 100644
--- a/arch/arm/src/armv7-a/crt0.c
+++ b/arch/arm/src/armv7-a/crt0.c
@@ -29,6 +29,8 @@
 
 #include <nuttx/addrenv.h>
 
+#include "svcall.h"
+
 #ifdef CONFIG_BUILD_KERNEL
 
 /****************************************************************************
diff --git a/arch/arm/src/imx6/Make.defs b/arch/arm/src/imx6/Make.defs
index bc9884e1030..aa7059cce6e 100644
--- a/arch/arm/src/imx6/Make.defs
+++ b/arch/arm/src/imx6/Make.defs
@@ -24,6 +24,9 @@
 HEAD_ASRC  = arm_vectortab.S
 
 ifeq ($(CONFIG_BUILD_KERNEL),y)
+crt0$(OBJEXT): crt0.c
+	$(CC) $(CFLAGS) -c armv7-a$(DELIM)crt0.c -o crt0$(OBJEXT)
+
 STARTUP_OBJS = crt0$(OBJEXT)
 endif
 
diff --git a/arch/arm/src/sama5/Make.defs b/arch/arm/src/sama5/Make.defs
index 99c58d348ea..6685a9817f2 100644
--- a/arch/arm/src/sama5/Make.defs
+++ b/arch/arm/src/sama5/Make.defs
@@ -24,6 +24,9 @@
 HEAD_ASRC  = arm_vectortab.S
 
 ifeq ($(CONFIG_BUILD_KERNEL),y)
+crt0$(OBJEXT): crt0.c
+	$(CC) $(CFLAGS) -c armv7-a$(DELIM)crt0.c -o crt0$(OBJEXT)
+
 STARTUP_OBJS = crt0$(OBJEXT)
 endif