aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Gerlach2020-09-28 23:16:39 -0500
committerDave Gerlach2020-10-16 13:05:38 -0500
commitc11c788cf8066d47ce37b668fb0d607c52c3f272 (patch)
treeb9568d9c85f01e99ef1bd18e1eee260f1d9f05f5
parent09256d5c21e6281d224646c1d4163d4dd0925238 (diff)
downloadk3-image-gen-c11c788cf8066d47ce37b668fb0d607c52c3f272.tar.gz
k3-image-gen-c11c788cf8066d47ce37b668fb0d607c52c3f272.tar.xz
k3-image-gen-c11c788cf8066d47ce37b668fb0d607c52c3f272.zip
Makefile: Set LOADADDR in each SOC Makefile
Each SOC has its own Makefile and some SOCs may have a need for a different load address, so define the LOADADDR variable in the SOC specific Makefile. Signed-off-by: Dave Gerlach <d-gerlach@ti.com> Reviewed-by: Suman Anna <s-anna@ti.com>
-rw-r--r--Makefile6
-rw-r--r--soc/am65x/Makefile2
-rw-r--r--soc/am65x_sr2/Makefile2
-rw-r--r--soc/j7200/Makefile1
-rw-r--r--soc/j721e/Makefile2
5 files changed, 10 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 61e52e4..d827e6a 100644
--- a/Makefile
+++ b/Makefile
@@ -146,7 +146,7 @@ $(SYSFW_HS_INNER_CERT_PATH):
146ifdef HS 146ifdef HS
147$(SYSFW_HS_CERTS_PATH): $(SYSFW_HS_INNER_CERT_PATH) 147$(SYSFW_HS_CERTS_PATH): $(SYSFW_HS_INNER_CERT_PATH)
148 @echo "Signing the SYSFW inner certificate with $(KEY) key..."; 148 @echo "Signing the SYSFW inner certificate with $(KEY) key...";
149 ./gen_x509_cert.sh -d -c m3 -b $< -o $@ -l 0x40000 -k $(KEY); 149 ./gen_x509_cert.sh -d -c m3 -b $< -o $@ -l $(LOADADDR) -k $(KEY);
150 150
151$(soc_objroot)/sysfw.bin: $(SYSFW_HS_CERTS_PATH) $(SYSFW_HS_PATH) 151$(soc_objroot)/sysfw.bin: $(SYSFW_HS_CERTS_PATH) $(SYSFW_HS_PATH)
152 cat $^ > $@ 152 cat $^ > $@
@@ -154,10 +154,10 @@ else
154$(soc_objroot)/sysfw.bin: $(SYSFW_PATH) 154$(soc_objroot)/sysfw.bin: $(SYSFW_PATH)
155 @if [ -n "$(KEY)" ]; then \ 155 @if [ -n "$(KEY)" ]; then \
156 echo "Signing the SYSFW release image with $(KEY) key..."; \ 156 echo "Signing the SYSFW release image with $(KEY) key..."; \
157 ./gen_x509_cert.sh -c m3 -b $< -o $@ -l 0x40000 -k $(KEY); \ 157 ./gen_x509_cert.sh -c m3 -b $< -o $@ -l $(LOADADDR) -k $(KEY); \
158 else \ 158 else \
159 echo "Signing the SYSFW release image with random key..."; \ 159 echo "Signing the SYSFW release image with random key..."; \
160 ./gen_x509_cert.sh -c m3 -b $< -o $@ -l 0x40000; \ 160 ./gen_x509_cert.sh -c m3 -b $< -o $@ -l $(LOADADDR); \
161 fi 161 fi
162endif 162endif
163 163
diff --git a/soc/am65x/Makefile b/soc/am65x/Makefile
index 5be7f90..8f091cd 100644
--- a/soc/am65x/Makefile
+++ b/soc/am65x/Makefile
@@ -30,5 +30,7 @@
30# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 30# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31# 31#
32 32
33LOADADDR ?= 0x40000
34
33.PHONY: all 35.PHONY: all
34all: _objtree_build $(ITB) sysfw.itb 36all: _objtree_build $(ITB) sysfw.itb
diff --git a/soc/am65x_sr2/Makefile b/soc/am65x_sr2/Makefile
index 5be7f90..8f091cd 100644
--- a/soc/am65x_sr2/Makefile
+++ b/soc/am65x_sr2/Makefile
@@ -30,5 +30,7 @@
30# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 30# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31# 31#
32 32
33LOADADDR ?= 0x40000
34
33.PHONY: all 35.PHONY: all
34all: _objtree_build $(ITB) sysfw.itb 36all: _objtree_build $(ITB) sysfw.itb
diff --git a/soc/j7200/Makefile b/soc/j7200/Makefile
index bdbc50f..8a1005a 100644
--- a/soc/j7200/Makefile
+++ b/soc/j7200/Makefile
@@ -32,6 +32,7 @@
32 32
33SBL_LOADADDDR ?= 0x41c00000 33SBL_LOADADDDR ?= 0x41c00000
34COMBINED_BRDCFG_LOADADDR ?= 0x7f000 34COMBINED_BRDCFG_LOADADDR ?= 0x7f000
35LOADADDR ?= 0x40000
35 36
36.PHONY: all 37.PHONY: all
37ifeq (,$(SBL)) 38ifeq (,$(SBL))
diff --git a/soc/j721e/Makefile b/soc/j721e/Makefile
index 5be7f90..8f091cd 100644
--- a/soc/j721e/Makefile
+++ b/soc/j721e/Makefile
@@ -30,5 +30,7 @@
30# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 30# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31# 31#
32 32
33LOADADDR ?= 0x40000
34
33.PHONY: all 35.PHONY: all
34all: _objtree_build $(ITB) sysfw.itb 36all: _objtree_build $(ITB) sysfw.itb