Skip to content

Commit 51c2c56

Browse files
felipebalbifelipebalbi
committed
Re-add aarch64 emulation
Signed-off-by: Felipe Balbi <felipe@balbi.sh>
1 parent ed62cab commit 51c2c56

File tree

17 files changed

+221
-185
lines changed

17 files changed

+221
-185
lines changed

‎Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ members = [
1515
"src/mainboard/starfive/visionfive1/*",
1616
"src/mainboard/starfive/visionfive2/*",
1717
"src/mainboard/sunxi/nezha/*",
18-
"src/mainboard/emulation/qemu-riscv/*",
18+
"src/mainboard/emulation/*/*",
1919

2020
"xtask",
2121
]

‎src.broken/mainboard/emulation/qemu-aarch64/Cargo.toml

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎src.broken/mainboard/emulation/qemu-aarch64/Makefile

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎src.broken/mainboard/emulation/qemu-aarch64/src/main.rs

Lines changed: 0 additions & 78 deletions
This file was deleted.

‎src.broken/mainboard/emulation/qemu-aarch64/src/romstage.rs

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎src.broken/mainboard/emulation/qemu-aarch64/fixed-dtfs.dts renamed to ‎src/mainboard/emulation/qemu-aarch64/board.dts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,43 +9,57 @@
99
board-name = "QEMU aarch64";
1010
category = "emulation";
1111
board-url = "http://wiki.qemu.org/Main_Page";
12+
1213
areas {
14+
#address-cells = <1>;
15+
#size-cells = <0>;
16+
1317
area@0 {
18+
reg = <0>;
1419
description = "Boot Blob";
1520
compatible = "ore-bootblob";
1621
size = <0x80000>; // 512KiB
1722
file = "$(BOOTBLOB)";
1823
};
24+
1925
area@1 {
26+
reg = <1>;
2027
description = "Fixed DTFS";
2128
compatible = "ore-dtfs";
2229
size = <0x80000>; // 512KiB
2330
file = "$(FIXED_DTFS)";
2431
};
32+
2533
area@2 {
34+
reg = <2>;
2635
description = "QEMU aarch64 virt dtb";
2736
compatible = "ore-dtfs";
2837
size = <0x100000>; // 1MiB
2938
/* file = "$(TARGET_DIR)/virt.dtb"; */
3039
};
40+
3141
area@3 {
42+
reg = <3>;
3243
description = "RomPayload";
3344
compatible = "ore-rompayload";
3445
size = <0x2000000>; // 32MiB
3546
/* file = "$(TARGET_DIR)/kernel.bin"; */
3647
};
3748
};
3849
};
50+
3951
load-info {
4052
compatible = "ore-loadinfo";
4153
board-name = "QEMU aarch64";
4254
category = "emulation";
4355
board-url = "http://wiki.qemu.org/Main_Page";
56+
4457
load-payload {
4558
description = "Payload load address";
4659
addr = <0x41000000>;
4760
size = <0x2000000>;
4861
};
62+
4963
load-dtb {
5064
description = "DTB load address";
5165
addr = <0x45000000>;

‎src.broken/mainboard/emulation/qemu-aarch64/.cargo/config.toml renamed to ‎src/mainboard/emulation/qemu-aarch64/main/.cargo/config.toml

File renamed without changes.

‎src/mainboard/emulation/qemu-aarch64/main/Cargo.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[package]
2+
name = "emulation-qemu-aarch64-main"
3+
version = "0.1.0"
4+
authors = ["Oreboot Authors"]
5+
edition = "2021"
6+
7+
[dependencies]
8+
aarch64-cpu = "9.4.0"

‎src.broken/mainboard/emulation/qemu-aarch64/build.rs renamed to ‎src/mainboard/emulation/qemu-aarch64/main/build.rs

File renamed without changes.

‎src.broken/mainboard/emulation/qemu-aarch64/link.ld renamed to ‎src/mainboard/emulation/qemu-aarch64/main/link.ld

File renamed without changes.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy