Skip to content

Commit

Permalink
arm: remove unused configuration parameters
Browse files Browse the repository at this point in the history
ram_offset and initrd_max_size are not used by the VMM, so we can safely
remove them from the configuration.

Signed-off-by: Chris Guikema <[email protected]>
  • Loading branch information
chrisguikema authored and axel-h committed Jan 31, 2024
1 parent 1faeedb commit 76ca463
Show file tree
Hide file tree
Showing 16 changed files with 0 additions and 81 deletions.
6 changes: 0 additions & 6 deletions apps/Arm/odroid_vm/vm_odroid.camkes
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
* SPDX-License-Identifier: BSD-2-Clause
*/


#define VM_RAM_OFFSET 0
#define VM_INITRD_MAX_SIZE 0x1900000 //25 MB

#define VM_RAM_BASE 0x40000000
#define VM_RAM_SIZE 0x20000000
#define VM_DTB_ADDR 0x4F000000
Expand Down Expand Up @@ -217,9 +213,7 @@ assembly {
"ram_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_paddr_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_size" : VAR_STRINGIZE(VM_RAM_SIZE),
"ram_offset" : VAR_STRINGIZE(VM_RAM_OFFSET),
"dtb_addr" : VAR_STRINGIZE(VM_DTB_ADDR),
"initrd_max_size" : VAR_STRINGIZE(VM_INITRD_MAX_SIZE),
"initrd_addr" : VAR_STRINGIZE(VM_INITRD_ADDR),
"kernel_entry_addr" : VAR_STRINGIZE(VM_ENTRY_ADDR),
};
Expand Down
5 changes: 0 additions & 5 deletions apps/Arm/vm_cross_connector/exynos5422/devices.camkes
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@

#include <configurations/vm.h>

#define VM_RAM_OFFSET 0
#define VM_INITRD_MAX_SIZE 0x1900000 //25 MB

#define VM_RAM_BASE 0x40000000
#define VM_RAM_SIZE 0x10000000
#define VM_DTB_ADDR 0x4F000000
Expand All @@ -22,9 +19,7 @@ assembly {
"ram_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_paddr_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_size" : VAR_STRINGIZE(VM_RAM_SIZE),
"ram_offset" : VAR_STRINGIZE(VM_RAM_OFFSET),
"dtb_addr" : VAR_STRINGIZE(VM_DTB_ADDR),
"initrd_max_size" : VAR_STRINGIZE(VM_INITRD_MAX_SIZE),
"initrd_addr" : VAR_STRINGIZE(VM_INITRD_ADDR),
"kernel_entry_addr" : VAR_STRINGIZE(VM_ENTRY_ADDR)
};
Expand Down
4 changes: 0 additions & 4 deletions apps/Arm/vm_cross_connector/qemu-arm-virt/devices.camkes
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@

#include <configurations/vm.h>

#define VM_INITRD_MAX_SIZE 0x1900000 //25 MB
#define VM_RAM_BASE 0x40000000
#define VM_RAM_SIZE 0x20000000
#define VM_RAM_OFFSET 0x00000000
#define VM_DTB_ADDR 0x4F000000
#define VM_INITRD_ADDR 0x4D700000
#define VM_ENTRY_ADDR 0x40080000
Expand All @@ -22,9 +20,7 @@ assembly {
"ram_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_paddr_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_size" : VAR_STRINGIZE(VM_RAM_SIZE),
"ram_offset" : VAR_STRINGIZE(VM_RAM_OFFSET),
"dtb_addr" : VAR_STRINGIZE(VM_DTB_ADDR),
"initrd_max_size" : VAR_STRINGIZE(VM_INITRD_MAX_SIZE),
"initrd_addr" : VAR_STRINGIZE(VM_INITRD_ADDR),
"kernel_entry_addr" : VAR_STRINGIZE(VM_ENTRY_ADDR),
};
Expand Down
4 changes: 0 additions & 4 deletions apps/Arm/vm_introspect/exynos5422/devices.camkes
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@

#include <configurations/vm.h>

#define VM_INITRD_MAX_SIZE 0x1400000
#define VM_RAM_BASE 0x40000000
#define VM_RAM_SIZE 0x8001000
#define VM_RAM_OFFSET 0x00000000
#define VM_DTB_ADDR 0x45801000
#define VM_INITRD_ADDR 0x46c01000
#define VM_ENTRY_ADDR 0x40008000
Expand All @@ -25,9 +23,7 @@ assembly {
"ram_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_paddr_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_size" : VAR_STRINGIZE(VM_RAM_SIZE),
"ram_offset" : VAR_STRINGIZE(VM_RAM_OFFSET),
"dtb_addr" : VAR_STRINGIZE(VM_DTB_ADDR),
"initrd_max_size" : VAR_STRINGIZE(VM_INITRD_MAX_SIZE),
"initrd_addr" : VAR_STRINGIZE(VM_INITRD_ADDR),
"kernel_entry_addr" : VAR_STRINGIZE(VM_ENTRY_ADDR),
};
Expand Down
4 changes: 0 additions & 4 deletions apps/Arm/vm_introspect/qemu-arm-virt/devices.camkes
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@

#include <configurations/vm.h>

#define VM_INITRD_MAX_SIZE 0xc80000
#define VM_RAM_BASE 0x40000000
#define VM_RAM_SIZE 0x8001000
#define VM_RAM_OFFSET 0x00000000
#define VM_DTB_ADDR 0x47381000
#define VM_INITRD_ADDR 0x46701000
#define VM_ENTRY_ADDR 0x40080000
Expand All @@ -25,9 +23,7 @@ assembly {
"ram_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_paddr_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_size" : VAR_STRINGIZE(VM_RAM_SIZE),
"ram_offset" : VAR_STRINGIZE(VM_RAM_OFFSET),
"dtb_addr" : VAR_STRINGIZE(VM_DTB_ADDR),
"initrd_max_size" : VAR_STRINGIZE(VM_INITRD_MAX_SIZE),
"initrd_addr" : VAR_STRINGIZE(VM_INITRD_ADDR),
"kernel_entry_addr" : VAR_STRINGIZE(VM_ENTRY_ADDR),
};
Expand Down
5 changes: 0 additions & 5 deletions apps/Arm/vm_minimal/exynos5422/devices.camkes
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@

#include <configurations/vm.h>

#define VM_RAM_OFFSET 0
#define VM_INITRD_MAX_SIZE 0x1900000 //25 MB

#define VM_RAM_BASE 0x40000000
#define VM_RAM_SIZE 0x10000000
#define VM_DTB_ADDR 0x4F000000
Expand All @@ -23,9 +20,7 @@ assembly {
"ram_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_paddr_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_size" : VAR_STRINGIZE(VM_RAM_SIZE),
"ram_offset" : VAR_STRINGIZE(VM_RAM_OFFSET),
"dtb_addr" : VAR_STRINGIZE(VM_DTB_ADDR),
"initrd_max_size" : VAR_STRINGIZE(VM_INITRD_MAX_SIZE),
"initrd_addr" : VAR_STRINGIZE(VM_INITRD_ADDR),
"kernel_entry_addr" : VAR_STRINGIZE(VM_ENTRY_ADDR),
};
Expand Down
5 changes: 0 additions & 5 deletions apps/Arm/vm_minimal/odroidc2/devices.camkes
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@

#include <configurations/vm.h>

#define VM_RAM_OFFSET 0
#define VM_INITRD_MAX_SIZE 0x1900000 //25 MB

#define VM_RAM_BASE 0x20000000
#define VM_RAM_SIZE 0x10000000
#define VM_DTB_ADDR 0x2F000000
Expand All @@ -22,9 +19,7 @@ assembly {
"ram_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_paddr_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_size" : VAR_STRINGIZE(VM_RAM_SIZE),
"ram_offset" : VAR_STRINGIZE(VM_RAM_OFFSET),
"dtb_addr" : VAR_STRINGIZE(VM_DTB_ADDR),
"initrd_max_size" : VAR_STRINGIZE(VM_INITRD_MAX_SIZE),
"initrd_addr" : VAR_STRINGIZE(VM_INITRD_ADDR),
"kernel_entry_addr" : VAR_STRINGIZE(VM_ENTRY_ADDR),
};
Expand Down
4 changes: 0 additions & 4 deletions apps/Arm/vm_minimal/qemu-arm-virt/devices.camkes
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@

#include <configurations/vm.h>

#define VM_INITRD_MAX_SIZE 0x1900000 //25 MB
#define VM_RAM_BASE 0x40000000
#define VM_RAM_SIZE 0x20000000
#define VM_RAM_OFFSET 0x00000000
#define VM_DTB_ADDR 0x4F000000
#define VM_INITRD_ADDR 0x4D700000
#define VM_ENTRY_ADDR 0x40080000
Expand All @@ -22,9 +20,7 @@ assembly {
"ram_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_paddr_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_size" : VAR_STRINGIZE(VM_RAM_SIZE),
"ram_offset" : VAR_STRINGIZE(VM_RAM_OFFSET),
"dtb_addr" : VAR_STRINGIZE(VM_DTB_ADDR),
"initrd_max_size" : VAR_STRINGIZE(VM_INITRD_MAX_SIZE),
"initrd_addr" : VAR_STRINGIZE(VM_INITRD_ADDR),
"kernel_entry_addr" : VAR_STRINGIZE(VM_ENTRY_ADDR),
};
Expand Down
4 changes: 0 additions & 4 deletions apps/Arm/vm_minimal/tk1/devices.camkes
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@

#include <configurations/vm.h>

#define VM_INITRD_MAX_SIZE 0x1900000 //25 MB
#define VM_PADDR_RAM_BASE 0xB0000000
#define VM_RAM_BASE 0x80000000
#define VM_RAM_SIZE 0x40000000
#define VM_RAM_OFFSET 0x30000000
#define VM_DTB_ADDR 0x82000000
#define VM_INITRD_ADDR 0x80700000
#define VM_ENTRY_ADDR 0x80080000
Expand All @@ -23,9 +21,7 @@ assembly {
"ram_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_paddr_base" : VAR_STRINGIZE(VM_PADDR_RAM_BASE),
"ram_size" : VAR_STRINGIZE(VM_RAM_SIZE),
"ram_offset" : VAR_STRINGIZE(VM_RAM_OFFSET),
"dtb_addr" : VAR_STRINGIZE(VM_DTB_ADDR),
"initrd_max_size" : VAR_STRINGIZE(VM_INITRD_MAX_SIZE),
"initrd_addr" : VAR_STRINGIZE(VM_INITRD_ADDR),
"kernel_entry_addr" : VAR_STRINGIZE(VM_ENTRY_ADDR),
};
Expand Down
4 changes: 0 additions & 4 deletions apps/Arm/vm_minimal/tx1/devices.camkes
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@

#include <configurations/vm.h>

#define VM_INITRD_MAX_SIZE 0x1900000 //25 MB
#define VM_RAM_BASE 0x80000000
#define VM_RAM_SIZE 0x8000000
#define VM_RAM_OFFSET 0
#define VM_DTB_ADDR 0x82000000
#define VM_INITRD_ADDR 0x80700000
#define VM_ENTRY_ADDR 0x80080000
Expand All @@ -22,9 +20,7 @@ assembly {
"ram_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_paddr_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_size" : VAR_STRINGIZE(VM_RAM_SIZE),
"ram_offset" : VAR_STRINGIZE(VM_RAM_OFFSET),
"dtb_addr" : VAR_STRINGIZE(VM_DTB_ADDR),
"initrd_max_size" : VAR_STRINGIZE(VM_INITRD_MAX_SIZE),
"initrd_addr" : VAR_STRINGIZE(VM_INITRD_ADDR),
"kernel_entry_addr" : VAR_STRINGIZE(VM_ENTRY_ADDR),
};
Expand Down
4 changes: 0 additions & 4 deletions apps/Arm/vm_minimal/tx2/devices.camkes
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@

#include <configurations/vm.h>

#define VM_INITRD_MAX_SIZE 0x1900000 //25 MB
#define VM_RAM_BASE 0xF1000000
#define VM_RAM_SIZE 0x8000000
#define VM_RAM_OFFSET 0
#define VM_DTB_ADDR 0xF2000000
#define VM_INITRD_ADDR 0xF7000000
#define VM_ENTRY_ADDR 0xF1080000
Expand All @@ -22,9 +20,7 @@ assembly {
"ram_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_paddr_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_size" : VAR_STRINGIZE(VM_RAM_SIZE),
"ram_offset" : VAR_STRINGIZE(VM_RAM_OFFSET),
"dtb_addr" : VAR_STRINGIZE(VM_DTB_ADDR),
"initrd_max_size" : VAR_STRINGIZE(VM_INITRD_MAX_SIZE),
"initrd_addr" : VAR_STRINGIZE(VM_INITRD_ADDR),
"kernel_entry_addr" : VAR_STRINGIZE(VM_ENTRY_ADDR),
};
Expand Down
9 changes: 0 additions & 9 deletions apps/Arm/vm_multi/exynos5422/devices.camkes
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@

#include <configurations/vm.h>

#define VM_RAM_OFFSET 0
#define VM_INITRD_MAX_SIZE 0x1900000 //25 MB

#define VM0_RAM_BASE 0x40000000
#define VM0_RAM_SIZE 0x8000000
#define VM0_DTB_ADDR 0x47000000 //VM0_RAM_BASE + 0x7000000
Expand All @@ -35,9 +32,7 @@ assembly {
"ram_base" : VAR_STRINGIZE(VM0_RAM_BASE),
"ram_paddr_base" : VAR_STRINGIZE(VM0_RAM_BASE),
"ram_size" : VAR_STRINGIZE(VM0_RAM_SIZE),
"ram_offset" : VAR_STRINGIZE(VM_RAM_OFFSET),
"dtb_addr" : VAR_STRINGIZE(VM0_DTB_ADDR),
"initrd_max_size" : VAR_STRINGIZE(VM_INITRD_MAX_SIZE),
"initrd_addr" : VAR_STRINGIZE(VM0_INITRD_ADDR),
"kernel_entry_addr" : VAR_STRINGIZE(VM0_ENTRY_ADDR),
};
Expand Down Expand Up @@ -75,9 +70,7 @@ assembly {
"ram_base" : VAR_STRINGIZE(VM1_RAM_BASE),
"ram_paddr_base" : VAR_STRINGIZE(VM1_RAM_BASE),
"ram_size" : VAR_STRINGIZE(VM1_RAM_SIZE),
"ram_offset" : VAR_STRINGIZE(VM_RAM_OFFSET),
"dtb_addr" : VAR_STRINGIZE(VM1_DTB_ADDR),
"initrd_max_size" : VAR_STRINGIZE(VM_INITRD_MAX_SIZE),
"initrd_addr" : VAR_STRINGIZE(VM1_INITRD_ADDR),
"kernel_entry_addr" : VAR_STRINGIZE(VM1_ENTRY_ADDR),
};
Expand All @@ -104,9 +97,7 @@ assembly {
"ram_base" : VAR_STRINGIZE(VM2_RAM_BASE),
"ram_paddr_base" : VAR_STRINGIZE(VM2_RAM_BASE),
"ram_size" : VAR_STRINGIZE(VM2_RAM_SIZE),
"ram_offset" : VAR_STRINGIZE(VM_RAM_OFFSET),
"dtb_addr" : VAR_STRINGIZE(VM2_DTB_ADDR),
"initrd_max_size" : VAR_STRINGIZE(VM_INITRD_MAX_SIZE),
"initrd_addr" : VAR_STRINGIZE(VM2_INITRD_ADDR),
"kernel_entry_addr" : VAR_STRINGIZE(VM2_ENTRY_ADDR),
};
Expand Down
9 changes: 0 additions & 9 deletions apps/Arm/vm_multi/qemu-arm-virt/devices.camkes
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@

#include <configurations/vm.h>

#define VM_RAM_OFFSET 0x00000000
#define VM_INITRD_MAX_SIZE 0x3200000 //50 MB

#define VM0_RAM_BASE 0x40000000
#define VM0_RAM_SIZE 0x8000000
#define VM0_DTB_ADDR 0x47000000 //VM0_RAM_BASE + 0x7000000
Expand All @@ -35,9 +32,7 @@ assembly {
"ram_base" : VAR_STRINGIZE(VM0_RAM_BASE),
"ram_paddr_base" : VAR_STRINGIZE(VM0_RAM_BASE),
"ram_size" : VAR_STRINGIZE(VM0_RAM_SIZE),
"ram_offset" : VAR_STRINGIZE(VM_RAM_OFFSET),
"dtb_addr" : VAR_STRINGIZE(VM0_DTB_ADDR),
"initrd_max_size" : VAR_STRINGIZE(VM_INITRD_MAX_SIZE),
"initrd_addr" : VAR_STRINGIZE(VM0_INITRD_ADDR),
"kernel_entry_addr" : VAR_STRINGIZE(VM0_ENTRY_ADDR),
};
Expand Down Expand Up @@ -68,9 +63,7 @@ assembly {
"ram_base" : VAR_STRINGIZE(VM1_RAM_BASE),
"ram_paddr_base" : VAR_STRINGIZE(VM1_RAM_BASE),
"ram_size" : VAR_STRINGIZE(VM1_RAM_SIZE),
"ram_offset" : VAR_STRINGIZE(VM_RAM_OFFSET),
"dtb_addr" : VAR_STRINGIZE(VM1_DTB_ADDR),
"initrd_max_size" : VAR_STRINGIZE(VM_INITRD_MAX_SIZE),
"initrd_addr" : VAR_STRINGIZE(VM1_INITRD_ADDR),
"kernel_entry_addr" : VAR_STRINGIZE(VM1_ENTRY_ADDR),
};
Expand All @@ -95,9 +88,7 @@ assembly {
"ram_base" : VAR_STRINGIZE(VM2_RAM_BASE),
"ram_paddr_base" : VAR_STRINGIZE(VM2_RAM_BASE),
"ram_size" : VAR_STRINGIZE(VM2_RAM_SIZE),
"ram_offset" : VAR_STRINGIZE(VM_RAM_OFFSET),
"dtb_addr" : VAR_STRINGIZE(VM2_DTB_ADDR),
"initrd_max_size" : VAR_STRINGIZE(VM_INITRD_MAX_SIZE),
"initrd_addr" : VAR_STRINGIZE(VM2_INITRD_ADDR),
"kernel_entry_addr" : VAR_STRINGIZE(VM2_ENTRY_ADDR),
};
Expand Down
5 changes: 0 additions & 5 deletions apps/Arm/vm_serial_server/exynos5422/devices.camkes
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@

#include <configurations/vm.h>

#define VM_RAM_OFFSET 0
#define VM_INITRD_MAX_SIZE 0x1900000 //25 MB

#define VM_RAM_BASE 0x40000000
#define VM_RAM_SIZE 0x10000000
#define VM_DTB_ADDR 0x4F000000
Expand All @@ -22,9 +19,7 @@ assembly {
"ram_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_paddr_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_size" : VAR_STRINGIZE(VM_RAM_SIZE),
"ram_offset" : VAR_STRINGIZE(VM_RAM_OFFSET),
"dtb_addr" : VAR_STRINGIZE(VM_DTB_ADDR),
"initrd_max_size" : VAR_STRINGIZE(VM_INITRD_MAX_SIZE),
"initrd_addr" : VAR_STRINGIZE(VM_INITRD_ADDR),
"kernel_entry_addr" : VAR_STRINGIZE(VM_ENTRY_ADDR),
};
Expand Down
5 changes: 0 additions & 5 deletions apps/Arm/vm_virtio_net/exynos5422/devices.camkes
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@

#include <configurations/vm.h>

#define VM_RAM_OFFSET 0
#define VM_INITRD_MAX_SIZE 0x1900000 //25 MB

#define VM_RAM_BASE 0x40000000
#define VM_RAM_SIZE 0x10000000
#define VM_DTB_ADDR 0x4F000000
Expand All @@ -22,9 +19,7 @@ assembly {
"ram_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_paddr_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_size" : VAR_STRINGIZE(VM_RAM_SIZE),
"ram_offset" : VAR_STRINGIZE(VM_RAM_OFFSET),
"dtb_addr" : VAR_STRINGIZE(VM_DTB_ADDR),
"initrd_max_size" : VAR_STRINGIZE(VM_INITRD_MAX_SIZE),
"initrd_addr" : VAR_STRINGIZE(VM_INITRD_ADDR),
"kernel_entry_addr" : VAR_STRINGIZE(VM_ENTRY_ADDR),
};
Expand Down
4 changes: 0 additions & 4 deletions apps/Arm/vm_virtio_net/tx2/devices.camkes
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@

#include <configurations/vm.h>

#define VM_INITRD_MAX_SIZE 0x1900000 //25 MB
#define VM_RAM_BASE 0xF1000000
#define VM_RAM_SIZE 0x8000000
#define VM_RAM_OFFSET 0
#define VM_DTB_ADDR 0xF2000000
#define VM_INITRD_ADDR 0xF7000000
#define VM_ENTRY_ADDR 0xF1080000
Expand All @@ -22,9 +20,7 @@ assembly {
"ram_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_paddr_base" : VAR_STRINGIZE(VM_RAM_BASE),
"ram_size" : VAR_STRINGIZE(VM_RAM_SIZE),
"ram_offset" : VAR_STRINGIZE(VM_RAM_OFFSET),
"dtb_addr" : VAR_STRINGIZE(VM_DTB_ADDR),
"initrd_max_size" : VAR_STRINGIZE(VM_INITRD_MAX_SIZE),
"initrd_addr" : VAR_STRINGIZE(VM_INITRD_ADDR),
"kernel_entry_addr" : VAR_STRINGIZE(VM_ENTRY_ADDR),
};
Expand Down

0 comments on commit 76ca463

Please sign in to comment.