system-arm: Rename ARM bootloader directories
The patch is renaming:
system/arm/simple_bootloader -> system/arm/bootloader/arm
system/arm/aarch64_bootloader -> system/arm/bootloader/arm64
Change-Id: Ia7380be3914e277624060f1c96361a0f16dbea9d
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/+/23948
Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>
diff --git a/.gitignore b/.gitignore
index e4fefbe..a55c03e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,10 +21,10 @@
/util/term/m5term
/system/arm/dt/*.dtb
/system/arm/dt/.gen
-/system/arm/simple_bootloader/*.o
-/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_v2.arm64
+/system/arm/bootloader/arm/*.o
+/system/arm/bootloader/arm/boot.arm
+/system/arm/bootloader/arm/boot_emm.arm
+/system/arm/bootloader/arm64/*.o
+/system/arm/bootloader/arm64/boot.arm64
+/system/arm/bootloader/arm64/boot_emm.arm64
+/system/arm/bootloader/arm64/boot_v2.arm64
diff --git a/system/arm/simple_bootloader/Makefile b/system/arm/bootloader/arm/Makefile
similarity index 100%
rename from system/arm/simple_bootloader/Makefile
rename to system/arm/bootloader/arm/Makefile
diff --git a/system/arm/simple_bootloader/simple.S b/system/arm/bootloader/arm/simple.S
similarity index 100%
rename from system/arm/simple_bootloader/simple.S
rename to system/arm/bootloader/arm/simple.S
diff --git a/system/arm/aarch64_bootloader/boot.S b/system/arm/bootloader/arm64/boot.S
similarity index 100%
rename from system/arm/aarch64_bootloader/boot.S
rename to system/arm/bootloader/arm64/boot.S
diff --git a/system/arm/aarch64_bootloader/makefile b/system/arm/bootloader/arm64/makefile
similarity index 100%
rename from system/arm/aarch64_bootloader/makefile
rename to system/arm/bootloader/arm64/makefile
diff --git a/util/gen_arm_fs_files.py b/util/gen_arm_fs_files.py
index 3cf0dc0..ba90448 100755
--- a/util/gen_arm_fs_files.py
+++ b/util/gen_arm_fs_files.py
@@ -246,7 +246,7 @@
["cp"] + glob(dt_dir + "/*dtb") + [binaries_dir])
# Build bootloaders arm64
-bootloader_arm64_dir = gem5_dir + "/system/arm/aarch64_bootloader"
+bootloader_arm64_dir = gem5_dir + "/system/arm/bootloader/arm64"
run_cmd("compile arm64 bootloader",
bootloader_arm64_dir,
["make"])
@@ -255,7 +255,7 @@
["cp", "boot.arm64", "boot_emm.arm64", "boot_v2.arm64", binaries_dir])
# Build bootloaders arm
-bootloader_arm_dir = gem5_dir + "/system/arm/simple_bootloader"
+bootloader_arm_dir = gem5_dir + "/system/arm/bootloader/arm"
run_cmd("compile arm bootloader",
bootloader_arm_dir,
["make"])
