Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

camkes-vm-apps: use empty list #36

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

camkes-vm-apps: use empty list #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/Arm/vm_multi/exynos5422/devices.camkes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ assembly {
"0x48000000:27" //RAM
];
vm1.irqs = [];
vm1.dtb = dtb([{}]);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this instead be addressed by allowing the template that uses this config option to accept an unset .dtb config setting?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this instead be addressed by allowing the template that uses this config option to accept an unset .dtb config setting?

I'd make this a separate PR then. Maybe we could just set dtb([]) in the defaults, so this does not have to be set explicitly.
For now, this PR here is just for some more test coverage for seL4/camkes-tool#129, it does not have to get merged.
I'd really like to see the empty list support from seL4/camkes-tool#129 getting merged. It is quite convenient for development, when adding an removing entries there. You don't run into an error, if the list turns out to be empty because of commented out elements.

vm1.dtb = dtb([]);

vm2.linux_address_config = {
"linux_ram_base" : VAR_STRINGIZE(VM2_RAM_BASE),
Expand All @@ -112,7 +112,7 @@ assembly {
"0x50000000:27" //RAM
];
vm2.irqs = [];
vm2.dtb = dtb([{}]);
vm2.dtb = dtb([]);

}
}
4 changes: 2 additions & 2 deletions apps/Arm/vm_multi/qemu-arm-virt/devices.camkes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ assembly {
vm1.untyped_mmios = [
"0x48000000:27", // Linux kernel memory regions
];
vm1.dtb = dtb([{}]);
vm1.dtb = dtb([]);

vm2.linux_address_config = {
"linux_ram_base" : VAR_STRINGIZE(VM2_RAM_BASE),
Expand All @@ -101,6 +101,6 @@ assembly {
vm2.untyped_mmios = [
"0x50000000:27", // Linux kernel memory regions
];
vm2.dtb = dtb([{}]);
vm2.dtb = dtb([]);
}
}