From ffbd98f7a91f76b82a2395fda77b1579a5b8751e Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Wed, 22 Feb 2017 14:22:44 +0530 Subject: [PATCH] UPSTREAM: soc/intel/common: Make infrastructure ready for Intel common code Select all Kconfig belongs into Intel SoC Family block/ips common code model and include required header.h file. BUG=none BRANCH=none TEST=none Change-Id: Ic42935d94acc74a950076dce4538e360433aed20 Signed-off-by: Patrick Georgi Original-Commit-Id: 9a0245a84dcdeb3f0cad6ddaa9cd1c56393d6ece Original-Change-Id: Idbce59a57533dbeb9ccfadca966c3d7560537fa0 Original-Signed-off-by: Subrata Banik Original-Reviewed-on: https://review.coreboot.org/18377 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Aaron Durbin Reviewed-on: https://chromium-review.googlesource.com/451259 --- src/soc/intel/common/Kconfig | 4 ++++ src/soc/intel/common/Makefile.inc | 3 +++ src/soc/intel/common/block/Kconfig | 11 +++++++++++ src/soc/intel/common/block/Makefile.inc | 7 +++++++ 4 files changed, 25 insertions(+) create mode 100644 src/soc/intel/common/block/Kconfig create mode 100644 src/soc/intel/common/block/Makefile.inc diff --git a/src/soc/intel/common/Kconfig b/src/soc/intel/common/Kconfig index 68bb38af7a..3d2ced95d6 100644 --- a/src/soc/intel/common/Kconfig +++ b/src/soc/intel/common/Kconfig @@ -5,6 +5,10 @@ config SOC_INTEL_COMMON if SOC_INTEL_COMMON +comment "Intel SoC Common Code" +source "src/soc/intel/common/basecode/Kconfig" +source "src/soc/intel/common/block/Kconfig" + config CACHE_MRC_SETTINGS bool "Save cached MRC settings" default n diff --git a/src/soc/intel/common/Makefile.inc b/src/soc/intel/common/Makefile.inc index 25e51cd70b..acfd0548b2 100644 --- a/src/soc/intel/common/Makefile.inc +++ b/src/soc/intel/common/Makefile.inc @@ -1,5 +1,8 @@ ifeq ($(CONFIG_SOC_INTEL_COMMON),y) +subdirs-y += basecode/ +subdirs-y += block/ + bootblock-y += util.c verstage-$(CONFIG_SOC_INTEL_COMMON_LPSS_I2C) += lpss_i2c.c diff --git a/src/soc/intel/common/block/Kconfig b/src/soc/intel/common/block/Kconfig new file mode 100644 index 0000000000..e5375d2f7c --- /dev/null +++ b/src/soc/intel/common/block/Kconfig @@ -0,0 +1,11 @@ +config SOC_INTEL_COMMON_BLOCK + bool + help + SoC driver for intel common IP code + +if SOC_INTEL_COMMON_BLOCK + +comment "Intel SoC Common IP Code" +source "src/soc/intel/common/block/*/Kconfig" + +endif diff --git a/src/soc/intel/common/block/Makefile.inc b/src/soc/intel/common/block/Makefile.inc new file mode 100644 index 0000000000..d6f53c8ba6 --- /dev/null +++ b/src/soc/intel/common/block/Makefile.inc @@ -0,0 +1,7 @@ +ifeq ($(CONFIG_SOC_INTEL_COMMON_BLOCK),y) + +subdirs-y += ./* + +CPPFLAGS_common += -I$(src)/soc/intel/common/block/include/ + +endif