[coreboot-gerrit] New patch to review for coreboot: Makefiles: update cbfs types from bare numbers to values

[Martin Roth (martinroth@google.com)]

Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16646

-gerrit

commit af5d4283646cf8fa52926a33dc8786c1b51216c5
Author: Martin Roth <martinroth at google.com>
Date:   Mon Sep 19 13:58:01 2016 -0600

    Makefiles: update cbfs types from bare numbers to values
    
    These values are found in util/cbfstool/cbfs.h.
    
    Change-Id: Iea4807b272c0309ac3283e5a3f5e135da6c5eb66
    Signed-off-by: Martin Roth <martinroth at google.com>
---
 src/arch/x86/Makefile.inc                         | 2 +-
 src/drivers/pc80/rtc/Makefile.inc                 | 2 +-
 src/mainboard/google/auron/spd/Makefile.inc       | 2 +-
 src/mainboard/google/auron_paine/spd/Makefile.inc | 2 +-
 src/soc/nvidia/tegra210/Makefile.inc              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 8357588..782ca63 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -25,7 +25,7 @@ ifeq ($(CONFIG_HAVE_OPTION_TABLE),y)
 
 cbfs-files-y += cmos_layout.bin
 cmos_layout.bin-file = $(obj)/cmos_layout.bin
-cmos_layout.bin-type = 0x01aa
+cmos_layout.bin-type = cmos_layout
 
 $(obj)/cmos_layout.bin: $(NVRAMTOOL) $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout
 	@printf "    OPTION     $(subst $(obj)/,,$(@))\n"
diff --git a/src/drivers/pc80/rtc/Makefile.inc b/src/drivers/pc80/rtc/Makefile.inc
index d3b3344..7d8ed50 100644
--- a/src/drivers/pc80/rtc/Makefile.inc
+++ b/src/drivers/pc80/rtc/Makefile.inc
@@ -8,7 +8,7 @@ ramstage-$(CONFIG_DRIVERS_MC146818) += mc146818rtc.c
 
 cbfs-files-$(CONFIG_HAVE_CMOS_DEFAULT) += cmos.default
 cmos.default-file = $(CONFIG_CMOS_DEFAULT_FILE):nvramtool
-cmos.default-type = 0xaa
+cmos.default-type = cmos_default
 
 smm-$(CONFIG_DRIVERS_MC146818) += mc146818rtc.c
 
diff --git a/src/mainboard/google/auron/spd/Makefile.inc b/src/mainboard/google/auron/spd/Makefile.inc
index 1695871..bf9ce14 100644
--- a/src/mainboard/google/auron/spd/Makefile.inc
+++ b/src/mainboard/google/auron/spd/Makefile.inc
@@ -39,4 +39,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/auron_paine/spd/Makefile.inc b/src/mainboard/google/auron_paine/spd/Makefile.inc
index 6350fc9..ae790c1 100644
--- a/src/mainboard/google/auron_paine/spd/Makefile.inc
+++ b/src/mainboard/google/auron_paine/spd/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/soc/nvidia/tegra210/Makefile.inc b/src/soc/nvidia/tegra210/Makefile.inc
index 84d59d7..756d413 100644
--- a/src/soc/nvidia/tegra210/Makefile.inc
+++ b/src/soc/nvidia/tegra210/Makefile.inc
@@ -161,6 +161,6 @@ MTC_FILE = $(MTC_DIR)/$(CONFIG_MTC_FILE)
 MTC_FILE_CBFS = $(CONFIG_MTC_FILE)
 cbfs-files-$(CONFIG_HAVE_MTC) += $(MTC_FILE_CBFS)
 $(MTC_FILE_CBFS)-file := $(MTC_FILE)
-$(MTC_FILE_CBFS)-type := 0x50
+$(MTC_FILE_CBFS)-type := raw
 
 endif