From 8e30f9cbae57f46e42f1e4a3126c48fa610e7d19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rikard=20S=C3=B6derstr=C3=B6m?=
 <soderstrom.rikard@gmail.com>
Date: Fri, 14 Aug 2015 15:56:28 +0200
Subject: [PATCH] Added NextThingCo C.H.I.P machine configuration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signoff: Rikard Söderström <rikard.soderstrom@gmail.com>
---
 conf/machine/chip.conf                    |  9 +++---
 recipes-bsp/u-boot/u-boot-chip_2015.10.bb | 35 +++++++++++++++++++++++
 recipes-kernel/linux/linux-chip_4.3.0.bb  | 25 ++++++++++++++++
 3 files changed, 64 insertions(+), 5 deletions(-)
 create mode 100644 recipes-bsp/u-boot/u-boot-chip_2015.10.bb
 create mode 100644 recipes-kernel/linux/linux-chip_4.3.0.bb

diff --git a/conf/machine/chip.conf b/conf/machine/chip.conf
index b768771..9a0bd5b 100644
--- a/conf/machine/chip.conf
+++ b/conf/machine/chip.conf
@@ -1,16 +1,15 @@
 #@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
+#@NAME: NextThing Co C.H.I.P - Allwinner R8
+#@DESCRIPTION: Machine configuration for the NexThing Co C.H.I.P Board, based on Allwinner R8
 #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%"
+PREFERRED_VERSION_linux-chip ?= "4.3.0"
+PREFFERED_VERSION_u-boot-chip ?= "v2015.10%"
 
 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.10.bb b/recipes-bsp/u-boot/u-boot-chip_2015.10.bb
new file mode 100644
index 0000000..17db1e3
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-chip_2015.10.bb
@@ -0,0 +1,35 @@
+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/2015.10/chip \
+    file://uboot-env-chip"
+
+SRCREV = "79e0a6e1bb9003e43c756c0cacfc99b2a9c76b88"
+
+PV = "v2015.10${SRCPV}"
+
+PE = "1"
+
+SPL_BINARY="u-boot-sunxi-with-spl.bin"
diff --git a/recipes-kernel/linux/linux-chip_4.3.0.bb b/recipes-kernel/linux/linux-chip_4.3.0.bb
new file mode 100644
index 0000000..9211eed
--- /dev/null
+++ b/recipes-kernel/linux/linux-chip_4.3.0.bb
@@ -0,0 +1,25 @@
+SECTION = "kernel"
+DESCRIPTION = "NextThingCo CHIP Linux kernel"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+COMPATIBLE_MACHINE = "(chip)"
+
+inherit kernel siteinfo
+
+require recipes-kernel/linux/linux-dtb.inc
+
+INC_PR = "r0"
+LOCALVERSION ?= ""
+PACKAGES =+ "kernel-headers"
+FILES_kernel-headers = "${exec_prefix}/src/linux*"
+
+# 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/4.3/chip"
+
+SRCREV = "713c5d272aa0db19ba6440597bcb32b68cb2ab2f"
+
+S = "${WORKDIR}/git"