GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update hex values to CBFS binary name types in Makefiles 

These binaries were being added to CBFS using hexadecimal values instead
of the CBFS binary type names.  The same value was being used in
different places for different things.
For example, the value 0xAB is used for SPDs, MRC & FSP binaries.

This patch uses CBFS type names instead of hex values everywhere a
hex value was previously used.

Change-Id: Id5ac74c3095eb02a2b39d25104a25933304a8389
Signed-off-by: Martin Roth <gaumless@gmail.com>
Reviewed-on: http://review.coreboot.org/8978
Tested-by: build bot (Jenkins)
Reviewed-by: Marc Jones <marc.jones@se-eng.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Aaron Durbin <adurbin@google.com>
This commit is contained in:
Martin Roth 2015-03-24 16:02:27 -06:00
parent dde307c01a
commit 72a8e5e751
20 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/drivers/intel/fsp/Makefile.inc
View File

@ -33,7 +33,7 @@ ifeq ($(CONFIG_HAVE_FSP_BIN),y)
cbfs-files-y += fsp.bin cbfs-files-y += fsp.bin
fsp.bin-file := $(call strip_quotes,$(CONFIG_FSP_FILE)) fsp.bin-file := $(call strip_quotes,$(CONFIG_FSP_FILE))
fsp.bin-position := $(CONFIG_FSP_LOC) fsp.bin-position := $(CONFIG_FSP_LOC)
fsp.bin-type := 0xab fsp.bin-type := fsp
endif endif
ifeq ($(CONFIG_ENABLE_MRC_CACHE),y) ifeq ($(CONFIG_ENABLE_MRC_CACHE),y)
@ -45,5 +45,5 @@ $(obj)/mrc.cache:
cbfs-files-y += mrc.cache cbfs-files-y += mrc.cache
mrc.cache-file := $(obj)/mrc.cache mrc.cache-file := $(obj)/mrc.cache
mrc.cache-position := $(CONFIG_MRC_CACHE_LOC) mrc.cache-position := $(CONFIG_MRC_CACHE_LOC)
mrc.cache-type := 0xac mrc.cache-type := mrc_cache
endif endif

2
src/mainboard/gizmosphere/gizmo/Makefile.inc
View File

@ -51,4 +51,4 @@ $(SPD_BIN): $(SPD_DEPS)
cbfs-files-y += spd.bin cbfs-files-y += spd.bin
spd.bin-file := $(SPD_BIN) spd.bin-file := $(SPD_BIN)
spd.bin-type := 0xab spd.bin-type := spd

2
src/mainboard/gizmosphere/gizmo2/Makefile.inc
View File

@ -44,4 +44,4 @@ $(SPD_BIN): $(SPD_DEPS)
cbfs-files-y += spd.bin cbfs-files-y += spd.bin
spd.bin-file := $(SPD_BIN) spd.bin-file := $(SPD_BIN)
spd.bin-type := 0xab spd.bin-type := spd

2
src/mainboard/google/bolt/Makefile.inc
View File

@ -42,4 +42,4 @@ $(SPD_BIN): $(SPD_DEPS)
cbfs-files-y += spd.bin cbfs-files-y += spd.bin
spd.bin-file := $(SPD_BIN) spd.bin-file := $(SPD_BIN)
spd.bin-type := 0xab spd.bin-type := spd

2
src/mainboard/google/falco/Makefile.inc
View File

@ -50,4 +50,4 @@ $(SPD_BIN): $(SPD_DEPS)
cbfs-files-y += spd.bin cbfs-files-y += spd.bin
spd.bin-file := $(SPD_BIN) spd.bin-file := $(SPD_BIN)
spd.bin-type := 0xab spd.bin-type := spd

2
src/mainboard/google/link/Makefile.inc
View File

@ -41,4 +41,4 @@ $(SPD_BIN): $(SPD_DEPS)
cbfs-files-y += spd.bin cbfs-files-y += spd.bin
spd.bin-file := $(SPD_BIN) spd.bin-file := $(SPD_BIN)
spd.bin-type := 0xab spd.bin-type := spd

2
src/mainboard/google/peppy/Makefile.inc
View File

@ -49,4 +49,4 @@ $(SPD_BIN): $(SPD_DEPS)
cbfs-files-y += spd.bin cbfs-files-y += spd.bin
spd.bin-file := $(SPD_BIN) spd.bin-file := $(SPD_BIN)
spd.bin-type := 0xab spd.bin-type := spd

2
src/mainboard/google/rambi/spd/Makefile.inc
View File

@ -46,4 +46,4 @@ $(SPD_BIN): $(SPD_DEPS)
cbfs-files-y += spd.bin cbfs-files-y += spd.bin
spd.bin-file := $(SPD_BIN) spd.bin-file := $(SPD_BIN)
spd.bin-type := 0xab spd.bin-type := spd

2
src/mainboard/google/samus/spd/Makefile.inc
View File

@ -51,4 +51,4 @@ $(SPD_BIN): $(SPD_DEPS)
cbfs-files-y += spd.bin cbfs-files-y += spd.bin
spd.bin-file := $(SPD_BIN) spd.bin-file := $(SPD_BIN)
spd.bin-type := 0xab spd.bin-type := spd

2
src/mainboard/google/slippy/Makefile.inc
View File

@ -43,4 +43,4 @@ $(SPD_BIN): $(SPD_DEPS)
cbfs-files-y += spd.bin cbfs-files-y += spd.bin
spd.bin-file := $(SPD_BIN) spd.bin-file := $(SPD_BIN)
spd.bin-type := 0xab spd.bin-type := spd

2
src/mainboard/pcengines/apu1/Makefile.inc
View File

@ -53,4 +53,4 @@ $(SPD_BIN): $(SPD_DEPS)
cbfs-files-y += spd.bin cbfs-files-y += spd.bin
spd.bin-file := $(SPD_BIN) spd.bin-file := $(SPD_BIN)
spd.bin-type := 0xab spd.bin-type := spd

2
src/mainboard/samsung/lumpy/Makefile.inc
View File

@ -30,4 +30,4 @@ $(SPD_BIN):
cbfs-files-y += spd.bin cbfs-files-y += spd.bin
spd.bin-file := $(SPD_BIN) spd.bin-file := $(SPD_BIN)
spd.bin-type := 0xab spd.bin-type := spd

12
src/mainboard/siemens/mc_tcu3/Makefile.inc
View File

@ -27,25 +27,25 @@ ramstage-y += ptn3460.c
cbfs-files-y += hwinfo.hex cbfs-files-y += hwinfo.hex
hwinfo.hex-file := hwinfo.hex hwinfo.hex-file := hwinfo.hex
hwinfo.hex-type := 0x50 hwinfo.hex-type := raw
hwinfo.hex-align := 0x1000 hwinfo.hex-align := 0x1000
cbfs-files-y += version.hex cbfs-files-y += version.hex
version.hex-file := version.hex version.hex-file := version.hex
version.hex-type := 0x50 version.hex-type := raw
cbfs-files-y += hwinfo10.hex cbfs-files-y += hwinfo10.hex
hwinfo10.hex-file := hwinfo10.hex hwinfo10.hex-file := hwinfo10.hex
hwinfo10.hex-type := 0x50 hwinfo10.hex-type := raw
cbfs-files-y += hwinfo12.hex cbfs-files-y += hwinfo12.hex
hwinfo12.hex-file := hwinfo12.hex hwinfo12.hex-file := hwinfo12.hex
hwinfo12.hex-type := 0x50 hwinfo12.hex-type := raw
cbfs-files-y += hwinfo15.hex cbfs-files-y += hwinfo15.hex
hwinfo15.hex-file := hwinfo15.hex hwinfo15.hex-file := hwinfo15.hex
hwinfo15.hex-type := 0x50 hwinfo15.hex-type := raw
cbfs-files-y += hwinfo19.hex cbfs-files-y += hwinfo19.hex
hwinfo19.hex-file := hwinfo19.hex hwinfo19.hex-file := hwinfo19.hex
hwinfo19.hex-type := 0x50 hwinfo19.hex-type := raw

4
src/northbridge/intel/haswell/Makefile.inc
View File

@ -38,7 +38,7 @@ smm-$(CONFIG_HAVE_SMI_HANDLER) += finalize.c
cbfs-files-$(CONFIG_HAVE_MRC) += mrc.bin cbfs-files-$(CONFIG_HAVE_MRC) += mrc.bin
mrc.bin-file := $(call strip_quotes,$(CONFIG_MRC_FILE)) mrc.bin-file := $(call strip_quotes,$(CONFIG_MRC_FILE))
mrc.bin-position := 0xfffa0000 mrc.bin-position := 0xfffa0000
mrc.bin-type := 0xab mrc.bin-type := mrc
ifneq ($(CONFIG_CHROMEOS),y) ifneq ($(CONFIG_CHROMEOS),y)
$(obj)/mrc.cache: $(obj)/config.h $(obj)/mrc.cache: $(obj)/config.h
@ -49,6 +49,6 @@ $(obj)/mrc.cache: $(obj)/config.h
cbfs-files-y += mrc.cache cbfs-files-y += mrc.cache
mrc.cache-file := $(obj)/mrc.cache mrc.cache-file := $(obj)/mrc.cache
mrc.cache-position := 0xfffe0000 mrc.cache-position := 0xfffe0000
mrc.cache-type := 0xac mrc.cache-type := mrc_cache
endif endif

2
src/northbridge/intel/nehalem/Makefile.inc
View File

@ -40,5 +40,5 @@ $(obj)/mrc.cache:
cbfs-files-y += mrc.cache cbfs-files-y += mrc.cache
mrc.cache-file := $(obj)/mrc.cache mrc.cache-file := $(obj)/mrc.cache
mrc.cache-position := 0xfffe0000 mrc.cache-position := 0xfffe0000
mrc.cache-type := 0xac mrc.cache-type := mrc_cache

4
src/northbridge/intel/sandybridge/Makefile.inc
View File

@ -47,7 +47,7 @@ smm-$(CONFIG_HAVE_SMI_HANDLER) += finalize.c
cbfs-files-$(CONFIG_HAVE_MRC) += mrc.bin cbfs-files-$(CONFIG_HAVE_MRC) += mrc.bin
mrc.bin-file := $(call strip_quotes,$(CONFIG_MRC_FILE)) mrc.bin-file := $(call strip_quotes,$(CONFIG_MRC_FILE))
mrc.bin-position := 0xfffa0000 mrc.bin-position := 0xfffa0000
mrc.bin-type := 0xab mrc.bin-type := mrc
ifneq ($(CONFIG_CHROMEOS),y) ifneq ($(CONFIG_CHROMEOS),y)
$(obj)/mrc.cache: $(obj)/config.h $(obj)/mrc.cache: $(obj)/config.h
@ -62,6 +62,6 @@ mrc-cache-position-$(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE) := 0xfffd0000
mrc-cache-position-$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE_NATIVE) := 0xfffe0000 mrc-cache-position-$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE_NATIVE) := 0xfffe0000
mrc-cache-position-$(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE_NATIVE) := 0xfffe0000 mrc-cache-position-$(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE_NATIVE) := 0xfffe0000
mrc.cache-position := $(mrc-cache-position-y) mrc.cache-position := $(mrc-cache-position-y)
mrc.cache-type := 0xac mrc.cache-type := mrc_cache
endif endif

2
src/soc/intel/baytrail/Makefile.inc
View File

@ -98,6 +98,6 @@ mrcelfentry = $(shell $(READELF_x86_32) -h -W $(CONFIG_MRC_FILE) | grep 'Entry p
cbfs-files-$(CONFIG_HAVE_MRC) += mrc.bin cbfs-files-$(CONFIG_HAVE_MRC) += mrc.bin
mrc.bin-file := $(call strip_quotes,$(CONFIG_MRC_FILE)) mrc.bin-file := $(call strip_quotes,$(CONFIG_MRC_FILE))
mrc.bin-position := $(if $(findstring elf,$(CONFIG_MRC_FILE)),$(shell printf "0x%x" $$(( $(mrcelfentry) - $(mrcelfoffset) )) ),$(CONFIG_MRC_BIN_ADDRESS)) mrc.bin-position := $(if $(findstring elf,$(CONFIG_MRC_FILE)),$(shell printf "0x%x" $$(( $(mrcelfentry) - $(mrcelfoffset) )) ),$(CONFIG_MRC_BIN_ADDRESS))
mrc.bin-type := 0xab mrc.bin-type := mrc
PHONY += baytrail_add_me PHONY += baytrail_add_me

2
src/soc/intel/broadwell/Makefile.inc
View File

@ -127,4 +127,4 @@ mrcelfentry = $(shell $(READELF_x86_32) -h -W $(CONFIG_MRC_FILE) | grep 'Entry p
cbfs-files-$(CONFIG_HAVE_MRC) += mrc.bin cbfs-files-$(CONFIG_HAVE_MRC) += mrc.bin
mrc.bin-file := $(call strip_quotes,$(CONFIG_MRC_FILE)) mrc.bin-file := $(call strip_quotes,$(CONFIG_MRC_FILE))
mrc.bin-position := $(if $(findstring elf,$(CONFIG_MRC_FILE)),$(shell printf "0x%x" $$(( $(mrcelfentry) - $(mrcelfoffset) )) ),$(CONFIG_MRC_BIN_ADDRESS)) mrc.bin-position := $(if $(findstring elf,$(CONFIG_MRC_FILE)),$(shell printf "0x%x" $$(( $(mrcelfentry) - $(mrcelfoffset) )) ),$(CONFIG_MRC_BIN_ADDRESS))
mrc.bin-type := 0xab mrc.bin-type := mrc

2
src/soc/nvidia/tegra132/Makefile.inc
View File

@ -123,4 +123,4 @@ MTS_FILE = $(MTS_DIR)/mts_cr.bin
MTS_FILE_CBFS = mts MTS_FILE_CBFS = mts
cbfs-files-y += $(MTS_FILE_CBFS) cbfs-files-y += $(MTS_FILE_CBFS)
$(MTS_FILE_CBFS)-file := $(MTS_FILE) $(MTS_FILE_CBFS)-file := $(MTS_FILE)
$(MTS_FILE_CBFS)-type := 0x50 $(MTS_FILE_CBFS)-type := raw

2
src/southbridge/intel/sch/Makefile.inc
View File

@ -37,5 +37,5 @@ smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
# We don't ship that, but booting without it is bound to fail # We don't ship that, but booting without it is bound to fail
cbfs-files-$(CONFIG_HAVE_CMC) += cmc.bin cbfs-files-$(CONFIG_HAVE_CMC) += cmc.bin
cmc.bin-file := $(call strip_quotes,$(CONFIG_CMC_FILE)) cmc.bin-file := $(call strip_quotes,$(CONFIG_CMC_FILE))
cmc.bin-type := 0xaa cmc.bin-type := raw
cmc.bin-position := 0xfffd0000 cmc.bin-position := 0xfffd0000