From f1c43fec7ea11ccbe34dcbdf92a3204e1090db4a Mon Sep 17 00:00:00 2001 From: Axel Heider Date: Tue, 7 Mar 2023 13:49:51 +0100 Subject: [PATCH 1/2] vm_arm: remove unused attic variables Also set a dummy default configuration, so they don't have to be specified in new configurations files in case the deprecated config block linux_address_config is used. Signed-off-by: Axel Heider --- components/VM_Arm/configurations/vm.h | 4 ++-- templates/seL4VMParameters.template.c | 2 -- templates/seL4VMParameters.template.h | 5 ----- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/components/VM_Arm/configurations/vm.h b/components/VM_Arm/configurations/vm.h index 4800917a..8e15dec2 100644 --- a/components/VM_Arm/configurations/vm.h +++ b/components/VM_Arm/configurations/vm.h @@ -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 { \ diff --git a/templates/seL4VMParameters.template.c b/templates/seL4VMParameters.template.c index 1dfbdb15..6e2486cd 100644 --- a/templates/seL4VMParameters.template.c +++ b/templates/seL4VMParameters.template.c @@ -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 diff --git a/templates/seL4VMParameters.template.h b/templates/seL4VMParameters.template.h index 21834db5..fefa4d3c 100644 --- a/templates/seL4VMParameters.template.h +++ b/templates/seL4VMParameters.template.h @@ -14,11 +14,6 @@ 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; From c0dcf2d5a5e8e7ba85e0dced406fa9ca7fdf3f0e Mon Sep 17 00:00:00 2001 From: Axel Heider Date: Tue, 7 Mar 2023 13:47:03 +0100 Subject: [PATCH 2/2] vm_arm: remove empty line Signed-off-by: Axel Heider --- templates/seL4VMParameters.template.h | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/seL4VMParameters.template.h b/templates/seL4VMParameters.template.h index fefa4d3c..2fe180d0 100644 --- a/templates/seL4VMParameters.template.h +++ b/templates/seL4VMParameters.template.h @@ -10,7 +10,6 @@ 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;