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