diff options
| -rw-r--r-- | Makefile.inc | 6 | ||||
| -rw-r--r-- | src/arch/x86/Makefile.inc | 8 | ||||
| -rw-r--r-- | src/security/vboot/Makefile.inc | 6 | ||||
| -rw-r--r-- | toolchain.inc | 2 |
4 files changed, 8 insertions, 14 deletions
diff --git a/Makefile.inc b/Makefile.inc index fdbbdee21a..dc5272efb5 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -182,9 +182,9 @@ ramstage-postprocess=$$(eval DEPENDENCIES+=$$(addsuffix .d,$$(basename $(1)))) \ $(eval $(d)ramstage.a: $(call files-in-dir,$(d),$(filter-out %.ld,$(1))); rm -f $$@ && $(AR_ramstage) rcsT $$@ $$^ ) \ $(eval ramstage-objs:=$(d)ramstage.a $(filter-out $(filter-out %.ld, $(call files-in-dir,$(d),$(1))),$(ramstage-objs)))) -decompressor-generic-ccopts += -D__PRE_RAM__ -D__DECOMPRESSOR__ -bootblock-generic-ccopts += -D__PRE_RAM__ -D__BOOTBLOCK__ -romstage-generic-ccopts += -D__PRE_RAM__ -D__ROMSTAGE__ +decompressor-generic-ccopts += -D__DECOMPRESSOR__ +bootblock-generic-ccopts += -D__BOOTBLOCK__ +romstage-generic-ccopts += -D__ROMSTAGE__ ramstage-generic-ccopts += -D__RAMSTAGE__ ifeq ($(CONFIG_TRACE),y) ramstage-c-ccopts += -finstrument-functions diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 737f254d6b..6f47e884a4 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -147,9 +147,9 @@ $(call src-to-obj,bootblock,$(dir)/bootblock_romcc.S): $(objgenerated)/bootblock bootblock-y += bootblock.ld $(call src-to-obj,bootblock,$(dir)/bootblock.ld): $(objgenerated)/bootblock.ld -bootblock_romccflags := -mcpu=i386 -O2 -D__PRE_RAM__ -D__BOOTBLOCK__ +bootblock_romccflags := -mcpu=i386 -O2 -D__BOOTBLOCK__ ifeq ($(CONFIG_SSE),y) -bootblock_romccflags := -mcpu=k7 -mno-mmx -msse -O2 -D__PRE_RAM__ -D__BOOTBLOCK__ +bootblock_romccflags := -mcpu=k7 -mno-mmx -msse -O2 -D__BOOTBLOCK__ endif # This is a hack in case there are no per chipset linker files. @@ -165,9 +165,9 @@ $(objgenerated)/bootblock.ld: $$(filter-out $(call src-to-obj,bootblock,src/arch $(objgenerated)/bootblock.inc: $(src)/arch/x86/$(subst ",,$(CONFIG_BOOTBLOCK_SOURCE)) $(objutil)/romcc/romcc $(OPTION_TABLE_H) $(KCONFIG_AUTOHEADER) # The open quote in the subst messes with syntax highlighting. Fix it - ") @printf " ROMCC $(subst $(obj)/,,$(@))\n" - $(CC_bootblock) -D__ROMCC__ -D__PRE_RAM__ -D__BOOTBLOCK__ $(CPPFLAGS_bootblock) -MM -MT$(objgenerated)/bootblock.inc \ + $(CC_bootblock) -D__ROMCC__ -D__BOOTBLOCK__ $(CPPFLAGS_bootblock) -MM -MT$(objgenerated)/bootblock.inc \ $< > $(objgenerated)/bootblock.inc.d - $(CC_bootblock) -D__ROMCC__ -D__PRE_RAM__ -D__BOOTBLOCK__ $(CPPFLAGS_bootblock) -E \ + $(CC_bootblock) -D__ROMCC__ -D__BOOTBLOCK__ $(CPPFLAGS_bootblock) -E \ $< -o $(objgenerated)/bootblock_romcc.c $(ROMCC) -c -S $(bootblock_romccflags) -I. $(CPPFLAGS_bootblock) $< -o $@ diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc index 30c947c34d..010a06cfa7 100644 --- a/src/security/vboot/Makefile.inc +++ b/src/security/vboot/Makefile.inc @@ -22,12 +22,6 @@ ramstage-y += bootmode.c verstage-y += bootmode.c postcar-y += bootmode.c -# When VBOOT_STARTS_IN_ROMSTAGE is selected, DRAM is already up by -# the time verstage runs. -ifneq ($(CONFIG_VBOOT_STARTS_IN_ROMSTAGE),y) -verstage-generic-ccopts += -D__PRE_RAM__ -endif - verstage-generic-ccopts += -D__VERSTAGE__ ramstage-y += gbb.c diff --git a/toolchain.inc b/toolchain.inc index af085b4cad..c3aa3e50fa 100644 --- a/toolchain.inc +++ b/toolchain.inc @@ -70,7 +70,7 @@ CFLAGS_ppc64 += # stack use, we use 1.5K as heuristic, assuming that we typically have lots # of tiny stack frames and the odd large one. # -# Store larger buffers in BSS, use MAYBE_STATIC_BSS to share code with __PRE_RAM__ +# Store larger buffers in BSS, use MAYBE_STATIC_BSS to share data in cache-as-ram # on x86. # Since GCCs detection of dynamic array bounds unfortunately seems to be # very basic, you'll sometimes have to use a static upper bound for the |