diff --git a/meta-hr630/conf/bblayers.conf.sample b/meta-hr630/conf/bblayers.conf.sample
new file mode 100644
index 0000000..5ecfead
--- /dev/null
+++ b/meta-hr630/conf/bblayers.conf.sample
@@ -0,0 +1,22 @@
+#"Copyright (c) 2019-present Lenovo
+#Licensed under BSD-3, see COPYING.BSD file for details."
+
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "8"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS ?= " \
+  ##OEROOT##/meta \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-phosphor \
+  ##OEROOT##/meta-aspeed \
+  ##OEROOT##/meta-x86 \
+  ##OEROOT##/meta-google \
+  ##OEROOT##/meta-lenovo \
+  ##OEROOT##/meta-lenovo/meta-hr630 \
+"
diff --git a/meta-hr630/conf/conf-notes.txt b/meta-hr630/conf/conf-notes.txt
new file mode 100644
index 0000000..c0087e2
--- /dev/null
+++ b/meta-hr630/conf/conf-notes.txt
@@ -0,0 +1,5 @@
+#"Copyright (c) 2019-present Lenovo
+#Licensed under BSD-3, see COPYING.BSD file for details."
+
+Common targets are:
+    obmc-phosphor-image
diff --git a/meta-hr630/conf/distro/openbmc-hr630.conf b/meta-hr630/conf/distro/openbmc-hr630.conf
new file mode 100644
index 0000000..f736653
--- /dev/null
+++ b/meta-hr630/conf/distro/openbmc-hr630.conf
@@ -0,0 +1,7 @@
+#"Copyright (c) 2019-present Lenovo
+#Licensed under BSD-3, see COPYING.BSD file for details."
+
+require conf/distro/include/phosphor-base.inc
+
+DISTRO_NAME = "Lenovo Hr630 OpenBMC"
+DISTRO_VERSION = "0.1.2"
diff --git a/meta-hr630/conf/layer.conf b/meta-hr630/conf/layer.conf
new file mode 100644
index 0000000..2cec8b5
--- /dev/null
+++ b/meta-hr630/conf/layer.conf
@@ -0,0 +1,14 @@
+#"Copyright (c) 2019-present Lenovo
+#Licensed under BSD-3, see COPYING.BSD file for details."
+
+# 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 += "hr630-layer"
+BBFILE_PATTERN_hr630-layer = ""
+BBFILE_PRIORITY_hr630-layer = "5"
+LAYERSERIES_COMPAT_hr630-layer = "thud warrior"
diff --git a/meta-hr630/conf/local.conf.sample b/meta-hr630/conf/local.conf.sample
new file mode 100644
index 0000000..3e24b3f
--- /dev/null
+++ b/meta-hr630/conf/local.conf.sample
@@ -0,0 +1,23 @@
+#"Copyright (c) 2019-present Lenovo
+#Licensed under BSD-3, see COPYING.BSD file for details."
+MACHINE ??= "hr630"
+DISTRO ?= "openbmc-hr630"
+PACKAGE_CLASSES ?= "package_rpm"
+SANITY_TESTED_DISTROS_append ?= " *"
+EXTRA_IMAGE_FEATURES = "debug-tweaks"
+USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+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 = "1"
+INHERIT += "extrausers"
+EXTRA_USERS_PARAMS = " \
+  usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
+  "
diff --git a/meta-hr630/conf/machine/hr630.conf b/meta-hr630/conf/machine/hr630.conf
new file mode 100644
index 0000000..04080de
--- /dev/null
+++ b/meta-hr630/conf/machine/hr630.conf
@@ -0,0 +1,25 @@
+#"Copyright (c) 2019-present Lenovo
+#Licensed under BSD-3, see COPYING.BSD file for details."
+
+KMACHINE = "aspeed"
+KERNEL_DEVICETREE = "${KMACHINE}-bmc-lenovo-${MACHINE}.dtb"
+
+UBOOT_MACHINE = "ast_g5_phy_config"
+
+require conf/machine/include/ast2500.inc
+require conf/machine/include/obmc-bsp-common.inc
+require conf/machine/include/lenovo.inc
+
+FLASH_SIZE = "32768"
+
+PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs"
+PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "hr630-led-manager-config-native"
+PREFERRED_PROVIDER_virtual/phosphor-ipmi-sensor-inventory = "hr630-ipmi-sensor-inventory-native"
+PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-read-inventory = "hr630-ipmi-fru-read-inventory-native"
+PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "hr630-ipmi-inventory-map-native"
+PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-properties = "hr630-ipmi-fru-properties-native"
+PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-lenovo-apps"
+PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-lenovo-apps"
+PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-lenovo-apps"
+PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-lenovo-apps"
+PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}"