diff options
| -rw-r--r-- | Makefile.inc | 10 | ||||
| -rw-r--r-- | src/arch/arm/Makefile.inc | 5 | ||||
| -rw-r--r-- | src/arch/arm/id.S | 21 | ||||
| -rw-r--r-- | src/arch/arm64/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/arch/arm64/id.S | 21 | ||||
| -rw-r--r-- | src/lib/program.ld | 3 |
6 files changed, 10 insertions, 54 deletions
diff --git a/Makefile.inc b/Makefile.inc index 90c249474bff..1212dae86fc3 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -530,6 +530,12 @@ $(build_h): $$(shell $$(build_h_check)) build-dirs $(objcbfs) $(objgenerated): mkdir -p $(objcbfs) $(objgenerated) +$(obj)/build_info: + @echo 'COREBOOT_VERSION: $(call strip_quotes,$(KERNELVERSION))' > $@.tmp + @echo 'MAINBOARD_VENDOR: $(call strip_quotes,$(CONFIG_MAINBOARD_VENDOR))' >> $@.tmp + @echo 'MAINBOARD_PART_NUMBER: $(call strip_quotes,$(CONFIG_MAINBOARD_PART_NUMBER))' >> $@.tmp + mv $@.tmp $@ + ####################################################################### # Build the tools CBFSTOOL:=$(objutil)/cbfstool/cbfstool @@ -1208,6 +1214,10 @@ cbfs-files-$(CONFIG_INCLUDE_CONFIG_FILE) += revision revision-file := $(obj)/build.h revision-type := raw +cbfs-files-y += build_info +build_info-file := $(obj)/build_info +build_info-type := raw + BOOTSPLASH_SUFFIX=$(suffix $(call strip_quotes,$(CONFIG_BOOTSPLASH_FILE))) cbfs-files-$(CONFIG_BOOTSPLASH_IMAGE) += bootsplash$(BOOTSPLASH_SUFFIX) bootsplash$(BOOTSPLASH_SUFFIX)-file := $(call strip_quotes,$(CONFIG_BOOTSPLASH_FILE)) diff --git a/src/arch/arm/Makefile.inc b/src/arch/arm/Makefile.inc index 3d359148aadf..63367bb2c064 100644 --- a/src/arch/arm/Makefile.inc +++ b/src/arch/arm/Makefile.inc @@ -27,11 +27,6 @@ endif # CONFIG_ARCH_ARM ifeq ($(CONFIG_ARCH_BOOTBLOCK_ARM),y) -decompressor-y += id.S -bootblock-y += id.S -$(call src-to-obj,decompressor,$(dir)/id.S): $(obj)/build.h -$(call src-to-obj,bootblock,$(dir)/id.S): $(obj)/build.h - decompressor-y += boot.c bootblock-y += boot.c decompressor-y += div0.c diff --git a/src/arch/arm/id.S b/src/arch/arm/id.S deleted file mode 100644 index a8f7a797f10b..000000000000 --- a/src/arch/arm/id.S +++ /dev/null @@ -1,21 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <build.h> - - .section ".id", "a", %progbits - - .globl __id_start -__id_start: -ver: - .asciz COREBOOT_VERSION -vendor: - .asciz CONFIG_MAINBOARD_VENDOR -part: - .asciz CONFIG_MAINBOARD_PART_NUMBER -.long __id_end - ver /* Reverse offset to the vendor id */ -.long __id_end - vendor /* Reverse offset to the vendor id */ -.long __id_end - part /* Reverse offset to the part number */ -.long CONFIG_ROM_SIZE /* Size of this romimage */ - .globl __id_end - -__id_end: diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc index 44517cb57756..6b49743633c3 100644 --- a/src/arch/arm64/Makefile.inc +++ b/src/arch/arm64/Makefile.inc @@ -26,10 +26,6 @@ decompressor-y += div0.c bootblock-y += div0.c decompressor-y += eabi_compat.c bootblock-y += eabi_compat.c -decompressor-y += id.S -bootblock-y += id.S -$(call src-to-obj,decompressor,$(dir)/id.S): $(obj)/build.h -$(call src-to-obj,bootblock,$(dir)/id.S): $(obj)/build.h decompressor-$(CONFIG_ARM64_USE_ARCH_TIMER) += arch_timer.c bootblock-$(CONFIG_ARM64_USE_ARCH_TIMER) += arch_timer.c diff --git a/src/arch/arm64/id.S b/src/arch/arm64/id.S deleted file mode 100644 index a8f7a797f10b..000000000000 --- a/src/arch/arm64/id.S +++ /dev/null @@ -1,21 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <build.h> - - .section ".id", "a", %progbits - - .globl __id_start -__id_start: -ver: - .asciz COREBOOT_VERSION -vendor: - .asciz CONFIG_MAINBOARD_VENDOR -part: - .asciz CONFIG_MAINBOARD_PART_NUMBER -.long __id_end - ver /* Reverse offset to the vendor id */ -.long __id_end - vendor /* Reverse offset to the vendor id */ -.long __id_end - part /* Reverse offset to the part number */ -.long CONFIG_ROM_SIZE /* Size of this romimage */ - .globl __id_end - -__id_end: diff --git a/src/lib/program.ld b/src/lib/program.ld index 94ba409ced2e..d419ab60b1d4 100644 --- a/src/lib/program.ld +++ b/src/lib/program.ld @@ -15,9 +15,6 @@ _text = .; *(.text._start); *(.text.stage_entry); -#if !ENV_X86 && (ENV_DECOMPRESSOR || ENV_BOOTBLOCK && !CONFIG(COMPRESS_BOOTBLOCK)) - KEEP(*(.id)); -#endif KEEP(*(.metadata_hash_anchor)); *(.text); *(.text.*); |