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

vm_arm: remove unused attic variables #60

Merged
merged 2 commits into from
Mar 20, 2023
Merged

vm_arm: remove unused attic variables #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1c43fe
vm_arm: remove unused attic variables
Mar 7, 2023
c0dcf2d
vm_arm: remove empty line
Mar 7, 2023
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 components/VM_Arm/configurations/vm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@
string linux_ram_base; \
string linux_ram_paddr_base; \
string linux_ram_size; \
string linux_ram_offset; \
string linux_ram_offset = "0"; /* obsolete */ \
string dtb_addr; \
string initrd_max_size; \
string initrd_max_size = "-1"; /* obsolete */ \
string initrd_addr; \
} linux_address_config; \
attribute { \
Expand Down
2 changes: 0 additions & 2 deletions templates/seL4VMParameters.template.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,7 @@ const unsigned long entry_addr = /*? vm_address_config.get('ram_base') ?*/ + 0x8
const unsigned long ram_base = /*? linux_address_config.get('linux_ram_base') ?*/;
const unsigned long ram_paddr_base = /*? linux_address_config.get('linux_ram_paddr_base') ?*/;
const unsigned long ram_size = /*? linux_address_config.get('linux_ram_size') ?*/;
const unsigned long ram_offset = /*? linux_address_config.get('linux_ram_offset') ?*/;
const unsigned long dtb_addr = /*? linux_address_config.get('dtb_addr') ?*/;
const unsigned long initrd_max_size = /*? linux_address_config.get('initrd_max_size') ?*/;
const unsigned long initrd_addr = /*? linux_address_config.get('initrd_addr') ?*/;

#ifdef CONFIG_ARCH_AARCH64
Expand Down
6 changes: 0 additions & 6 deletions templates/seL4VMParameters.template.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,9 @@ extern const unsigned long ram_base;
extern const unsigned long ram_paddr_base;
extern const unsigned long ram_size;
extern const unsigned long dtb_addr;

extern const unsigned long initrd_addr;
extern const unsigned long entry_addr;

/*- if not configuration[me.name].get('vm_address_config') -*/
extern const unsigned long initrd_max_size;
extern const unsigned long ram_offset;
/*- endif -*/

extern const int provide_initrd;
extern const int generate_dtb;
extern const int provide_dtb;
Expand Down