Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 993c30a0 authored by Matt Fleming's avatar Matt Fleming
Browse files

x86, tools: Consolidate #ifdef code 



Instead of littering main() with #ifdef CONFIG_EFI_STUB, move the logic
into separate functions that do nothing if the config option isn't set.
This makes main() much easier to read.

Acked-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
parent 86134a1b

arch/x86/boot/tools/build.c

+42 −22
Original line number Original line Diff line number Diff line
@@ -219,6 +219,45 @@ static void update_pecoff_text(unsigned int text_start, unsigned int file_sz) 
	update_pecoff_section_header(".text", text_start, text_sz);

	update_pecoff_section_header(".text", text_start, text_sz);

}

}





static int reserve_pecoff_reloc_section(int c)

{

	/* Reserve 0x20 bytes for .reloc section */

	memset(buf+c, 0, PECOFF_RELOC_RESERVE);

	return PECOFF_RELOC_RESERVE;

}



static void efi_stub_defaults(void)

{

	/* Defaults for old kernel */

#ifdef CONFIG_X86_32

	efi_pe_entry = 0x10;

	efi_stub_entry = 0x30;

#else

	efi_pe_entry = 0x210;

	efi_stub_entry = 0x230;

	startup_64 = 0x200;

#endif

}



static void efi_stub_entry_update(void)

{

#ifdef CONFIG_X86_64 /* Yes, this is really how we defined it :( */

	efi_stub_entry -= 0x200;

#endif

	put_unaligned_le32(efi_stub_entry, &buf[0x264]);

}



#else



static inline void update_pecoff_setup_and_reloc(unsigned int) {}

static inline void update_pecoff_text(unsigned int, unsigned int) {}

static inline void efi_stub_defaults(void) {}

static inline void efi_stup_entry_update(void) {}



static inline int reserve_pecoff_reloc_section(int c)

{

	return 0;

}

#endif /* CONFIG_EFI_STUB */

#endif /* CONFIG_EFI_STUB */
@@ -271,15 +310,7 @@ int main(int argc, char ** argv) 
	void *kernel;

	void *kernel;

	u32 crc = 0xffffffffUL;

	u32 crc = 0xffffffffUL;





	/* Defaults for old kernel */

	efi_stub_defaults();

#ifdef CONFIG_X86_32

	efi_pe_entry = 0x10;

	efi_stub_entry = 0x30;

#else

	efi_pe_entry = 0x210;

	efi_stub_entry = 0x230;

	startup_64 = 0x200;

#endif





	if (argc != 5)

	if (argc != 5)

		usage();

		usage();
@@ -302,11 +333,7 @@ int main(int argc, char ** argv) 
		die("Boot block hasn't got boot flag (0xAA55)");

		die("Boot block hasn't got boot flag (0xAA55)");

	fclose(file);

	fclose(file);





#ifdef CONFIG_EFI_STUB

	c += reserve_pecoff_reloc_section(c);

	/* Reserve 0x20 bytes for .reloc section */

	memset(buf+c, 0, PECOFF_RELOC_RESERVE);

	c += PECOFF_RELOC_RESERVE;

#endif





	/* Pad unused space with zeros */

	/* Pad unused space with zeros */

	setup_sectors = (c + 511) / 512;

	setup_sectors = (c + 511) / 512;
@@ -315,9 +342,7 @@ int main(int argc, char ** argv) 
	i = setup_sectors*512;

	i = setup_sectors*512;

	memset(buf+c, 0, i-c);

	memset(buf+c, 0, i-c);





#ifdef CONFIG_EFI_STUB

	update_pecoff_setup_and_reloc(i);

	update_pecoff_setup_and_reloc(i);

#endif





	/* Set the default root device */

	/* Set the default root device */

	put_unaligned_le16(DEFAULT_ROOT_DEV, &buf[508]);

	put_unaligned_le16(DEFAULT_ROOT_DEV, &buf[508]);
@@ -342,14 +367,9 @@ int main(int argc, char ** argv) 
	buf[0x1f1] = setup_sectors-1;

	buf[0x1f1] = setup_sectors-1;

	put_unaligned_le32(sys_size, &buf[0x1f4]);

	put_unaligned_le32(sys_size, &buf[0x1f4]);





#ifdef CONFIG_EFI_STUB

	update_pecoff_text(setup_sectors * 512, sz + i + ((sys_size * 16) - sz));

	update_pecoff_text(setup_sectors * 512, sz + i + ((sys_size * 16) - sz));





#ifdef CONFIG_X86_64 /* Yes, this is really how we defined it :( */

	efi_stub_entry_update();

	efi_stub_entry -= 0x200;

#endif

	put_unaligned_le32(efi_stub_entry, &buf[0x264]);

#endif





	crc = partial_crc32(buf, i, crc);

	crc = partial_crc32(buf, i, crc);

	if (fwrite(buf, 1, i, dest) != i)

	if (fwrite(buf, 1, i, dest) != i)