diff --git a/conf/machine/chip.conf b/conf/machine/chip.conf
new file mode 100644
index 0000000..b768771
--- /dev/null
+++ b/conf/machine/chip.conf
@@ -0,0 +1,16 @@
+#@TYPE: Machine
+#@NAME: NextThing Co Allwinner a13 C.H.I.P
+#@DESCRIPTION: Machine configuration for the NexThing Co C.H.I.P Board, base on allwinner a13 CPU
+#https://github.com/NextThingCo/CHIP-u-boot
+#https://github.com/NextThingCo/CHIP-linux
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-chip"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-chip"
+PREFERRED_VERSION_linux-chip ?= "4.1.0"
+PREFFERED_VERSION_u-boot-chip ?= "v2015.04%"
+
+require conf/machine/include/sun5i.inc
+
+KERNEL_DEVICETREE = "sun5i-r8-chip.dtb"
+UBOOT_MACHINE_chip = "CHIP_config"
+SUNXI_FEX_FILE = "sys_config/a13/a13-olinuxino.fex"
diff --git a/recipes-bsp/u-boot/u-boot-chip_2015.04.bb b/recipes-bsp/u-boot/u-boot-chip_2015.04.bb
new file mode 100644
index 0000000..ffd2ef3
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-chip_2015.04.bb
@@ -0,0 +1,33 @@
+DESCRIPTION="U-Boot port for NextThing Co C.H.I.P"
+
+require recipes-bsp/u-boot/u-boot.inc
+
+DEPENDS += "dtc-native"
+
+LICENSE = "GPLv2"
+
+LIC_FILES_CHKSUM = "\
+file://Licenses/Exceptions;md5=338a7cb1e52d0d1951f83e15319a3fe7 \
+file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \
+file://Licenses/bsd-3-clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \
+file://Licenses/eCos-2.0.txt;md5=b338cb12196b5175acd3aa63b0a0805c \
+file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+file://Licenses/ibm-pibs.txt;md5=c49502a55e35e0a8a1dc271d944d6dba \
+file://Licenses/isc.txt;md5=ec65f921308235311f34b79d844587eb \
+file://Licenses/lgpl-2.0.txt;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
+file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
+"
+
+COMPATIBLE_MACHINE = "(chip)"
+
+DEFAULT_PREFERENCE_chip="1"
+
+SRC_URI = "git://github.com/NextThingCo/CHIP-u-boot.git;protocol=git;branch=nextthing/CHIP"
+
+SRCREV = "5d88245ade4c64e8fbcb2cdc3917c0640de514ca"
+
+PV = "v2015.04${SRCPV}"
+
+PE = "1"
+
+SPL_BINARY="u-boot-sunxi-with-spl.bin"
diff --git a/recipes-kernel/linux/linux-chip_4.1.0.bb b/recipes-kernel/linux/linux-chip_4.1.0.bb
new file mode 100644
index 0000000..6759da4
--- /dev/null
+++ b/recipes-kernel/linux/linux-chip_4.1.0.bb
@@ -0,0 +1,30 @@
+SECTION = "kernel"
+DESCRIPTION = "NextThingCo CHIP Linux kernel"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i)"
+
+inherit kernel siteinfo
+
+require recipes-kernel/linux/linux-dtb.inc
+
+INC_PR = "r0"
+LOCALVERSION ?= ""
+PACKAGES =+ "kernel-headers"
+FILES_kernel-headers = "${exec_prefix}/src/linux*"
+COMPATIBLE_MACHINE = "(chip|sunxi)"
+
+# Pull in the devicetree files into the rootfs
+RDEPENDS_kernel-base += "kernel-devicetree"
+
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
+
+SRC_URI = "git://github.com/NextThingCo/CHIP-linux.git;protocol=git;branch=nextthing/chip"
+
+SRCREV = "2f59cdfc706266a8ab7b444bf9c0eebc88f9dc3f"
+
+S = "${WORKDIR}/git"
+
+do_configure_prepend() {
+  cp ${WORKDIR}/git/arch/arm/configs/sunxi_defconfig ${B}/.config
+}