[zircon][arm64] Remove duplicate memory information in boot shims.
Since Ida04607b790729aa88dd4268edf8c8fca98abb31 the main `boot-shim.c`
file appends memory information to the ZBI, so individual no longer need
to (nor should they) emit this information.
Change-Id: I293306995064efc8e35932c24f8c1b0b230eaa6c
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/512940
Reviewed-by: Travis Geiselbrecht <travisg@google.com>
Commit-Queue: David Greenaway <dgreenaway@google.com>
diff --git a/zircon/kernel/target/arm64/board/as370/boot-shim-config.h b/zircon/kernel/target/arm64/board/as370/boot-shim-config.h
index 2a76e08..09f0851 100644
--- a/zircon/kernel/target/arm64/board/as370/boot-shim-config.h
+++ b/zircon/kernel/target/arm64/board/as370/boot-shim-config.h
@@ -82,10 +82,6 @@
static void append_board_boot_item(zbi_header_t* bootdata) {
add_cpu_topology(bootdata);
- // add memory configuration
- append_boot_item(bootdata, ZBI_TYPE_MEM_CONFIG, 0, &mem_config,
- sizeof(zbi_mem_range_t) * countof(mem_config));
-
// add kernel drivers
append_boot_item(bootdata, ZBI_TYPE_KERNEL_DRIVER, KDRV_DW8250_UART, &uart_driver,
sizeof(uart_driver));
diff --git a/zircon/kernel/target/arm64/board/c18/boot-shim-config.h b/zircon/kernel/target/arm64/board/c18/boot-shim-config.h
index 619ba94..556185a 100644
--- a/zircon/kernel/target/arm64/board/c18/boot-shim-config.h
+++ b/zircon/kernel/target/arm64/board/c18/boot-shim-config.h
@@ -83,10 +83,6 @@
append_boot_item(bootdata, ZBI_TYPE_CPU_CONFIG, 0, &cpu_config,
sizeof(zbi_cpu_config_t) + sizeof(zbi_cpu_cluster_t) * cpu_config.cluster_count);
- // add memory configuration
- append_boot_item(bootdata, ZBI_TYPE_MEM_CONFIG, 0, &mem_config,
- sizeof(zbi_mem_range_t) * countof(mem_config));
-
// add kernel drivers
append_boot_item(bootdata, ZBI_TYPE_KERNEL_DRIVER, KDRV_MT8167_UART, &uart_driver,
sizeof(uart_driver));
diff --git a/zircon/kernel/target/arm64/board/cleo/boot-shim-config.h b/zircon/kernel/target/arm64/board/cleo/boot-shim-config.h
index 731b662..784a992 100644
--- a/zircon/kernel/target/arm64/board/cleo/boot-shim-config.h
+++ b/zircon/kernel/target/arm64/board/cleo/boot-shim-config.h
@@ -111,10 +111,6 @@
append_boot_item(bootdata, ZBI_TYPE_CPU_CONFIG, 0, &cpu_config,
sizeof(zbi_cpu_config_t) + sizeof(zbi_cpu_cluster_t) * cpu_config.cluster_count);
- // add memory configuration
- append_boot_item(bootdata, ZBI_TYPE_MEM_CONFIG, 0, &mem_config,
- sizeof(zbi_mem_range_t) * countof(mem_config));
-
// add kernel drivers
append_boot_item(bootdata, ZBI_TYPE_KERNEL_DRIVER, KDRV_MT8167_UART, &uart_driver,
sizeof(uart_driver));
diff --git a/zircon/kernel/target/arm64/board/msm8998/boot-shim-config.h b/zircon/kernel/target/arm64/board/msm8998/boot-shim-config.h
index 202cead..cff2b94 100644
--- a/zircon/kernel/target/arm64/board/msm8998/boot-shim-config.h
+++ b/zircon/kernel/target/arm64/board/msm8998/boot-shim-config.h
@@ -76,10 +76,6 @@
append_boot_item(bootdata, ZBI_TYPE_CPU_CONFIG, 0, &cpu_config,
sizeof(zbi_cpu_config_t) + sizeof(zbi_cpu_cluster_t) * cpu_config.cluster_count);
- // add memory configuration
- append_boot_item(bootdata, ZBI_TYPE_MEM_CONFIG, 0, &mem_config,
- sizeof(zbi_mem_range_t) * countof(mem_config));
-
// add kernel drivers
append_boot_item(bootdata, ZBI_TYPE_KERNEL_DRIVER, KDRV_MSM_UART, &uart_driver,
sizeof(uart_driver));
diff --git a/zircon/kernel/target/arm64/board/msm8x53-som/boot-shim-config.h b/zircon/kernel/target/arm64/board/msm8x53-som/boot-shim-config.h
index ca4f9ec..d29b46f 100644
--- a/zircon/kernel/target/arm64/board/msm8x53-som/boot-shim-config.h
+++ b/zircon/kernel/target/arm64/board/msm8x53-som/boot-shim-config.h
@@ -112,10 +112,6 @@
append_boot_item(bootdata, ZBI_TYPE_CPU_CONFIG, 0, &cpu_config,
sizeof(zbi_cpu_config_t) + sizeof(zbi_cpu_cluster_t) * cpu_config.cluster_count);
- // add memory configuration
- append_boot_item(bootdata, ZBI_TYPE_MEM_CONFIG, 0, &mem_config,
- sizeof(zbi_mem_range_t) * countof(mem_config));
-
// add kernel drivers
append_boot_item(bootdata, ZBI_TYPE_KERNEL_DRIVER, KDRV_MSM_UART, &uart_driver,
sizeof(uart_driver));
diff --git a/zircon/kernel/target/arm64/board/mt8167s_ref/boot-shim-config.h b/zircon/kernel/target/arm64/board/mt8167s_ref/boot-shim-config.h
index beae9d2..9bd5ac8 100644
--- a/zircon/kernel/target/arm64/board/mt8167s_ref/boot-shim-config.h
+++ b/zircon/kernel/target/arm64/board/mt8167s_ref/boot-shim-config.h
@@ -111,10 +111,6 @@
append_boot_item(bootdata, ZBI_TYPE_CPU_CONFIG, 0, &cpu_config,
sizeof(zbi_cpu_config_t) + sizeof(zbi_cpu_cluster_t) * cpu_config.cluster_count);
- // add memory configuration
- append_boot_item(bootdata, ZBI_TYPE_MEM_CONFIG, 0, &mem_config,
- sizeof(zbi_mem_range_t) * countof(mem_config));
-
// add kernel drivers
append_boot_item(bootdata, ZBI_TYPE_KERNEL_DRIVER, KDRV_MT8167_UART, &uart_driver,
sizeof(uart_driver));
diff --git a/zircon/kernel/target/arm64/board/qemu/boot-shim-config.h b/zircon/kernel/target/arm64/board/qemu/boot-shim-config.h
index 748b754..3774bb5 100644
--- a/zircon/kernel/target/arm64/board/qemu/boot-shim-config.h
+++ b/zircon/kernel/target/arm64/board/qemu/boot-shim-config.h
@@ -117,10 +117,6 @@
static void append_board_boot_item(zbi_header_t* bootdata) {
add_cpu_topology(bootdata);
- // add memory configuration
- append_boot_item(bootdata, ZBI_TYPE_MEM_CONFIG, 0, &mem_config,
- sizeof(zbi_mem_range_t) * countof(mem_config));
-
// add some "nvram" for storing the crashlog
const uint64_t crashlog_length = 0x10000;
const zbi_nvram_t crashlog = {
diff --git a/zircon/kernel/target/arm64/board/visalia/boot-shim-config.h b/zircon/kernel/target/arm64/board/visalia/boot-shim-config.h
index bddeca1..9c2284d 100644
--- a/zircon/kernel/target/arm64/board/visalia/boot-shim-config.h
+++ b/zircon/kernel/target/arm64/board/visalia/boot-shim-config.h
@@ -82,10 +82,6 @@
static void append_board_boot_item(zbi_header_t* bootdata) {
add_cpu_topology(bootdata);
- // add memory configuration
- append_boot_item(bootdata, ZBI_TYPE_MEM_CONFIG, 0, &mem_config,
- sizeof(zbi_mem_range_t) * countof(mem_config));
-
// add kernel drivers
append_boot_item(bootdata, ZBI_TYPE_KERNEL_DRIVER, KDRV_DW8250_UART, &uart_driver,
sizeof(uart_driver));
