Commit 771856ca authored by Luis Chamberlain's avatar Luis Chamberlain Committed by Greg Kroah-Hartman
Browse files

vmlinux.lds.h: wrap built-in firmware support under FW_LOADER 



The firmware loader built-in firmware is only available when FW_LOADER
is built-in, so tuck away the sections for built-in firmware under it.

This ensures no oddball user tries to uses these sections without
first enabling FW_LOADER=y.

Reviewed-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20211021155843.1969401-6-mcgrof@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e2e2c0f2

include/asm-generic/vmlinux.lds.h

+13 −7
Original line number Diff line number Diff line
@@ -470,13 +470,7 @@ 
		__end_pci_fixups_suspend_late = .;			\

	}								\

									\

	/* Built-in firmware blobs */					\

	.builtin_fw : AT(ADDR(.builtin_fw) - LOAD_OFFSET) ALIGN(8) {	\

		__start_builtin_fw = .;					\

		KEEP(*(.builtin_fw))					\

		__end_builtin_fw = .;					\

	}								\

									\

	FW_LOADER_BUILT_IN_DATA						\

	TRACEDATA							\

									\

	PRINTK_INDEX							\
@@ -880,6 +874,18 @@ 
#define ORC_UNWIND_TABLE

#endif



/* Built-in firmware blobs */

#ifdef CONFIG_FW_LOADER

#define FW_LOADER_BUILT_IN_DATA						\

	.builtin_fw : AT(ADDR(.builtin_fw) - LOAD_OFFSET) ALIGN(8) {	\

		__start_builtin_fw = .;					\

		KEEP(*(.builtin_fw))					\

		__end_builtin_fw = .;					\

	}

#else

#define FW_LOADER_BUILT_IN_DATA

#endif



#ifdef CONFIG_PM_TRACE

#define TRACEDATA							\

	. = ALIGN(4);							\