summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiacomo Travaglini <giacomo.travaglini@arm.com>2020-01-03 14:01:21 +0000
committerGiacomo Travaglini <giacomo.travaglini@arm.com>2020-01-07 16:32:44 +0000
commit24cf3fd4bd67cf757ff60c06d413ecaf24fae5c4 (patch)
tree3e5b1415b2888e5aac39bac4981f6f219091c4ad
parent03bebc647f9011fb6e619f6d1d3a2789123f0816 (diff)
downloadgem5-24cf3fd4bd67cf757ff60c06d413ecaf24fae5c4.tar.xz
system-arm: Rename ARM bootloader source
The AArch32 assembly source has been renamed from simple.S to boot.S, and the Makefile has been renamed to makefile (lowercase) to match the AArch64 convention Change-Id: Ia4581fe0223c156460edcc558622b5d7962258dc Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com> Reviewed-by: Adrian Herrera <adrian.herrera@arm.com> Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/23949 Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com> Tested-by: kokoro <noreply+kokoro@google.com>
-rw-r--r--system/arm/bootloader/arm/boot.S (renamed from system/arm/bootloader/arm/simple.S)0
-rw-r--r--system/arm/bootloader/arm/makefile (renamed from system/arm/bootloader/arm/Makefile)4
2 files changed, 2 insertions, 2 deletions
diff --git a/system/arm/bootloader/arm/simple.S b/system/arm/bootloader/arm/boot.S
index 4870eccf8..4870eccf8 100644
--- a/system/arm/bootloader/arm/simple.S
+++ b/system/arm/bootloader/arm/boot.S
diff --git a/system/arm/bootloader/arm/Makefile b/system/arm/bootloader/arm/makefile
index e9fc4abb2..b6e4f3246 100644
--- a/system/arm/bootloader/arm/Makefile
+++ b/system/arm/bootloader/arm/makefile
@@ -48,7 +48,7 @@ LD=$(CROSS_COMPILE)ld
all: boot.arm boot_emm.arm
-boot.o: simple.S
+boot.o: boot.S
$(CC) -mfloat-abi=softfp -march=armv7-a -fno-builtin -nostdinc -o $@ -c $<
boot.arm: boot.o
@@ -57,7 +57,7 @@ boot_emm.arm: boot.o
$(LD) -o $@ -N -Ttext 0x00000010 $< -non_shared -static
-clean:
+clean:
$(RM) -f *.o boot.arm boot_emm.arm
.PHONY: all clean