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>

20 files changed, 28 insertions, 28 deletions

diff --git a/src/drivers/intel/fsp/Makefile.inc b/src/drivers/intel/fsp/Makefile.inc
index 7e79c08c208b..71d676d75944 100644
--- a/src/drivers/intel/fsp/Makefile.inc
+++ b/src/drivers/intel/fsp/Makefile.inc
@@ -33,7 +33,7 @@ ifeq ($(CONFIG_HAVE_FSP_BIN),y)
 cbfs-files-y += fsp.bin
 fsp.bin-file := $(call strip_quotes,$(CONFIG_FSP_FILE))
 fsp.bin-position := $(CONFIG_FSP_LOC)
-fsp.bin-type := 0xab
+fsp.bin-type := fsp
 endif
 
 ifeq ($(CONFIG_ENABLE_MRC_CACHE),y)
@@ -45,5 +45,5 @@ $(obj)/mrc.cache:
 cbfs-files-y += mrc.cache
 mrc.cache-file := $(obj)/mrc.cache
 mrc.cache-position := $(CONFIG_MRC_CACHE_LOC)
-mrc.cache-type := 0xac
+mrc.cache-type := mrc_cache
 endif
diff --git a/src/mainboard/gizmosphere/gizmo/Makefile.inc b/src/mainboard/gizmosphere/gizmo/Makefile.inc
index 64d582cfe949..10a15e3afd3c 100644
--- a/src/mainboard/gizmosphere/gizmo/Makefile.inc
+++ b/src/mainboard/gizmosphere/gizmo/Makefile.inc
@@ -51,4 +51,4 @@ $(SPD_BIN): $(SPD_DEPS)
 
 cbfs-files-y += spd.bin
 spd.bin-file := $(SPD_BIN)
-spd.bin-type := 0xab
+spd.bin-type := spd
diff --git a/src/mainboard/gizmosphere/gizmo2/Makefile.inc b/src/mainboard/gizmosphere/gizmo2/Makefile.inc
index 4d521acea350..8a1c388337b8 100644
--- a/src/mainboard/gizmosphere/gizmo2/Makefile.inc
+++ b/src/mainboard/gizmosphere/gizmo2/Makefile.inc
@@ -44,4 +44,4 @@ $(SPD_BIN): $(SPD_DEPS)
 
 cbfs-files-y += spd.bin
 spd.bin-file := $(SPD_BIN)
-spd.bin-type := 0xab
+spd.bin-type := spd
diff --git a/src/mainboard/google/bolt/Makefile.inc b/src/mainboard/google/bolt/Makefile.inc
index e30d0ae73fae..e6c6eb3197f0 100644
--- a/src/mainboard/google/bolt/Makefile.inc
+++ b/src/mainboard/google/bolt/Makefile.inc
@@ -42,4 +42,4 @@ $(SPD_BIN): $(SPD_DEPS)
 
 cbfs-files-y += spd.bin
 spd.bin-file := $(SPD_BIN)
-spd.bin-type := 0xab
+spd.bin-type := spd
diff --git a/src/mainboard/google/falco/Makefile.inc b/src/mainboard/google/falco/Makefile.inc
index 5ebab67e0331..fbc24622bacf 100644
--- a/src/mainboard/google/falco/Makefile.inc
+++ b/src/mainboard/google/falco/Makefile.inc
@@ -50,4 +50,4 @@ $(SPD_BIN): $(SPD_DEPS)
 
 cbfs-files-y += spd.bin
 spd.bin-file := $(SPD_BIN)
-spd.bin-type := 0xab
+spd.bin-type := spd
diff --git a/src/mainboard/google/link/Makefile.inc b/src/mainboard/google/link/Makefile.inc
index b8899e301209..62746adbeaee 100644
--- a/src/mainboard/google/link/Makefile.inc
+++ b/src/mainboard/google/link/Makefile.inc
@@ -41,4 +41,4 @@ $(SPD_BIN): $(SPD_DEPS)
 
 cbfs-files-y += spd.bin
 spd.bin-file := $(SPD_BIN)
-spd.bin-type := 0xab
+spd.bin-type := spd
diff --git a/src/mainboard/google/peppy/Makefile.inc b/src/mainboard/google/peppy/Makefile.inc
index 86b908289f11..96c63f0f9ceb 100644
--- a/src/mainboard/google/peppy/Makefile.inc
+++ b/src/mainboard/google/peppy/Makefile.inc
@@ -49,4 +49,4 @@ $(SPD_BIN): $(SPD_DEPS)
 
 cbfs-files-y += spd.bin
 spd.bin-file := $(SPD_BIN)
-spd.bin-type := 0xab
+spd.bin-type := spd
diff --git a/src/mainboard/google/rambi/spd/Makefile.inc b/src/mainboard/google/rambi/spd/Makefile.inc
index fb0335fb5ae5..2e7d75025a9d 100644
--- a/src/mainboard/google/rambi/spd/Makefile.inc
+++ b/src/mainboard/google/rambi/spd/Makefile.inc
@@ -46,4 +46,4 @@ $(SPD_BIN): $(SPD_DEPS)
 
 cbfs-files-y += spd.bin
 spd.bin-file := $(SPD_BIN)
-spd.bin-type := 0xab
+spd.bin-type := spd
diff --git a/src/mainboard/google/samus/spd/Makefile.inc b/src/mainboard/google/samus/spd/Makefile.inc
index 4d5257e8f9c0..df63118bed99 100644
--- a/src/mainboard/google/samus/spd/Makefile.inc
+++ b/src/mainboard/google/samus/spd/Makefile.inc
@@ -51,4 +51,4 @@ $(SPD_BIN): $(SPD_DEPS)
 
 cbfs-files-y += spd.bin
 spd.bin-file := $(SPD_BIN)
-spd.bin-type := 0xab
+spd.bin-type := spd
diff --git a/src/mainboard/google/slippy/Makefile.inc b/src/mainboard/google/slippy/Makefile.inc
index 37378b1f84a6..ec75717df54f 100644
--- a/src/mainboard/google/slippy/Makefile.inc
+++ b/src/mainboard/google/slippy/Makefile.inc
@@ -43,4 +43,4 @@ $(SPD_BIN): $(SPD_DEPS)
 
 cbfs-files-y += spd.bin
 spd.bin-file := $(SPD_BIN)
-spd.bin-type := 0xab
+spd.bin-type := spd
diff --git a/src/mainboard/pcengines/apu1/Makefile.inc b/src/mainboard/pcengines/apu1/Makefile.inc
index 3695daa4709a..904dfbe0f90f 100644
--- a/src/mainboard/pcengines/apu1/Makefile.inc
+++ b/src/mainboard/pcengines/apu1/Makefile.inc
@@ -53,4 +53,4 @@ $(SPD_BIN): $(SPD_DEPS)
 
 cbfs-files-y += spd.bin
 spd.bin-file := $(SPD_BIN)
-spd.bin-type := 0xab
+spd.bin-type := spd
diff --git a/src/mainboard/samsung/lumpy/Makefile.inc b/src/mainboard/samsung/lumpy/Makefile.inc
index a6be0c23cf86..18041910a235 100644
--- a/src/mainboard/samsung/lumpy/Makefile.inc
+++ b/src/mainboard/samsung/lumpy/Makefile.inc
@@ -30,4 +30,4 @@ $(SPD_BIN):
 
 cbfs-files-y += spd.bin
 spd.bin-file := $(SPD_BIN)
-spd.bin-type := 0xab
+spd.bin-type := spd
diff --git a/src/mainboard/siemens/mc_tcu3/Makefile.inc b/src/mainboard/siemens/mc_tcu3/Makefile.inc
index 91d4bd21ff76..e6ec0ad1e115 100644
--- a/src/mainboard/siemens/mc_tcu3/Makefile.inc
+++ b/src/mainboard/siemens/mc_tcu3/Makefile.inc
@@ -27,25 +27,25 @@ ramstage-y += ptn3460.c
 
 cbfs-files-y += hwinfo.hex
 hwinfo.hex-file := hwinfo.hex
-hwinfo.hex-type := 0x50
+hwinfo.hex-type := raw
 hwinfo.hex-align := 0x1000
 
 cbfs-files-y += version.hex
 version.hex-file := version.hex
-version.hex-type := 0x50
+version.hex-type := raw
 
 cbfs-files-y += hwinfo10.hex
 hwinfo10.hex-file := hwinfo10.hex
-hwinfo10.hex-type := 0x50
+hwinfo10.hex-type := raw
 
 cbfs-files-y += hwinfo12.hex
 hwinfo12.hex-file := hwinfo12.hex
-hwinfo12.hex-type := 0x50
+hwinfo12.hex-type := raw
 
 cbfs-files-y += hwinfo15.hex
 hwinfo15.hex-file := hwinfo15.hex
-hwinfo15.hex-type := 0x50
+hwinfo15.hex-type := raw
 
 cbfs-files-y += hwinfo19.hex
 hwinfo19.hex-file := hwinfo19.hex
-hwinfo19.hex-type := 0x50
+hwinfo19.hex-type := raw
diff --git a/src/northbridge/intel/haswell/Makefile.inc b/src/northbridge/intel/haswell/Makefile.inc
index c8ebcdb99ab0..ab7e6ef64053 100644
--- a/src/northbridge/intel/haswell/Makefile.inc
+++ b/src/northbridge/intel/haswell/Makefile.inc
@@ -38,7 +38,7 @@ smm-$(CONFIG_HAVE_SMI_HANDLER) += finalize.c
 cbfs-files-$(CONFIG_HAVE_MRC) += mrc.bin
 mrc.bin-file := $(call strip_quotes,$(CONFIG_MRC_FILE))
 mrc.bin-position := 0xfffa0000
-mrc.bin-type := 0xab
+mrc.bin-type := mrc
 
 ifneq ($(CONFIG_CHROMEOS),y)
 $(obj)/mrc.cache: $(obj)/config.h
@@ -49,6 +49,6 @@ $(obj)/mrc.cache: $(obj)/config.h
 cbfs-files-y += mrc.cache
 mrc.cache-file := $(obj)/mrc.cache
 mrc.cache-position := 0xfffe0000
-mrc.cache-type := 0xac
+mrc.cache-type := mrc_cache
 endif
 
diff --git a/src/northbridge/intel/nehalem/Makefile.inc b/src/northbridge/intel/nehalem/Makefile.inc
index 13275f6db064..ff656280ec2c 100644
--- a/src/northbridge/intel/nehalem/Makefile.inc
+++ b/src/northbridge/intel/nehalem/Makefile.inc
@@ -40,5 +40,5 @@ $(obj)/mrc.cache:
 cbfs-files-y += mrc.cache
 mrc.cache-file := $(obj)/mrc.cache
 mrc.cache-position := 0xfffe0000
-mrc.cache-type := 0xac
+mrc.cache-type := mrc_cache
 
diff --git a/src/northbridge/intel/sandybridge/Makefile.inc b/src/northbridge/intel/sandybridge/Makefile.inc
index 5d757a471e2b..3930a6e22b77 100644
--- a/src/northbridge/intel/sandybridge/Makefile.inc
+++ b/src/northbridge/intel/sandybridge/Makefile.inc
@@ -47,7 +47,7 @@ smm-$(CONFIG_HAVE_SMI_HANDLER) += finalize.c
 cbfs-files-$(CONFIG_HAVE_MRC) += mrc.bin
 mrc.bin-file := $(call strip_quotes,$(CONFIG_MRC_FILE))
 mrc.bin-position := 0xfffa0000
-mrc.bin-type := 0xab
+mrc.bin-type := mrc
 
 ifneq ($(CONFIG_CHROMEOS),y)
 $(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_SANDYBRIDGE_NATIVE) := 0xfffe0000
 mrc.cache-position := $(mrc-cache-position-y)
-mrc.cache-type := 0xac
+mrc.cache-type := mrc_cache
 endif
 
diff --git a/src/soc/intel/baytrail/Makefile.inc b/src/soc/intel/baytrail/Makefile.inc
index 4d941b749d5b..c79df34051ab 100644
--- a/src/soc/intel/baytrail/Makefile.inc
+++ b/src/soc/intel/baytrail/Makefile.inc
@@ -98,6 +98,6 @@ mrcelfentry = $(shell $(READELF_x86_32) -h -W $(CONFIG_MRC_FILE) | grep 'Entry p
 cbfs-files-$(CONFIG_HAVE_MRC) += mrc.bin
 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-type := 0xab
+mrc.bin-type := mrc
 
 PHONY += baytrail_add_me
diff --git a/src/soc/intel/broadwell/Makefile.inc b/src/soc/intel/broadwell/Makefile.inc
index 293918dcdb98..b990e1b7187b 100644
--- a/src/soc/intel/broadwell/Makefile.inc
+++ b/src/soc/intel/broadwell/Makefile.inc
@@ -127,4 +127,4 @@ mrcelfentry = $(shell $(READELF_x86_32) -h -W $(CONFIG_MRC_FILE) | grep 'Entry p
 cbfs-files-$(CONFIG_HAVE_MRC) += mrc.bin
 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-type := 0xab
+mrc.bin-type := mrc
diff --git a/src/soc/nvidia/tegra132/Makefile.inc b/src/soc/nvidia/tegra132/Makefile.inc
index 38d7bc751ced..10d4d4e5f08e 100644
--- a/src/soc/nvidia/tegra132/Makefile.inc
+++ b/src/soc/nvidia/tegra132/Makefile.inc
@@ -123,4 +123,4 @@ MTS_FILE = $(MTS_DIR)/mts_cr.bin
 MTS_FILE_CBFS = mts
 cbfs-files-y += $(MTS_FILE_CBFS)
 $(MTS_FILE_CBFS)-file := $(MTS_FILE)
-$(MTS_FILE_CBFS)-type := 0x50
+$(MTS_FILE_CBFS)-type := raw
diff --git a/src/southbridge/intel/sch/Makefile.inc b/src/southbridge/intel/sch/Makefile.inc
index b321a6c4ca31..0bdd4759e39a 100644
--- a/src/southbridge/intel/sch/Makefile.inc
+++ b/src/southbridge/intel/sch/Makefile.inc
@@ -37,5 +37,5 @@ smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
 # We don't ship that, but booting without it is bound to fail
 cbfs-files-$(CONFIG_HAVE_CMC) += cmc.bin
 cmc.bin-file := $(call strip_quotes,$(CONFIG_CMC_FILE))
-cmc.bin-type := 0xaa
+cmc.bin-type := raw
 cmc.bin-position := 0xfffd0000