1*4882a593SmuzhiyunFrom d52f78def1b9c4f435fdbf6b24fd899208580c76 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Javier Martinez Canillas <javierm@redhat.com> 3*4882a593SmuzhiyunDate: Thu, 11 Feb 2021 17:06:49 +0100 4*4882a593SmuzhiyunSubject: [PATCH] util/mkimage: Remove unused code to add BSS section 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThe code is compiled out so there is no reason to keep it. 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunAdditionally, don't set bss_size field since we do not add a BSS section. 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunSigned-off-by: Javier Martinez Canillas <javierm@redhat.com> 11*4882a593SmuzhiyunReviewed-by: Daniel Kiper <daniel.kiper@oracle.com> 12*4882a593SmuzhiyunSigned-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com> 13*4882a593Smuzhiyun--- 14*4882a593Smuzhiyun util/mkimage.c | 17 ----------------- 15*4882a593Smuzhiyun 1 file changed, 17 deletions(-) 16*4882a593Smuzhiyun 17*4882a593Smuzhiyundiff --git a/util/mkimage.c b/util/mkimage.c 18*4882a593Smuzhiyunindex 37d6249..32bb8ea 100644 19*4882a593Smuzhiyun--- a/util/mkimage.c 20*4882a593Smuzhiyun+++ b/util/mkimage.c 21*4882a593Smuzhiyun@@ -1304,7 +1304,6 @@ grub_install_generate_image (const char *dir, const char *prefix, 22*4882a593Smuzhiyun o->code_size = grub_host_to_target32 (layout.exec_size); 23*4882a593Smuzhiyun o->data_size = grub_cpu_to_le32 (reloc_addr - layout.exec_size 24*4882a593Smuzhiyun - header_size); 25*4882a593Smuzhiyun- o->bss_size = grub_cpu_to_le32 (layout.bss_size); 26*4882a593Smuzhiyun o->entry_addr = grub_cpu_to_le32 (layout.start_address); 27*4882a593Smuzhiyun o->code_base = grub_cpu_to_le32 (header_size); 28*4882a593Smuzhiyun 29*4882a593Smuzhiyun@@ -1342,7 +1341,6 @@ grub_install_generate_image (const char *dir, const char *prefix, 30*4882a593Smuzhiyun o->code_size = grub_host_to_target32 (layout.exec_size); 31*4882a593Smuzhiyun o->data_size = grub_cpu_to_le32 (reloc_addr - layout.exec_size 32*4882a593Smuzhiyun - header_size); 33*4882a593Smuzhiyun- o->bss_size = grub_cpu_to_le32 (layout.bss_size); 34*4882a593Smuzhiyun o->entry_addr = grub_cpu_to_le32 (layout.start_address); 35*4882a593Smuzhiyun o->code_base = grub_cpu_to_le32 (header_size); 36*4882a593Smuzhiyun o->image_base = 0; 37*4882a593Smuzhiyun@@ -1387,21 +1385,6 @@ grub_install_generate_image (const char *dir, const char *prefix, 38*4882a593Smuzhiyun = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA 39*4882a593Smuzhiyun | GRUB_PE32_SCN_MEM_READ 40*4882a593Smuzhiyun | GRUB_PE32_SCN_MEM_WRITE); 41*4882a593Smuzhiyun- 42*4882a593Smuzhiyun-#if 0 43*4882a593Smuzhiyun- bss_section = data_section + 1; 44*4882a593Smuzhiyun- strcpy (bss_section->name, ".bss"); 45*4882a593Smuzhiyun- bss_section->virtual_size = grub_cpu_to_le32 (layout.bss_size); 46*4882a593Smuzhiyun- bss_section->virtual_address = grub_cpu_to_le32 (header_size + layout.kernel_size); 47*4882a593Smuzhiyun- bss_section->raw_data_size = 0; 48*4882a593Smuzhiyun- bss_section->raw_data_offset = 0; 49*4882a593Smuzhiyun- bss_section->characteristics 50*4882a593Smuzhiyun- = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_MEM_READ 51*4882a593Smuzhiyun- | GRUB_PE32_SCN_MEM_WRITE 52*4882a593Smuzhiyun- | GRUB_PE32_SCN_ALIGN_64BYTES 53*4882a593Smuzhiyun- | GRUB_PE32_SCN_CNT_INITIALIZED_DATA 54*4882a593Smuzhiyun- | 0x80); 55*4882a593Smuzhiyun-#endif 56*4882a593Smuzhiyun 57*4882a593Smuzhiyun mods_section = data_section + 1; 58*4882a593Smuzhiyun strcpy (mods_section->name, "mods"); 59*4882a593Smuzhiyun-- 60*4882a593Smuzhiyun2.14.2 61*4882a593Smuzhiyun 62