Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/33143
Change subject: Rampayload: Able to build coreboot without ramstage ......................................................................
Rampayload: Able to build coreboot without ramstage
This patch removes all possible dependency in order to build platform with CONFIG_RAMSTAGE enable (without ramstage).
Change-Id: Id000dfac2eb57a8eaaa505c89d798fb30b3706fe Signed-off-by: Subrata Banik subrata.banik@intel.com --- M Makefile.inc M src/Kconfig M toolchain.inc 3 files changed, 11 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/43/33143/1
diff --git a/Makefile.inc b/Makefile.inc index d4f7597..c0797fe 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1058,7 +1058,11 @@ FIT_OPTIONS += -q $(FIT_ENTRY) endif
+ifeq ($(CONFIG_RAMPAYLOAD),y) +$(obj)/coreboot.rom: $(obj)/coreboot.pre $(CBFSTOOL) $$(INTERMEDIATE) +else $(obj)/coreboot.rom: $(obj)/coreboot.pre $(objcbfs)/ramstage.elf $(CBFSTOOL) $$(INTERMEDIATE) +endif @printf " CBFS $(subst $(obj)/,,$(@))\n" # The full ROM may be larger than the CBFS part, so create an empty # file (filled with \377 = 0xff) and copy the CBFS image over it. @@ -1128,10 +1132,12 @@ endif # CONFIG_NO_XIP_EARLY_STAGES endif # CONFIG_ARCH_ROMSTAGE_X86_32 / CONFIG_ARCH_ROMSTAGE_X86_64
+ifneq ($(CONFIG_RAMPAYLOAD),y) cbfs-files-y += $(CONFIG_CBFS_PREFIX)/ramstage $(CONFIG_CBFS_PREFIX)/ramstage-file := $(objcbfs)/ramstage.elf $(CONFIG_CBFS_PREFIX)/ramstage-type := stage $(CONFIG_CBFS_PREFIX)/ramstage-compression := $(CBFS_COMPRESS_FLAG) +endif
cbfs-files-$(CONFIG_HAVE_REFCODE_BLOB) += $(CONFIG_CBFS_PREFIX)/refcode $(CONFIG_CBFS_PREFIX)/refcode-file := $(REFCODE_BLOB) diff --git a/src/Kconfig b/src/Kconfig index 4ec6b76..2442a63 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -314,6 +314,7 @@
config RAMPAYLOAD bool "Enable coreboot flow without executing ramstage" + default y if !STAGE_RAMSTAGE default n depends on ARCH_X86 help diff --git a/toolchain.inc b/toolchain.inc index 0486287..9b53d4a 100644 --- a/toolchain.inc +++ b/toolchain.inc @@ -47,7 +47,11 @@ ROMCC=CCC_CC="$(ROMCC_BIN)" $(CC) endif
+ifeq ($(CONFIG_RAMPAYLOAD),y) +COREBOOT_STANDARD_STAGES := decompressor bootblock verstage romstage +else COREBOOT_STANDARD_STAGES := decompressor bootblock verstage romstage ramstage +endif MAP-decompressor := bootblock
ARCHDIR-i386 := x86