misc: Reflect changes of arm bootloader name

With https://gem5-review.googlesource.com/c/public/gem5/+/22687 the
VExpress_GEM5_Base platform is changing the required bootloader name
by removing the _emm suffix.
While this had been changed in the prebuilt binaries in gem5.org, it
hadn't in the bootloader makefiles or in other utility functions.

The patch is not completely removing the _emm bootloaders since those
are still used by VExpress_EMM and VExpress_EMM64 platforms.

Change-Id: Iea3148eab313ab06cf2e74660e11708e1a22ce5f
Reviewed-by: Ciro Santilli <ciro.santilli@arm.com>
Reviewed-by: Adrian Herrera <adrian.herrera@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/23947
Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>

diff --git a/.gitignore b/.gitignore
index 9d23e665aa6a963da58672fecbc20464e8e4de93..e4fefbe714e70c10b34223a5e9445fb68fc8af4b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -25,5 +25,6 @@ m5out
 /system/arm/simple_bootloader/boot.arm
 /system/arm/simple_bootloader/boot_emm.arm
 /system/arm/aarch64_bootloader/*.o
+/system/arm/aarch64_bootloader/boot.arm64
 /system/arm/aarch64_bootloader/boot_emm.arm64
-/system/arm/aarch64_bootloader/boot_emm_v2.arm64
+/system/arm/aarch64_bootloader/boot_v2.arm64

diff --git a/src/dev/arm/VExpressFastmodel.py b/src/dev/arm/VExpressFastmodel.py
index 8a6fefceb6617307a93b65167e4f1f0c83f4212a..f43af310777c09f9a728a5e1ebe899b39e970877 100644 (file)
--- a/src/dev/arm/VExpressFastmodel.py
+++ b/src/dev/arm/VExpressFastmodel.py
@@ -51,4 +51,4 @@ class VExpressFastmodel(VExpress_GEM5_Base):
     def setupBootLoader(self, cur_sys, loc):
         super(VExpressFastmodel,self).setupBootLoader(cur_sys, loc)
         # Override the boot_loader setting
-        cur_sys.boot_loader = [ loc('boot_emm_v2.arm64') ]
+        cur_sys.boot_loader = [ loc('boot_v2.arm64') ]

diff --git a/system/arm/aarch64_bootloader/makefile b/system/arm/aarch64_bootloader/makefile
index 079e9b5ac275b12f0fe13827333bb15b478fce29..252db99060020344dfc4026b59998d25f480c363 100644 (file)
--- a/system/arm/aarch64_bootloader/makefile
+++ b/system/arm/aarch64_bootloader/makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 ARM Limited
+# Copyright (c) 2019-2020 ARM Limited
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -41,13 +41,16 @@ LDFLAGS = -N -Ttext 0x00000010 -non_shared -static
 
 .PHONY: all clean install mkdir
 
-all: mkdir $(BUILDDIR)/boot_emm.arm64 $(BUILDDIR)/boot_emm_v2.arm64
+all: mkdir $(BUILDDIR)/boot_emm.arm64 \
+       $(BUILDDIR)/boot.arm64  \
+       $(BUILDDIR)/boot_v2.arm64
 
 #v1 has a GIC V2
 $(BUILDDIR)/boot_emm.o: CPPFLAGS += -UGICV3 -DGIC_CPU_BASE=0x2c002000
+$(BUILDDIR)/boot.o: CPPFLAGS += -UGICV3 -DGIC_CPU_BASE=0x2c002000
 
 #V2 has a GIC V3
-$(BUILDDIR)/boot_emm_v2.o: CPPFLAGS += -DGICV3 -DGIC_REDIST_BASE=0x2c010000
+$(BUILDDIR)/boot_v2.o: CPPFLAGS += -DGICV3 -DGIC_REDIST_BASE=0x2c010000
 
 $(BUILDDIR)/%.arm64: $(BUILDDIR)/%.o
        $(LD) -o $@ $< $(LDFLAGS)
@@ -57,11 +60,14 @@ $(BUILDDIR)/%.o: boot.S
 
 install:
        mkdir -p $(DESTDIR)
-       install -m 644 $(BUILDDIR)/boot_emm.arm64 $(BUILDDIR)/boot_emm_v2.arm64 $(DESTDIR)/.
+       install -m 644 $(BUILDDIR)/boot_emm.arm64 \
+               $(BUILDDIR)/boot.arm64 \
+               $(BUILDDIR)/boot_v2.arm64 \
+               $(DESTDIR)/.
 
 mkdir:
        mkdir -p $(BUILDDIR)
 
 clean:
        rm -f $(BUILDDIR)/*.o
-       rm -f $(BUILDDIR)/boot_emm.arm64 $(BUILDDIR)/boot_emm_v2.arm64
+       rm -f $(BUILDDIR)/boot_emm.arm64 $(BUILDDIR)/boot.arm64 $(BUILDDIR)/boot_v2.arm64

diff --git a/system/arm/simple_bootloader/Makefile b/system/arm/simple_bootloader/Makefile
index 17b35ab19ee93db9760c832aab548f62db64e529..e9fc4abb2d27e93c3759723ff2c0cc1806fe2683 100644 (file)
--- a/system/arm/simple_bootloader/Makefile
+++ b/system/arm/simple_bootloader/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 ARM Limited
+# Copyright (c) 2011, 2020 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -52,7 +52,7 @@ boot.o: simple.S
        $(CC) -mfloat-abi=softfp -march=armv7-a -fno-builtin -nostdinc -o $@ -c $<
 
 boot.arm: boot.o
-       $(LD) -o $@ -N -Ttext 0x80000000 $< -non_shared -static
+       $(LD) -o $@ -N -Ttext 0x00000010 $< -non_shared -static
 boot_emm.arm: boot.o
        $(LD) -o $@ -N -Ttext 0x00000010 $< -non_shared -static
 

diff --git a/util/gen_arm_fs_files.py b/util/gen_arm_fs_files.py
index 45c36ee2ed81d88e0b36e8921bda5afb317c05f4..3cf0dc0f2c1cc5abe07c66386c2fc0ee28cc64d4 100755 (executable)
--- a/util/gen_arm_fs_files.py
+++ b/util/gen_arm_fs_files.py
@@ -252,7 +252,7 @@ run_cmd("compile arm64 bootloader",
     ["make"])
 run_cmd("copy arm64 bootloader",
     bootloader_arm64_dir,
-    ["cp", "boot_emm.arm64", binaries_dir])
+    ["cp", "boot.arm64", "boot_emm.arm64", "boot_v2.arm64", binaries_dir])
 
 # Build bootloaders arm
 bootloader_arm_dir = gem5_dir + "/system/arm/simple_bootloader"