diff --git a/meta-wistron/meta-lannister/conf/bblayers.conf.sample b/meta-wistron/meta-lannister/conf/bblayers.conf.sample
new file mode 100644
index 0000000..0dc4192
--- /dev/null
+++ b/meta-wistron/meta-lannister/conf/bblayers.conf.sample
@@ -0,0 +1,19 @@
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "8"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS ?= " \
+  ##OEROOT##/meta \
+  ##OEROOT##/meta-poky \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-aspeed \
+  ##OEROOT##/meta-phosphor \
+  ##OEROOT##/meta-wistron \
+  ##OEROOT##/meta-wistron/meta-lannister \
+  "
diff --git a/meta-wistron/meta-lannister/conf/conf-notes.txt b/meta-wistron/meta-lannister/conf/conf-notes.txt
new file mode 100644
index 0000000..43d4ab0
--- /dev/null
+++ b/meta-wistron/meta-lannister/conf/conf-notes.txt
@@ -0,0 +1,2 @@
+Common targets are:
+    obmc-phosphor-image
diff --git a/meta-wistron/meta-lannister/conf/layer.conf b/meta-wistron/meta-lannister/conf/layer.conf
new file mode 100644
index 0000000..005b995
--- /dev/null
+++ b/meta-wistron/meta-lannister/conf/layer.conf
@@ -0,0 +1,10 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have recipes-* directories, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "lannister"
+BBFILE_PATTERN_lannister = "^${LAYERDIR}/"
+LAYERSERIES_COMPAT_lannister = "honister kirkstone"
diff --git a/meta-wistron/meta-lannister/conf/local.conf.sample b/meta-wistron/meta-lannister/conf/local.conf.sample
new file mode 100644
index 0000000..7a25c39
--- /dev/null
+++ b/meta-wistron/meta-lannister/conf/local.conf.sample
@@ -0,0 +1,18 @@
+MACHINE ??= "lannister"
+DISTRO ?= "openbmc-phosphor"
+PACKAGE_CLASSES ?= "package_ipk"
+SANITY_TESTED_DISTROS:append ?= " *"
+EXTRA_IMAGE_FEATURES += "debug-tweaks"
+USER_CLASSES ?= "buildstats"
+PATCHRESOLVE = "noop"
+BB_DISKMON_DIRS = "\
+    STOPTASKS,${TMPDIR},1G,100K \
+    STOPTASKS,${DL_DIR},1G,100K \
+    STOPTASKS,${SSTATE_DIR},1G,100K \
+    STOPTASKS,/tmp,100M,100K \
+    ABORT,${TMPDIR},100M,1K \
+    ABORT,${DL_DIR},100M,1K \
+    ABORT,${SSTATE_DIR},100M,1K \
+    ABORT,/tmp,10M,1K"
+CONF_VERSION = "2"
+
diff --git a/meta-wistron/meta-lannister/conf/machine/lannister.conf b/meta-wistron/meta-lannister/conf/machine/lannister.conf
new file mode 100644
index 0000000..5377db0
--- /dev/null
+++ b/meta-wistron/meta-lannister/conf/machine/lannister.conf
@@ -0,0 +1,22 @@
+KMACHINE = "aspeed"
+KERNEL_DEVICETREE = "${KMACHINE}-bmc-wistron-${MACHINE}.dtb"
+
+require conf/machine/include/wistron.inc
+require conf/machine/include/ast2600.inc
+require conf/machine/include/obmc-bsp-common.inc
+
+UBOOT_MACHINE = "ast2600_openbmc_defconfig"
+UBOOT_DEVICETREE = "ast2600-intel"
+SPL_BINARY = "spl/u-boot-spl.bin"
+SOCSEC_SIGN_ENABLE = "0"
+
+SERIAL_CONSOLES = "115200;ttyS4"
+
+FLASH_SIZE = "65536"
+
+OBMC_MACHINE_FEATURES += "\
+        obmc-chassis-state-mgmt \
+        obmc-host-state-mgmt \
+        "
+VIRTUAL-RUNTIME_obmc-host-state-manager ?= "x86-power-control"
+VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control"
diff --git a/meta-wistron/meta-lannister/recipes-kernel/linux/linux-aspeed/lannister.cfg b/meta-wistron/meta-lannister/recipes-kernel/linux/linux-aspeed/lannister.cfg
new file mode 100644
index 0000000..4770e58
--- /dev/null
+++ b/meta-wistron/meta-lannister/recipes-kernel/linux/linux-aspeed/lannister.cfg
@@ -0,0 +1,21 @@
+CONFIG_SENSORS_ASPEED=n
+CONFIG_SENSORS_ASPEED_G6=y
+CONFIG_SPI_ASPEED_SMC=y
+CONFIG_SPI_FMC=y
+CONFIG_I3C=y
+CONFIG_DW_I3C_MASTER=y
+CONFIG_ASPEED_I3C_MASTER=y
+CONFIG_I3CDEV=y
+CONFIG_U_SERIAL_CONSOLE=n
+CONFIG_HIGHMEM=n
+CONFIG_I2C_SLAVE_MQUEUE=y
+CONFIG_PINCTRL_ASPEED_G6=y
+CONFIG_DEBUG_LL=n
+CONFIG_DEBUG_LL_UART_8250=n
+CONFIG_EARLY_PRINTK=n
+CONFIG_LOG_BUF_SHIFT=21
+CONFIG_DEBUG_PINCTRL=n
+CONFIG_SUSPEND=n
+CONFIG_ASPEED_MCTP=y
+CONFIG_KERNEL_LZO=n
+CONFIG_KERNEL_XZ=y
diff --git a/meta-wistron/meta-lannister/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-wistron/meta-lannister/recipes-kernel/linux/linux-aspeed_%.bbappend
new file mode 100644
index 0000000..0efdee9
--- /dev/null
+++ b/meta-wistron/meta-lannister/recipes-kernel/linux/linux-aspeed_%.bbappend
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+KERNEL_VERSION_SANITY_SKIP="1"
+SRC_URI += "\
+	file://lannister.cfg \
+	"