derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

system-arm: Rename ARM bootloader directories

Browse Source 
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>
This commit is contained in:
Giacomo Travaglini
2020-01-03 13:54:40 +00:00
parent 4732b6cdb7
commit 03bebc647f
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.gitignore vendored
View File

@@ -21,10 +21,10 @@ m5out
/util/term/m5term /util/term/m5term
/system/arm/dt/*.dtb /system/arm/dt/*.dtb
/system/arm/dt/.gen /system/arm/dt/.gen
/system/arm/simple_bootloader/*.o /system/arm/bootloader/arm/*.o
/system/arm/simple_bootloader/boot.arm /system/arm/bootloader/arm/boot.arm
/system/arm/simple_bootloader/boot_emm.arm /system/arm/bootloader/arm/boot_emm.arm
/system/arm/aarch64_bootloader/*.o /system/arm/bootloader/arm64/*.o
/system/arm/aarch64_bootloader/boot.arm64 /system/arm/bootloader/arm64/boot.arm64
/system/arm/aarch64_bootloader/boot_emm.arm64 /system/arm/bootloader/arm64/boot_emm.arm64
/system/arm/aarch64_bootloader/boot_v2.arm64 /system/arm/bootloader/arm64/boot_v2.arm64

0
system/arm/simple_bootloader/Makefile → system/arm/bootloader/arm/Makefile
View File

0
system/arm/simple_bootloader/simple.S → system/arm/bootloader/arm/simple.S
View File

0
system/arm/aarch64_bootloader/boot.S → system/arm/bootloader/arm64/boot.S
View File

0
system/arm/aarch64_bootloader/makefile → system/arm/bootloader/arm64/makefile
View File

4
util/gen_arm_fs_files.py
View File

@@ -246,7 +246,7 @@ run_cmd("copy DTBs",
["cp"] + glob(dt_dir + "/*dtb") + [binaries_dir]) ["cp"] + glob(dt_dir + "/*dtb") + [binaries_dir])
# Build bootloaders arm64 # 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", run_cmd("compile arm64 bootloader",
bootloader_arm64_dir, bootloader_arm64_dir,
["make"]) ["make"])
@@ -255,7 +255,7 @@ run_cmd("copy arm64 bootloader",
["cp", "boot.arm64", "boot_emm.arm64", "boot_v2.arm64", binaries_dir]) ["cp", "boot.arm64", "boot_emm.arm64", "boot_v2.arm64", binaries_dir])
# Build bootloaders arm # 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", run_cmd("compile arm bootloader",
bootloader_arm_dir, bootloader_arm_dir,
["make"]) ["make"])