summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/baytrail/Kconfig4
-rw-r--r--src/soc/intel/baytrail/Makefile.inc1
-rw-r--r--src/soc/intel/baytrail/bootblock/Makefile.inc1
-rw-r--r--src/soc/intel/braswell/Kconfig4
-rw-r--r--src/soc/intel/braswell/Makefile.inc1
-rw-r--r--src/soc/intel/braswell/bootblock/Makefile.inc1
-rw-r--r--src/soc/intel/broadwell/Kconfig4
-rw-r--r--src/soc/intel/broadwell/Makefile.inc1
-rw-r--r--src/soc/intel/broadwell/bootblock/Makefile.inc1
-rw-r--r--src/soc/intel/skylake/Kconfig4
-rw-r--r--src/soc/intel/skylake/Makefile.inc1
-rw-r--r--src/soc/intel/skylake/bootblock/Makefile.inc1
12 files changed, 16 insertions, 8 deletions
diff --git a/src/soc/intel/baytrail/Kconfig b/src/soc/intel/baytrail/Kconfig
index 5754c15968..921f568fa9 100644
--- a/src/soc/intel/baytrail/Kconfig
+++ b/src/soc/intel/baytrail/Kconfig
@@ -171,4 +171,8 @@ config REFCODE_BLOB_FILE
endif # HAVE_REFCODE_BLOB
+config CHIPSET_BOOTBLOCK_INCLUDE
+ string
+ default "soc/intel/baytrail/bootblock/timestamp.inc"
+
endif
diff --git a/src/soc/intel/baytrail/Makefile.inc b/src/soc/intel/baytrail/Makefile.inc
index 741752603b..e8c5022c2e 100644
--- a/src/soc/intel/baytrail/Makefile.inc
+++ b/src/soc/intel/baytrail/Makefile.inc
@@ -1,6 +1,5 @@
ifeq ($(CONFIG_SOC_INTEL_BAYTRAIL),y)
-subdirs-y += bootblock
subdirs-y += microcode
subdirs-y += romstage
subdirs-y += ../../../cpu/x86/lapic
diff --git a/src/soc/intel/baytrail/bootblock/Makefile.inc b/src/soc/intel/baytrail/bootblock/Makefile.inc
deleted file mode 100644
index 3a4025198c..0000000000
--- a/src/soc/intel/baytrail/bootblock/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-chipset_bootblock_inc += $(src)/soc/intel/baytrail/bootblock/timestamp.inc
diff --git a/src/soc/intel/braswell/Kconfig b/src/soc/intel/braswell/Kconfig
index 4c9c8aadb5..ab99a08724 100644
--- a/src/soc/intel/braswell/Kconfig
+++ b/src/soc/intel/braswell/Kconfig
@@ -198,4 +198,8 @@ config ME_BIN_PATH
depends on HAVE_ME_BIN
default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/me.bin"
+config CHIPSET_BOOTBLOCK_INCLUDE
+ string
+ default "soc/intel/braswell/bootblock/timestamp.inc"
+
endif
diff --git a/src/soc/intel/braswell/Makefile.inc b/src/soc/intel/braswell/Makefile.inc
index 9bf6cb2676..755c15a0cf 100644
--- a/src/soc/intel/braswell/Makefile.inc
+++ b/src/soc/intel/braswell/Makefile.inc
@@ -1,6 +1,5 @@
ifeq ($(CONFIG_SOC_INTEL_BRASWELL),y)
-subdirs-y += bootblock
subdirs-y += microcode
subdirs-y += romstage
subdirs-y += ../../../cpu/x86/lapic
diff --git a/src/soc/intel/braswell/bootblock/Makefile.inc b/src/soc/intel/braswell/bootblock/Makefile.inc
deleted file mode 100644
index 17d1ee8c5a..0000000000
--- a/src/soc/intel/braswell/bootblock/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-chipset_bootblock_inc += $(src)/soc/intel/braswell/bootblock/timestamp.inc
diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig
index 30c00935a2..c2db2a1e52 100644
--- a/src/soc/intel/broadwell/Kconfig
+++ b/src/soc/intel/broadwell/Kconfig
@@ -272,4 +272,8 @@ config LOCK_MANAGEMENT_ENGINE
If unsure, say N.
+config CHIPSET_BOOTBLOCK_INCLUDE
+ string
+ default "soc/intel/broadwell/bootblock/timestamp.inc"
+
endif
diff --git a/src/soc/intel/broadwell/Makefile.inc b/src/soc/intel/broadwell/Makefile.inc
index 4b14ff809e..ca295fc0d0 100644
--- a/src/soc/intel/broadwell/Makefile.inc
+++ b/src/soc/intel/broadwell/Makefile.inc
@@ -1,6 +1,5 @@
ifeq ($(CONFIG_SOC_INTEL_BROADWELL),y)
-subdirs-y += bootblock
subdirs-y += microcode
subdirs-y += romstage
subdirs-y += ../../../cpu/x86/lapic
diff --git a/src/soc/intel/broadwell/bootblock/Makefile.inc b/src/soc/intel/broadwell/bootblock/Makefile.inc
deleted file mode 100644
index 2ca5a4569f..0000000000
--- a/src/soc/intel/broadwell/bootblock/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-chipset_bootblock_inc += $(src)/soc/intel/broadwell/bootblock/timestamp.inc
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index d53e67e806..843cb8a081 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -200,4 +200,8 @@ config UART_DEBUG
select DRIVERS_UART_8250MEM
select DRIVERS_UART_8250MEM_32
+config CHIPSET_BOOTBLOCK_INCLUDE
+ string
+ default "soc/intel/skylake/bootblock/timestamp.inc"
+
endif
diff --git a/src/soc/intel/skylake/Makefile.inc b/src/soc/intel/skylake/Makefile.inc
index 3bd9823738..32ecb5d60b 100644
--- a/src/soc/intel/skylake/Makefile.inc
+++ b/src/soc/intel/skylake/Makefile.inc
@@ -1,6 +1,5 @@
ifeq ($(CONFIG_SOC_INTEL_SKYLAKE),y)
-subdirs-y += bootblock
subdirs-y += microcode
subdirs-y += romstage
subdirs-y += ../../../cpu/intel/microcode
diff --git a/src/soc/intel/skylake/bootblock/Makefile.inc b/src/soc/intel/skylake/bootblock/Makefile.inc
deleted file mode 100644
index a31f588f58..0000000000
--- a/src/soc/intel/skylake/bootblock/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-chipset_bootblock_inc += $(src)/soc/intel/skylake/bootblock/timestamp.inc