2021-03-02 20:36:22 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Javier Martinez Canillas <javierm@redhat.com>
|
|
|
|
|
Date: Thu, 11 Feb 2021 17:06:49 +0100
|
|
|
|
|
Subject: [PATCH] util/mkimage: Remove unused code to add BSS section
|
|
|
|
|
|
|
|
|
|
The code is compiled out so there is no reason to keep it.
|
|
|
|
|
|
|
|
|
|
Additionally, don't set bss_size field since we do not add a BSS section.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
|
|
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
|
|
|
---
|
|
|
|
|
util/mkimage.c | 17 -----------------
|
|
|
|
|
1 file changed, 17 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/util/mkimage.c b/util/mkimage.c
|
2022-02-11 05:27:54 +00:00
|
|
|
index 2529de4bb..64f4f1398 100644
|
2021-03-02 20:36:22 +00:00
|
|
|
--- a/util/mkimage.c
|
|
|
|
|
+++ b/util/mkimage.c
|
|
|
|
|
@@ -1292,7 +1292,6 @@ grub_install_generate_image (const char *dir, const char *prefix,
|
|
|
|
|
o->code_size = grub_host_to_target32 (layout.exec_size);
|
|
|
|
|
o->data_size = grub_cpu_to_le32 (reloc_addr - layout.exec_size
|
|
|
|
|
- header_size);
|
|
|
|
|
- o->bss_size = grub_cpu_to_le32 (layout.bss_size);
|
|
|
|
|
o->entry_addr = grub_cpu_to_le32 (layout.start_address);
|
|
|
|
|
o->code_base = grub_cpu_to_le32 (header_size);
|
|
|
|
|
|
|
|
|
|
@@ -1330,7 +1329,6 @@ grub_install_generate_image (const char *dir, const char *prefix,
|
|
|
|
|
o->code_size = grub_host_to_target32 (layout.exec_size);
|
|
|
|
|
o->data_size = grub_cpu_to_le32 (reloc_addr - layout.exec_size
|
|
|
|
|
- header_size);
|
|
|
|
|
- o->bss_size = grub_cpu_to_le32 (layout.bss_size);
|
|
|
|
|
o->entry_addr = grub_cpu_to_le32 (layout.start_address);
|
|
|
|
|
o->code_base = grub_cpu_to_le32 (header_size);
|
|
|
|
|
o->image_base = 0;
|
|
|
|
|
@@ -1375,21 +1373,6 @@ grub_install_generate_image (const char *dir, const char *prefix,
|
|
|
|
|
= grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA
|
|
|
|
|
| GRUB_PE32_SCN_MEM_READ
|
|
|
|
|
| GRUB_PE32_SCN_MEM_WRITE);
|
|
|
|
|
-
|
|
|
|
|
-#if 0
|
|
|
|
|
- bss_section = data_section + 1;
|
|
|
|
|
- strcpy (bss_section->name, ".bss");
|
|
|
|
|
- bss_section->virtual_size = grub_cpu_to_le32 (layout.bss_size);
|
|
|
|
|
- bss_section->virtual_address = grub_cpu_to_le32 (header_size + layout.kernel_size);
|
|
|
|
|
- bss_section->raw_data_size = 0;
|
|
|
|
|
- bss_section->raw_data_offset = 0;
|
|
|
|
|
- bss_section->characteristics
|
|
|
|
|
- = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_MEM_READ
|
|
|
|
|
- | GRUB_PE32_SCN_MEM_WRITE
|
|
|
|
|
- | GRUB_PE32_SCN_ALIGN_64BYTES
|
|
|
|
|
- | GRUB_PE32_SCN_CNT_INITIALIZED_DATA
|
|
|
|
|
- | 0x80);
|
|
|
|
|
-#endif
|
|
|
|
|
|
|
|
|
|
mods_section = data_section + 1;
|
|
|
|
|
strcpy (mods_section->name, "mods");
|
