diff options
| author | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2020-01-03 13:54:40 +0000 |
|---|---|---|
| committer | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2020-01-07 16:32:44 +0000 |
| commit | 03bebc647f9011fb6e619f6d1d3a2789123f0816 (patch) | |
| tree | 74922b52faefd3bd28a86be706908856b6b8daa6 | |
| parent | 4732b6cdb7dc940abb709562427c2393c2e11cea (diff) | |
| download | gem5-03bebc647f9011fb6e619f6d1d3a2789123f0816.tar.xz | |
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>
| -rw-r--r-- | .gitignore | 14 | ||||
| -rw-r--r-- | system/arm/bootloader/arm/Makefile (renamed from system/arm/simple_bootloader/Makefile) | 0 | ||||
| -rw-r--r-- | system/arm/bootloader/arm/simple.S (renamed from system/arm/simple_bootloader/simple.S) | 0 | ||||
| -rw-r--r-- | system/arm/bootloader/arm64/boot.S (renamed from system/arm/aarch64_bootloader/boot.S) | 0 | ||||
| -rw-r--r-- | system/arm/bootloader/arm64/makefile (renamed from system/arm/aarch64_bootloader/makefile) | 0 | ||||
| -rwxr-xr-x | util/gen_arm_fs_files.py | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore index e4fefbe71..a55c03e3d 100644 --- a/.gitignore +++ b/.gitignore @@ -21,10 +21,10 @@ m5out /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 index e9fc4abb2..e9fc4abb2 100644 --- a/system/arm/simple_bootloader/Makefile +++ b/system/arm/bootloader/arm/Makefile diff --git a/system/arm/simple_bootloader/simple.S b/system/arm/bootloader/arm/simple.S index 4870eccf8..4870eccf8 100644 --- a/system/arm/simple_bootloader/simple.S +++ b/system/arm/bootloader/arm/simple.S diff --git a/system/arm/aarch64_bootloader/boot.S b/system/arm/bootloader/arm64/boot.S index 38090c8f2..38090c8f2 100644 --- a/system/arm/aarch64_bootloader/boot.S +++ b/system/arm/bootloader/arm64/boot.S diff --git a/system/arm/aarch64_bootloader/makefile b/system/arm/bootloader/arm64/makefile index 252db9906..252db9906 100644 --- a/system/arm/aarch64_bootloader/makefile +++ b/system/arm/bootloader/arm64/makefile diff --git a/util/gen_arm_fs_files.py b/util/gen_arm_fs_files.py index 3cf0dc0f2..ba9044844 100755 --- a/util/gen_arm_fs_files.py +++ b/util/gen_arm_fs_files.py @@ -246,7 +246,7 @@ run_cmd("copy DTBs", ["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 @@ run_cmd("copy arm64 bootloader", ["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"]) |