diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | src/dev/arm/VExpressFastmodel.py | 2 | ||||
| -rw-r--r-- | system/arm/aarch64_bootloader/makefile | 16 | ||||
| -rw-r--r-- | system/arm/simple_bootloader/Makefile | 4 | ||||
| -rwxr-xr-x | util/gen_arm_fs_files.py | 2 |
5 files changed, 17 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore index 9d23e665a..e4fefbe71 100644 --- 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 8a6fefceb..f43af3107 100644 --- 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 079e9b5ac..252db9906 100644 --- 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 17b35ab19..e9fc4abb2 100644 --- 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 45c36ee2e..3cf0dc0f2 100755 --- 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" |