summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2016-09-19 13:58:01 -0600
committerPatrick Georgi <pgeorgi@google.com>2016-09-21 09:36:11 +0200
commit8ea06512e69f5f5378316021e106732f6c89fbd2 (patch)
tree2386edbb157bf78b2c3acbbbaa62768246d3416f
parent2ab981b87eacd1e2baf29b514b220e5de61af681 (diff)
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@google.com> Reviewed-on: https://review.coreboot.org/16646 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
-rw-r--r--src/arch/x86/Makefile.inc2
-rw-r--r--src/drivers/pc80/rtc/Makefile.inc2
-rw-r--r--src/mainboard/google/auron/spd/Makefile.inc2
-rw-r--r--src/mainboard/google/auron_paine/spd/Makefile.inc2
-rw-r--r--src/soc/nvidia/tegra210/Makefile.inc2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 8357588b3a..782ca636e7 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 d3b3344938..7d8ed50589 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 1695871f2a..bf9ce1427f 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 6350fc98a1..ae790c12ec 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 84d59d7721..756d4137e6 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