sdcard_image-sunxi: fix dependency loop

As suggested by Andrei Gherzan (see #178): "The current implementation inherits sdcard_image-sunxi.bbclass unconditionally which in turn, sets two depends on do_rootfs unconditionally again. This means that if I want to build an initramfs image in the kernel image I will get a dependency loop." Signed-off-by: Enrico Butera <ebutera@users.sourceforge.net> (cherry picked from commit a84d6a40c1)
Merge pull request #179 from koenkooi/uboot-gcc6-morty
2025-07-16 22:09:47 +02:00 · 2017-04-27 10:19:42 +02:00 · 2017-04-25 23:41:52 +02:00 · 2017-04-25 07:49:43 +02:00 · 2017-04-11 21:42:34 +02:00 · 2017-04-06 23:09:47 +02:00
36 changed files with 111 additions and 1188 deletions
--- a/README.md
+++ b/README.md
@ -31,7 +31,7 @@ If you want to switch back to sunxi versions for some reasons (no device tree av

 If you already have built the mainline versions it might be necessary to reset the build directories with:

-	bitbake -c clean virtual/kernel virtual/bootloader
+	bitbake -c clean linux u-boot

 Performance
 ===========
--- a/classes/sdcard_image-sunxi.bbclass
+++ b/classes/sdcard_image-sunxi.bbclass
@ -7,8 +7,8 @@ inherit image_types
 # The disk layout used is:
 #
 #    0                      -> 8*1024                           - reserverd
-#    8*1024                 ->                                  - arm combined spl/u-boot or aarch64 spl
-#    40*1024                ->                                  - aarch64 u-boot
+#    8*1024                 -> 32*1024                          - 
+#    32*1024                -> 2048*1024                        - 
 #    2048*1024              -> BOOT_SPACE                       - bootloader and kernel
 #
 #
@ -20,19 +20,19 @@ IMAGE_TYPEDEP_sunxi-sdimg = "${SDIMG_ROOTFS_TYPE}"
 BOOTDD_VOLUME_ID ?= "${MACHINE}"

 # Boot partition size [in KiB]
-BOOT_SPACE ?= "40960"
+BOOT_SPACE ?= "20480"

 # First partition begin at sector 2048 : 2048*1024 = 2097152
 IMAGE_ROOTFS_ALIGNMENT = "2048"

-# Use an uncompressed ext4 by default as rootfs
+# Use an uncompressed ext3 by default as rootfs
 SDIMG_ROOTFS_TYPE ?= "ext4"
 SDIMG_ROOTFS = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.${SDIMG_ROOTFS_TYPE}"

-do_image_sunxi_sdimg[depends] += " \
-			parted-native:do_populate_sysroot \
-			mtools-native:do_populate_sysroot \
-			dosfstools-native:do_populate_sysroot \
+IMAGE_DEPENDS_sunxi-sdimg += " \
+			parted-native \
+			mtools-native \
+			dosfstools-native \
 			virtual/kernel:do_deploy \
 			virtual/bootloader:do_deploy \
 			"
@ -64,23 +64,17 @@ IMAGE_CMD_sunxi-sdimg () {
 	rm -f ${WORKDIR}/boot.img
 	mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS

-	mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::${KERNEL_IMAGETYPE}
+	mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::uImage

 	# Copy device tree file
 	if test -n "${KERNEL_DEVICETREE}"; then
 		for DTS_FILE in ${KERNEL_DEVICETREE}; do
 			DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'`
-			DTS_DIR_NAME=`dirname ${DTS_FILE}`
 			if [ -e ${DEPLOY_DIR_IMAGE}/"${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb" ]; then
-
-				if [ ${DTS_FILE} != ${DTS_BASE_NAME}.dtb ]; then
-					mmd -i ${WORKDIR}/boot.img ::/${DTS_DIR_NAME}
-				fi
-
 				kernel_bin="`readlink ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin`"
 				kernel_bin_for_dtb="`readlink ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb | sed "s,$DTS_BASE_NAME,${MACHINE},g;s,\.dtb$,.bin,g"`"
 				if [ $kernel_bin = $kernel_bin_for_dtb ]; then
-					mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb ::/${DTS_FILE}
+					mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb ::/${DTS_BASE_NAME}.dtb
 				fi
 			fi
 		done
@ -110,15 +104,7 @@ IMAGE_CMD_sunxi-sdimg () {
 		dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
 	fi

-	# write u-boot-spl at the begining of sdcard in one shot
-	SPL_FILE=$(basename ${SPL_BINARY})
-	dd if=${DEPLOY_DIR_IMAGE}/${SPL_FILE} of=${SDIMG} bs=1024 seek=8 conv=notrunc
-}
+	#write u-boot and spl at the beginint of sdcard in one shot
+	dd if=${DEPLOY_DIR_IMAGE}/u-boot-sunxi-with-spl.bin of=${SDIMG} bs=1024 seek=8 conv=notrunc

-# write uboot.itb for arm64 boards
-IMAGE_CMD_sunxi-sdimg_append_sun50i () {
-	if [ -e "${DEPLOY_DIR_IMAGE}/${UBOOT_BINARY}" ]
-	then
-		dd if=${DEPLOY_DIR_IMAGE}/${UBOOT_BINARY} of=${SDIMG} bs=1024 seek=40 conv=notrunc
-	fi
 }
--- a/conf/layer.conf
+++ b/conf/layer.conf
@ -7,4 +7,3 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
 BBFILE_COLLECTIONS += "meta-sunxi"
 BBFILE_PATTERN_meta-sunxi := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-sunxi = "10"
-LAYERSERIES_COMPAT_meta-sunxi = "morty pyro rocko sumo thud"
--- a/conf/machine/include/sun50i.inc
+++ b/conf/machine/include/sun50i.inc
@ -1,4 +0,0 @@
-require conf/machine/include/sunxi64.inc
-require conf/machine/include/arm/arch-armv8.inc
-
-SOC_FAMILY = "sun50i"
--- a/conf/machine/include/sunxi.inc
+++ b/conf/machine/include/sunxi.inc
@ -12,7 +12,7 @@ XSERVER = "xserver-xorg \
           xf86-input-mouse \
           xf86-input-keyboard"

-PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux"
 PREFERRED_PROVIDER_u-boot ?= "u-boot"
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"

@ -28,7 +28,5 @@ UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).partition('+')[2][0:7]}"
 UBOOT_ENTRYPOINT ?= "0x40008000"
 UBOOT_LOADADDRESS ?= "0x400080OB00"

-SPL_BINARY ?= "u-boot-sunxi-with-spl.bin"
-
 SERIAL_CONSOLE ?= "115200 ttyS0"
 MACHINE_FEATURES ?= "alsa apm keyboard rtc serial screen usbgadget usbhost vfat"
--- a/conf/machine/include/sunxi64.inc
+++ b/conf/machine/include/sunxi64.inc
@ -1,24 +0,0 @@
-SOC_FAMILY ??= ""
-include conf/machine/include/soc-family.inc
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"
-PREFERRED_PROVIDER_u-boot ?= "u-boot"
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
-
-KERNEL_IMAGETYPE ?= "Image"
-
-IMAGE_CLASSES += "sdcard_image-sunxi"
-IMAGE_FSTYPES += "ext4 tar.gz sunxi-sdimg"
-
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
-
-UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).partition('+')[2][0:7]}"
-
-UBOOT_ENTRYPOINT ?= "0x40008000"
-UBOOT_LOADADDRESS ?= "0x400080OB00"
-
-UBOOT_BINARY ?= "u-boot.itb"
-SPL_BINARY ?= "spl/sunxi-spl.bin"
-
-SERIAL_CONSOLE ?= "115200 ttyS0"
-MACHINE_FEATURES ?= "alsa apm keyboard rtc serial screen usbgadget usbhost vfat"
--- a/conf/machine/nanopi-neo-air.conf
+++ b/conf/machine/nanopi-neo-air.conf
@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: nanopi-neo-air
-#@DESCRIPTION: Machine configuration for the FriendlyARM NanoPi Neo Air, based
-# on the Allwinner H3 CPU.
-
-require conf/machine/include/sun8i.inc
-
-PREFERRED_VERSION_u-boot = "v2018.03%"
-
-KERNEL_DEVICETREE = "sun8i-h3-nanopi-neo-air.dtb"
-UBOOT_MACHINE = "nanopi_neo_air_defconfig"
--- a/conf/machine/nanopi-neo-plus2.conf
+++ b/conf/machine/nanopi-neo-plus2.conf
@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: nanopi-neo-plus2
-#@DESCRIPTION: Machine configuration for the FriendlyARM NanoPi Neo Plus2, based
-# on the Allwinner H5 SoC.
-
-require conf/machine/include/sun50i.inc
-
-PREFERRED_VERSION_u-boot = "v2018.03%"
-
-KERNEL_DEVICETREE = "allwinner/sun50i-h5-nanopi-neo-plus2.dtb"
-UBOOT_MACHINE = "nanopi_neo_plus2_defconfig"
--- a/conf/machine/nanopi-neo.conf
+++ b/conf/machine/nanopi-neo.conf
@ -4,8 +4,10 @@

 require conf/machine/include/sun8i.inc

-PREFERRED_VERSION_u-boot = "v2018.03%"
+PREFERRED_VERSION_linux = "4.9.0+git%"
+PREFERRED_VERSION_u-boot = "v2016.11%"

 KERNEL_DEVICETREE = "sun8i-h3-nanopi-neo.dtb"
 UBOOT_MACHINE = "nanopi_neo_defconfig"

+DEFAULTTUNE = "cortexa7hf-neon-vfpv4"
--- a/conf/machine/nanopi-neo2.conf
+++ b/conf/machine/nanopi-neo2.conf
@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: nanopi-neo2
-#@DESCRIPTION: Machine configuration for the FriendlyARM NanoPi Neo 2, based on
-# the Allwinner H5 SoC.
-
-require conf/machine/include/sun50i.inc
-
-PREFERRED_VERSION_u-boot = "v2018.03%"
-
-KERNEL_DEVICETREE = "allwinner/sun50i-h5-nanopi-neo2.dtb"
-UBOOT_MACHINE = "nanopi_neo2_defconfig"
--- a/conf/machine/olinuxino-a20lime2-emmc.conf
+++ b/conf/machine/olinuxino-a20lime2-emmc.conf
@ -1,10 +0,0 @@
-#@TYPE: Machine
-#@NAME: Olimex A20-OLinuXino Lime2 Board with 4GB eMMC
-#@DESCRIPTION: Machine configuration for the Olimex A20-OLinuXino Lime2 Board with 4GB eMMC, based on Allwinner A20 CPU
-#https://github.com/OLIMEX/OLINUXINO
-
-require conf/machine/include/sun7i.inc
-
-KERNEL_DEVICETREE = "sun7i-a20-olinuxino-lime2-emmc.dtb"
-UBOOT_MACHINE = "A20-OLinuXino-Lime2-eMMC_config"
-SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_lime2.fex"
--- a/conf/machine/orange-pi-one.conf
+++ b/conf/machine/orange-pi-one.conf
@ -4,8 +4,10 @@

 require conf/machine/include/sun8i.inc

-PREFERRED_VERSION_u-boot = "v2018.03%"
+PREFERRED_VERSION_linux = "4.9.0+git%"
+PREFERRED_VERSION_u-boot = "v2016.11%"

 KERNEL_DEVICETREE = "sun8i-h3-orangepi-one.dtb"
 UBOOT_MACHINE = "orangepi_one_defconfig"

+DEFAULTTUNE = "cortexa7hf-neon-vfpv4"
--- a/conf/machine/orange-pi-pc-plus.conf
+++ b/conf/machine/orange-pi-pc-plus.conf
@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: orange-pi-pc-plus
-#@DESCRIPTION: Machine configuration for the orange-pi-pc-plus, base on allwinner H3 CPU
-
-require conf/machine/include/sun8i.inc
-
-PREFERRED_VERSION_u-boot = "v2018.03%"
-
-KERNEL_DEVICETREE = "sun8i-h3-orangepi-pc-plus.dtb"
-UBOOT_MACHINE = "orangepi_pc_plus_defconfig"
-
--- a/conf/machine/orange-pi-pc.conf
+++ b/conf/machine/orange-pi-pc.conf
@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: orange-pi-one
-#@DESCRIPTION: Machine configuration for the orange-pi-one, base on allwinner H3 CPU
-
-require conf/machine/include/sun8i.inc
-
-PREFERRED_VERSION_u-boot = "v2018.03%"
-
-KERNEL_DEVICETREE = "sun8i-h3-orangepi-pc.dtb"
-UBOOT_MACHINE = "orangepi_pc_defconfig"
-
--- a/conf/machine/orange-pi-zero-plus2.conf
+++ b/conf/machine/orange-pi-zero-plus2.conf
@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: orange-pi-zero-plus2
-#@DESCRIPTION: Machine configuration for the orange-pi-zero-plus2, base on Allwinner H5 CPU
-
-
-require conf/machine/include/sun50i.inc
-
-PREFERRED_VERSION_u-boot = "v2018.03%"
-
-KERNEL_DEVICETREE = "allwinner/sun50i-h5-orangepi-zero-plus2.dtb"
-UBOOT_MACHINE = "orangepi_zero_plus2_defconfig"
--- a/conf/machine/orange-pi-zero.conf
+++ b/conf/machine/orange-pi-zero.conf
@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: orange-pi-one
-#@DESCRIPTION: Machine configuration for the orange-pi-one, base on allwinner H3 CPU
-
-require conf/machine/include/sun8i.inc
-
-PREFERRED_VERSION_u-boot = "v2018.03%"
-
-KERNEL_DEVICETREE = "sun8i-h2-plus-orangepi-zero.dtb"
-UBOOT_MACHINE = "orangepi_zero_defconfig"
-
--- a/conf/machine/pcduino.conf
+++ b/conf/machine/pcduino.conf
@ -4,7 +4,8 @@

 require conf/machine/include/sun4i.inc

-PREFERRED_VERSION_u-boot = "v2018.03%"
+PREFERRED_VERSION_linux = "4.9.0+git%"
+PREFERRED_VERSION_u-boot = "v2016.11%"

 KERNEL_DEVICETREE = "sun4i-a10-pcduino.dtb"
 UBOOT_MACHINE = "Linksprite_pcDuino_defconfig"
--- a/recipes-bsp/atf/atf-sunxi_git.bb
+++ b/recipes-bsp/atf/atf-sunxi_git.bb
@ -1,27 +0,0 @@
-DESCRIPTION = "ARM Trusted Firmware Allwinner"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://license.md;md5=829bdeb34c1d9044f393d5a16c068371"
-
-SRC_URI = "git://github.com/apritzel/arm-trusted-firmware;nobranch=1"
-SRCREV = "aa75c8da415158a94b82a430b2b40000778e851f"
-
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
-
-COMPATIBLE_MACHINE = "(sun50i)"
-
-PLATFORM_sun50i = "sun50iw1p1"
-
-LDFLAGS[unexport] = "1"
-
-do_compile() {
-    oe_runmake -C ${S} BUILD_BASE=${B} \
-      CROSS_COMPILE=${TARGET_PREFIX} \
-      PLAT=${PLATFORM} \
-      bl31 \
-      all
-}
-
-do_install() {
-    install -D -p -m 0644 ${B}/${PLATFORM}/release/bl31.bin ${DEPLOY_DIR_IMAGE}/bl31.bin
-}
--- a/recipes-bsp/u-boot/files/0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch
+++ b/recipes-bsp/u-boot/files/0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch
@ -1,26 +0,0 @@
-From f4a77da23b3890b53efab6a927cbe99b76ef3b26 Mon Sep 17 00:00:00 2001
-From: Florin Sarbu <florin@resin.io>
-Date: Wed, 12 Sep 2018 14:22:49 +0200
-Subject: [PATCH] nanopi_neo_air_defconfig: Enable eMMC support
-
-Upstream-status: Pending
-Signed-off-by: Florin Sarbu <florin@resin.io>
---
- configs/nanopi_neo_air_defconfig | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configs/nanopi_neo_air_defconfig b/configs/nanopi_neo_air_defconfig
-index ca9c2dd..74ce044 100644
--- a/configs/nanopi_neo_air_defconfig
-+++ b/configs/nanopi_neo_air_defconfig
-@@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo-air"
- # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
- CONFIG_CONSOLE_MUX=y
- CONFIG_SPL=y
-+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
- # CONFIG_CMD_FLASH is not set
- # CONFIG_SPL_DOS_PARTITION is not set
- # CONFIG_SPL_ISO_PARTITION is not set
-- 
-2.7.4
-
--- a/recipes-bsp/u-boot/files/aarch64/boot.cmd
+++ b/recipes-bsp/u-boot/files/aarch64/boot.cmd
@ -1,11 +0,0 @@
-# Default to (primary) SD
-rootdev=mmcblk0p2
-if itest.b *0x28 == 0x02 ; then
-	# U-Boot loaded from eMMC or secondary SD so use it for rootfs too
-	echo "U-boot loaded from eMMC or secondary SD"
-	rootdev=mmcblk1p2
-fi
-setenv bootargs console=${console} console=tty1 root=/dev/${rootdev} rootwait panic=10 ${extra}
-load mmc 0:1 ${fdt_addr_r} ${fdtfile}
-load mmc 0:1 ${kernel_addr_r} Image
-booti ${kernel_addr_r} - ${fdt_addr_r}
--- a/recipes-bsp/u-boot/files/arm/boot.cmd
+++ b/recipes-bsp/u-boot/files/arm/boot.cmd
@ -1,11 +1,4 @@
-# Default to (primary) SD
-rootdev=mmcblk0p2
-if itest.b *0x28 == 0x02 ; then
-	# U-Boot loaded from eMMC or secondary SD so use it for rootfs too
-	echo "U-boot loaded from eMMC or secondary SD"
-	rootdev=mmcblk1p2
-fi
-setenv bootargs console=${console} console=tty1 root=/dev/${rootdev} rootwait panic=10 ${extra}
+setenv bootargs console=${console} console=tty1 root=/dev/mmcblk0p2 rootwait panic=10 ${extra}
 load mmc 0:1 ${fdt_addr_r} ${fdtfile} || load mmc 0:1 ${fdt_addr_r} boot/${fdtfile}
 load mmc 0:1 ${kernel_addr_r} zImage || load mmc 0:1 ${kernel_addr_r} boot/zImage || load mmc 0:1 ${kernel_addr_r} uImage || load mmc 0:1 ${kernel_addr_r} boot/uImage
 bootz ${kernel_addr_r} - ${fdt_addr_r} || bootm ${kernel_addr_r} - ${fdt_addr_r}
--- a/recipes-bsp/u-boot/files/u-boot-pylibfdt-native-build.patch
+++ b/recipes-bsp/u-boot/files/u-boot-pylibfdt-native-build.patch
@ -1,16 +0,0 @@
-diff --git a/scripts/dtc/pylibfdt/Makefile b/scripts/dtc/pylibfdt/Makefile
-index 01d5e0ffe3..2b2dfe0bd9 100644
--- a/scripts/dtc/pylibfdt/Makefile
-+++ b/scripts/dtc/pylibfdt/Makefile
-@@ -15,6 +15,8 @@ PYLIBFDT_srcs = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_SRCS)) \
- 
- quiet_cmd_pymod = PYMOD   $@
-       cmd_pymod = unset CC; unset CROSS_COMPILE; unset CFLAGS;\
-+		CC="$(HOSTCC)" \
-+		LDSHARED="$(HOSTLDSHARED)" \
- 		LDFLAGS="$(HOSTLDFLAGS)" \
- 		VERSION="u-boot-$(UBOOTVERSION)" \
- 		CPPFLAGS="$(HOSTCFLAGS) -I$(LIBFDT_srcdir)" OBJDIR=$(obj) \
-- 
-2.11.0
-
--- a/recipes-bsp/u-boot/u-boot_2016.11.bb
+++ b/recipes-bsp/u-boot/u-boot_2016.11.bb
@ -0,0 +1,47 @@
+DESCRIPTION="Upstream's U-boot configured for sunxi devices"
+
+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 \
+file://Licenses/x11.txt;md5=b46f176c847b8742db02126fb8af92e2 \
+"
+
+COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i)"
+
+DEFAULT_PREFERENCE_sun4i="1"
+DEFAULT_PREFERENCE_sun5i="1"
+DEFAULT_PREFERENCE_sun7i="1"
+DEFAULT_PREFERENCE_sun8i="1"
+
+SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
+           file://boot.cmd"
+
+SRCREV = "29e0cfb4f77f7aa369136302cee14a91e22dca71"
+
+PV = "v2016.11+git${SRCPV}"
+
+PE = "2"
+
+S = "${WORKDIR}/git"
+
+SPL_BINARY="u-boot-sunxi-with-spl.bin"
+
+UBOOT_ENV_SUFFIX = "scr"
+UBOOT_ENV = "boot"
+
+do_compile_append() {
+    ${B}/tools/mkimage -C none -A arm -T script -d ${WORKDIR}/boot.cmd ${WORKDIR}/${UBOOT_ENV_BINARY}
+}
--- a/recipes-bsp/u-boot/u-boot_2018.03.bb
+++ b/recipes-bsp/u-boot/u-boot_2018.03.bb
@ -1,42 +0,0 @@
-DESCRIPTION="Upstream's U-boot configured for sunxi devices"
-
-require recipes-bsp/u-boot/u-boot.inc
-
-DEPENDS += " bc-native dtc-native swig-native python3-native "
-DEPENDS_append_sun50i = " atf-sunxi "
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
-
-COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
-
-DEFAULT_PREFERENCE_sun4i="1"
-DEFAULT_PREFERENCE_sun5i="1"
-DEFAULT_PREFERENCE_sun7i="1"
-DEFAULT_PREFERENCE_sun8i="1"
-DEFAULT_PREFERENCE_sun50i="1"
-
-SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
-           file://u-boot-pylibfdt-native-build.patch \
-           file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \
-           file://boot.cmd \
-           "
-
-SRCREV = "f95ab1fb6e37f0601f397091bb011edf7a98b890"
-
-PV = "v2018.03+git${SRCPV}"
-PE = "2"
-
-S = "${WORKDIR}/git"
-
-UBOOT_ENV_SUFFIX = "scr"
-UBOOT_ENV = "boot"
-
-EXTRA_OEMAKE += ' HOSTLDSHARED="${BUILD_CC} -shared ${BUILD_LDFLAGS} ${BUILD_CFLAGS}" '
-EXTRA_OEMAKE_append_sun50i = " BL31=${DEPLOY_DIR_IMAGE}/bl31.bin "
-
-do_compile_sun50i[depends] += "atf-sunxi:do_deploy"
-
-do_compile_append() {
-    ${B}/tools/mkimage -C none -A arm -T script -d ${WORKDIR}/boot.cmd ${WORKDIR}/${UBOOT_ENV_BINARY}
-}
--- a/recipes-devtools/python/pya20_0.2.1.bb
+++ b/recipes-devtools/python/pya20_0.2.1.bb
@ -8,7 +8,7 @@ DEPENDS = "python"
 # No GPIO mappings for other machines yet
 COMPATIBLE_MACHINE = "(olinuxino-a13|olinuxino-a10|olinuxino-a20|olinuxino-a10lime|olinuxino-a20lime|olinuxino-a20lime2|olinuxino-a13som|olinuxino-a20som)"

-SRC_URI = "https://pypi.python.org/packages/source/p/pyA20/pyA20-${PV}.tar.gz \
+SRC_URI = "http://pypi.python.org/packages/source/p/pyA20/pyA20-${PV}.tar.gz \
           file://setup.py.patch \
           file://mapping.h \
          "
--- a/recipes-devtools/python/pya20som_0.2.1.bb
+++ b/recipes-devtools/python/pya20som_0.2.1.bb
@ -8,7 +8,7 @@ DEPENDS = "python"
 # No GPIO mappings for other machines yet
 COMPATIBLE_MACHINE = "olinuxino-a20som"

-SRC_URI = "https://pypi.python.org/packages/source/p/pyA20SOM/pyA20SOM-${PV}.tar.gz \
+SRC_URI = "http://pypi.python.org/packages/source/p/pyA20SOM/pyA20SOM-${PV}.tar.gz \
           file://setup.py.patch \
           file://mapping.h \
          "
--- a/recipes-kernel/linux/linux-mainline/0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch
+++ b/recipes-kernel/linux/linux-mainline/0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch
@ -1,80 +0,0 @@
-From 4ca766a768e783ee5198f1935b7f46a5df9b4a35 Mon Sep 17 00:00:00 2001
-From: Jelle van der Waa <jelle@vdwaa.nl>
-Date: Tue, 23 Jan 2018 15:58:44 -0800
-Subject: [PATCH] ARM: dts: nanopi-neo-air: Add WiFi / eMMC
-
-Enable the WiFi (AP6212) chip and eMMC support for the NanoPi NEO Air.
-
-This patch was originally submitted by Jelle van der Waa. Martin Kelly
-modified it to compile on the latest kernel, fixed up some review
-comments from Maxime Ripard, and re-tested the patch.
-
-The patch has been reworked to add back eMMC support which has been left
-out at the last backport.
-
-Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
-Cc: linux-sunxi@googlegroups.com
-Cc: devicetree@vger.kernel.org
-Signed-off-by: Jelle van der Waa <jelle@vdwaa.nl>
-Signed-off-by: Martin Kelly <mkelly@xevo.com>
-Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
-Signed-off-by: Florin Sarbu <florin@resin.io>
---
- arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts | 34 +++++++++++++++++++++++++++
- 1 file changed, 34 insertions(+)
-
-diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
-index 03ff6f8..a9331fe 100644
--- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
-+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
-@@ -72,6 +72,11 @@
- 			gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */
- 		};
- 	};
-+
-+	wifi_pwrseq: wifi_pwrseq {
-+		compatible = "mmc-pwrseq-simple";
-+		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
-+	};
- };
- 
- &mmc0 {
-@@ -84,6 +89,35 @@
- 	status = "okay";
- };
- 
-+&mmc1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&mmc1_pins_a>;
-+	vmmc-supply = <&reg_vcc3v3>;
-+	vqmmc-supply = <&reg_vcc3v3>;
-+	mmc-pwrseq = <&wifi_pwrseq>;
-+	bus-width = <4>;
-+	non-removable;
-+	status = "okay";
-+
-+	brcmf: bcrmf@1 {
-+		reg = <1>;
-+		compatible = "brcm,bcm4329-fmac";
-+		interrupt-parent = <&pio>;
-+		interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; /* PG10 / EINT10 */
-+		interrupt-names = "host-wake";
-+	};
-+};
-+
-+&mmc2 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&mmc2_8bit_pins>;
-+	vmmc-supply = <&reg_vcc3v3>;
-+	vqmmc-supply = <&reg_vcc3v3>;
-+	bus-width = <8>;
-+	non-removable;
-+	status = "okay";
-+};
-+
- &uart0 {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&uart0_pins_a>;
-- 
-2.11.0
-
--- a/recipes-kernel/linux/linux-mainline/aarch64/defconfig
+++ b/recipes-kernel/linux/linux-mainline/aarch64/defconfig
@ -1,612 +0,0 @@
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_AUDIT=y
-CONFIG_NO_HZ_IDLE=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_IRQ_TIME_ACCOUNTING=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_NUMA_BALANCING=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
-CONFIG_BLK_CGROUP=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_HUGETLB=y
-CONFIG_CPUSETS=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_CGROUP_PERF=y
-CONFIG_USER_NS=y
-CONFIG_SCHED_AUTOGROUP=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_KALLSYMS_ALL=y
-# CONFIG_COMPAT_BRK is not set
-CONFIG_PROFILING=y
-CONFIG_JUMP_LABEL=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_IOSCHED_DEADLINE is not set
-CONFIG_ARCH_SUNXI=y
-CONFIG_ARCH_ALPINE=y
-CONFIG_ARCH_BCM2835=y
-CONFIG_ARCH_BCM_IPROC=y
-CONFIG_ARCH_BERLIN=y
-CONFIG_ARCH_BRCMSTB=y
-CONFIG_ARCH_EXYNOS=y
-CONFIG_ARCH_LAYERSCAPE=y
-CONFIG_ARCH_LG1K=y
-CONFIG_ARCH_HISI=y
-CONFIG_ARCH_MEDIATEK=y
-CONFIG_ARCH_MESON=y
-CONFIG_ARCH_MVEBU=y
-CONFIG_ARCH_QCOM=y
-CONFIG_ARCH_ROCKCHIP=y
-CONFIG_ARCH_SEATTLE=y
-CONFIG_ARCH_RENESAS=y
-CONFIG_ARCH_R8A7795=y
-CONFIG_ARCH_R8A7796=y
-CONFIG_ARCH_STRATIX10=y
-CONFIG_ARCH_TEGRA=y
-CONFIG_ARCH_SPRD=y
-CONFIG_ARCH_THUNDER=y
-CONFIG_ARCH_THUNDER2=y
-CONFIG_ARCH_UNIPHIER=y
-CONFIG_ARCH_VEXPRESS=y
-CONFIG_ARCH_XGENE=y
-CONFIG_ARCH_ZX=y
-CONFIG_ARCH_ZYNQMP=y
-CONFIG_PCI=y
-CONFIG_HOTPLUG_PCI_PCIE=y
-CONFIG_PCI_IOV=y
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_PCI_LAYERSCAPE=y
-CONFIG_PCI_HISI=y
-CONFIG_PCIE_QCOM=y
-CONFIG_PCIE_KIRIN=y
-CONFIG_PCIE_ARMADA_8K=y
-CONFIG_PCI_AARDVARK=y
-CONFIG_PCIE_RCAR=y
-CONFIG_PCIE_ROCKCHIP=m
-CONFIG_PCI_HOST_GENERIC=y
-CONFIG_PCI_XGENE=y
-CONFIG_ARM64_VA_BITS_48=y
-CONFIG_SCHED_MC=y
-CONFIG_NUMA=y
-CONFIG_PREEMPT=y
-CONFIG_KSM=y
-CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_CMA=y
-CONFIG_SECCOMP=y
-CONFIG_KEXEC=y
-CONFIG_CRASH_DUMP=y
-CONFIG_XEN=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_COMPAT=y
-CONFIG_HIBERNATION=y
-CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
-CONFIG_ARM_CPUIDLE=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPUFREQ_DT=y
-CONFIG_ARM_BIG_LITTLE_CPUFREQ=y
-CONFIG_ARM_SCPI_CPUFREQ=y
-CONFIG_ACPI_CPPC_CPUFREQ=m
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IPV6=m
-CONFIG_NETFILTER=y
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_VLAN_8021Q=m
-CONFIG_VLAN_8021Q_GVRP=y
-CONFIG_VLAN_8021Q_MVRP=y
-CONFIG_BPF_JIT=y
-CONFIG_BT=m
-CONFIG_BT_HIDP=m
-# CONFIG_BT_HS is not set
-# CONFIG_BT_LE is not set
-CONFIG_BT_LEDS=y
-# CONFIG_BT_DEBUGFS is not set
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_LL=y
-CONFIG_CFG80211=m
-CONFIG_MAC80211=m
-CONFIG_MAC80211_LEDS=y
-CONFIG_RFKILL=m
-CONFIG_NET_9P=y
-CONFIG_NET_9P_VIRTIO=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_DMA_CMA=y
-CONFIG_MTD=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_M25P80=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_DENALI_DT=y
-CONFIG_MTD_SPI_NOR=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_NBD=m
-CONFIG_VIRTIO_BLK=y
-CONFIG_BLK_DEV_NVME=m
-CONFIG_SRAM=y
-CONFIG_EEPROM_AT25=m
-# CONFIG_SCSI_PROC_FS is not set
-CONFIG_BLK_DEV_SD=y
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_HISI_SAS=y
-CONFIG_SCSI_HISI_SAS_PCI=y
-CONFIG_ATA=y
-CONFIG_SATA_AHCI=y
-CONFIG_SATA_AHCI_PLATFORM=y
-CONFIG_AHCI_CEVA=y
-CONFIG_AHCI_MVEBU=y
-CONFIG_AHCI_XGENE=y
-CONFIG_AHCI_QORIQ=y
-CONFIG_SATA_SIL24=y
-CONFIG_SATA_RCAR=y
-CONFIG_PATA_PLATFORM=y
-CONFIG_PATA_OF_PLATFORM=y
-CONFIG_NETDEVICES=y
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_TUN=y
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=y
-CONFIG_AMD_XGBE=y
-CONFIG_NET_XGENE=y
-CONFIG_MACB=y
-CONFIG_HNS_DSAF=y
-CONFIG_HNS_ENET=y
-CONFIG_E1000E=y
-CONFIG_IGB=y
-CONFIG_IGBVF=y
-CONFIG_MVNETA=y
-CONFIG_MVPP2=y
-CONFIG_SKY2=y
-CONFIG_QCOM_EMAC=m
-CONFIG_RAVB=y
-CONFIG_SMC91X=y
-CONFIG_SMSC911X=y
-CONFIG_STMMAC_ETH=m
-CONFIG_MDIO_BUS_MUX_MMIOREG=y
-CONFIG_AT803X_PHY=m
-CONFIG_MARVELL_PHY=m
-CONFIG_MESON_GXL_PHY=m
-CONFIG_MICREL_PHY=y
-CONFIG_REALTEK_PHY=m
-CONFIG_ROCKCHIP_PHY=y
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SR9800=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_BRCMFMAC=m
-CONFIG_WL18XX=m
-CONFIG_WLCORE_SDIO=m
-CONFIG_INPUT_EVDEV=y
-CONFIG_KEYBOARD_ADC=m
-CONFIG_KEYBOARD_CROS_EC=y
-CONFIG_KEYBOARD_GPIO=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_PM8941_PWRKEY=y
-CONFIG_INPUT_HISI_POWERKEY=y
-# CONFIG_SERIO_SERPORT is not set
-CONFIG_SERIO_AMBAKMI=y
-CONFIG_LEGACY_PTY_COUNT=16
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_8250_BCM2835AUX=y
-CONFIG_SERIAL_8250_DW=y
-CONFIG_SERIAL_8250_MT6577=y
-CONFIG_SERIAL_8250_UNIPHIER=y
-CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_SERIAL_MESON=y
-CONFIG_SERIAL_MESON_CONSOLE=y
-CONFIG_SERIAL_SAMSUNG=y
-CONFIG_SERIAL_SAMSUNG_CONSOLE=y
-CONFIG_SERIAL_TEGRA=y
-CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_NR_UARTS=11
-CONFIG_SERIAL_SH_SCI_CONSOLE=y
-CONFIG_SERIAL_MSM=y
-CONFIG_SERIAL_MSM_CONSOLE=y
-CONFIG_SERIAL_XILINX_PS_UART=y
-CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
-CONFIG_SERIAL_MVEBU_UART=y
-CONFIG_SERIAL_DEV_BUS=y
-CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
-CONFIG_VIRTIO_CONSOLE=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_MUX=y
-CONFIG_I2C_MUX_PCA954x=y
-CONFIG_I2C_BCM2835=m
-CONFIG_I2C_DESIGNWARE_PLATFORM=y
-CONFIG_I2C_IMX=y
-CONFIG_I2C_MESON=y
-CONFIG_I2C_MV64XXX=y
-CONFIG_I2C_PXA=y
-CONFIG_I2C_QUP=y
-CONFIG_I2C_RK3X=y
-CONFIG_I2C_SH_MOBILE=y
-CONFIG_I2C_TEGRA=y
-CONFIG_I2C_UNIPHIER_F=y
-CONFIG_I2C_RCAR=y
-CONFIG_I2C_CROS_EC_TUNNEL=y
-CONFIG_SPI=y
-CONFIG_SPI_MESON_SPICC=m
-CONFIG_SPI_MESON_SPIFC=m
-CONFIG_SPI_BCM2835=m
-CONFIG_SPI_BCM2835AUX=m
-CONFIG_SPI_ORION=y
-CONFIG_SPI_PL022=y
-CONFIG_SPI_QUP=y
-CONFIG_SPI_ROCKCHIP=y
-CONFIG_SPI_S3C64XX=y
-CONFIG_SPI_SPIDEV=m
-CONFIG_SPMI=y
-CONFIG_PINCTRL_IPQ8074=y
-CONFIG_PINCTRL_SINGLE=y
-CONFIG_PINCTRL_MAX77620=y
-CONFIG_PINCTRL_MSM8916=y
-CONFIG_PINCTRL_MSM8994=y
-CONFIG_PINCTRL_MSM8996=y
-CONFIG_PINCTRL_QDF2XXX=y
-CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
-CONFIG_GPIO_DWAPB=y
-CONFIG_GPIO_PL061=y
-CONFIG_GPIO_RCAR=y
-CONFIG_GPIO_XGENE=y
-CONFIG_GPIO_XGENE_SB=y
-CONFIG_GPIO_PCA953X=y
-CONFIG_GPIO_PCA953X_IRQ=y
-CONFIG_GPIO_MAX77620=y
-CONFIG_POWER_RESET_MSM=y
-CONFIG_POWER_RESET_XGENE=y
-CONFIG_POWER_RESET_SYSCON=y
-CONFIG_SYSCON_REBOOT_MODE=y
-CONFIG_BATTERY_BQ27XXX=y
-CONFIG_SENSORS_ARM_SCPI=y
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_INA2XX=m
-CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
-CONFIG_CPU_THERMAL=y
-CONFIG_THERMAL_EMULATION=y
-CONFIG_BRCMSTB_THERMAL=m
-CONFIG_EXYNOS_THERMAL=y
-CONFIG_ROCKCHIP_THERMAL=m
-CONFIG_WATCHDOG=y
-CONFIG_S3C2410_WATCHDOG=y
-CONFIG_MESON_GXBB_WATCHDOG=m
-CONFIG_MESON_WATCHDOG=m
-CONFIG_RENESAS_WDT=y
-CONFIG_UNIPHIER_WATCHDOG=y
-CONFIG_BCM2835_WDT=y
-CONFIG_MFD_AXP20X_RSB=y
-CONFIG_MFD_CROS_EC=y
-CONFIG_MFD_CROS_EC_I2C=y
-CONFIG_MFD_CROS_EC_SPI=y
-CONFIG_MFD_EXYNOS_LPASS=m
-CONFIG_MFD_HI6421_PMIC=y
-CONFIG_MFD_HI655X_PMIC=y
-CONFIG_MFD_MAX77620=y
-CONFIG_MFD_SPMI_PMIC=y
-CONFIG_MFD_RK808=y
-CONFIG_MFD_SEC_CORE=y
-CONFIG_REGULATOR_AXP20X=y
-CONFIG_REGULATOR_FAN53555=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_GPIO=y
-CONFIG_REGULATOR_HI6421V530=y
-CONFIG_REGULATOR_HI655X=y
-CONFIG_REGULATOR_MAX77620=y
-CONFIG_REGULATOR_PWM=y
-CONFIG_REGULATOR_QCOM_SMD_RPM=y
-CONFIG_REGULATOR_QCOM_SPMI=y
-CONFIG_REGULATOR_RK808=y
-CONFIG_REGULATOR_S2MPS11=y
-CONFIG_MEDIA_SUPPORT=m
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_MEDIA_RC_SUPPORT=y
-CONFIG_RC_CORE=m
-CONFIG_RC_DEVICES=y
-CONFIG_RC_DECODERS=y
-CONFIG_IR_MESON=m
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-# CONFIG_DVB_NET is not set
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
-CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
-CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
-CONFIG_VIDEO_RENESAS_FCP=m
-CONFIG_VIDEO_RENESAS_VSP1=m
-CONFIG_DRM=m
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_EXYNOS=m
-CONFIG_DRM_EXYNOS5433_DECON=y
-CONFIG_DRM_EXYNOS7_DECON=y
-CONFIG_DRM_EXYNOS_DSI=y
-# CONFIG_DRM_EXYNOS_DP is not set
-CONFIG_DRM_EXYNOS_HDMI=y
-CONFIG_DRM_EXYNOS_MIC=y
-CONFIG_DRM_ROCKCHIP=m
-CONFIG_ROCKCHIP_ANALOGIX_DP=y
-CONFIG_ROCKCHIP_CDN_DP=y
-CONFIG_ROCKCHIP_DW_HDMI=y
-CONFIG_ROCKCHIP_DW_MIPI_DSI=y
-CONFIG_ROCKCHIP_INNO_HDMI=y
-CONFIG_DRM_RCAR_DU=m
-CONFIG_DRM_RCAR_LVDS=y
-CONFIG_DRM_RCAR_VSP=y
-CONFIG_DRM_TEGRA=m
-CONFIG_DRM_PANEL_SIMPLE=m
-CONFIG_DRM_I2C_ADV7511=m
-CONFIG_DRM_VC4=m
-CONFIG_DRM_HISI_KIRIN=m
-CONFIG_DRM_MESON=m
-CONFIG_FB=y
-CONFIG_FB_ARMCLCD=y
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_PWM=m
-CONFIG_BACKLIGHT_LP855X=m
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_SOC=y
-CONFIG_SND_BCM2835_SOC_I2S=m
-CONFIG_SND_SOC_SAMSUNG=y
-CONFIG_SND_SOC_RCAR=m
-CONFIG_SND_SOC_AK4613=m
-CONFIG_SND_SIMPLE_CARD=y
-CONFIG_USB=y
-CONFIG_USB_OTG=y
-CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_XHCI_TEGRA=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_MSM=y
-CONFIG_USB_EHCI_EXYNOS=y
-CONFIG_USB_EHCI_HCD_PLATFORM=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_OHCI_EXYNOS=y
-CONFIG_USB_OHCI_HCD_PLATFORM=y
-CONFIG_USB_RENESAS_USBHS=m
-CONFIG_USB_STORAGE=y
-CONFIG_USB_DWC3=y
-CONFIG_USB_DWC2=y
-CONFIG_USB_CHIPIDEA=y
-CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_ISP1760=y
-CONFIG_USB_HSIC_USB3503=y
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_USB_MSM_OTG=y
-CONFIG_USB_QCOM_8X16_PHY=y
-CONFIG_USB_ULPI=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_RENESAS_USBHS_UDC=m
-CONFIG_USB_MUSB_HDRC=y
-# Restrict to host mode, as it is hard-coded that way in the device tree
-# (dr_mode = "host" in the &usb_otg node)
-CONFIG_USB_MUSB_HOST=y
-CONFIG_USB_MUSB_SUNXI=y
-CONFIG_MMC=y
-CONFIG_MMC_BLOCK_MINORS=32
-CONFIG_MMC_ARMMMCI=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_ACPI=y
-CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_MMC_SDHCI_OF_ARASAN=y
-CONFIG_MMC_SDHCI_OF_ESDHC=y
-CONFIG_MMC_SDHCI_CADENCE=y
-CONFIG_MMC_SDHCI_TEGRA=y
-CONFIG_MMC_MESON_GX=y
-CONFIG_MMC_SDHCI_MSM=y
-CONFIG_MMC_SPI=y
-CONFIG_MMC_SDHI=y
-CONFIG_MMC_DW=y
-CONFIG_MMC_DW_EXYNOS=y
-CONFIG_MMC_DW_K3=y
-CONFIG_MMC_DW_ROCKCHIP=y
-CONFIG_MMC_SUNXI=y
-CONFIG_MMC_BCM2835=y
-CONFIG_MMC_SDHCI_XENON=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_PWM=y
-CONFIG_LEDS_SYSCON=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_CPU=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-CONFIG_EDAC=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_MAX77686=y
-CONFIG_RTC_DRV_RK808=m
-CONFIG_RTC_DRV_S5M=y
-CONFIG_RTC_DRV_DS3232=y
-CONFIG_RTC_DRV_EFI=y
-CONFIG_RTC_DRV_S3C=y
-CONFIG_RTC_DRV_PL031=y
-CONFIG_RTC_DRV_SUN6I=y
-CONFIG_RTC_DRV_TEGRA=y
-CONFIG_RTC_DRV_XGENE=y
-CONFIG_DMADEVICES=y
-CONFIG_DMA_BCM2835=m
-CONFIG_K3_DMA=y
-CONFIG_MV_XOR_V2=y
-CONFIG_PL330_DMA=y
-CONFIG_TEGRA20_APB_DMA=y
-CONFIG_QCOM_BAM_DMA=y
-CONFIG_QCOM_HIDMA_MGMT=y
-CONFIG_QCOM_HIDMA=y
-CONFIG_RCAR_DMAC=y
-CONFIG_VFIO=y
-CONFIG_VFIO_PCI=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO_BALLOON=y
-CONFIG_VIRTIO_MMIO=y
-CONFIG_XEN_GNTDEV=y
-CONFIG_XEN_GRANT_DEV_ALLOC=y
-CONFIG_COMMON_CLK_RK808=y
-CONFIG_COMMON_CLK_SCPI=y
-CONFIG_COMMON_CLK_CS2000_CP=y
-CONFIG_COMMON_CLK_S2MPS11=y
-CONFIG_CLK_QORIQ=y
-CONFIG_COMMON_CLK_PWM=y
-CONFIG_COMMON_CLK_QCOM=y
-CONFIG_QCOM_CLK_SMD_RPM=y
-CONFIG_IPQ_GCC_8074=y
-CONFIG_MSM_GCC_8916=y
-CONFIG_MSM_GCC_8994=y
-CONFIG_MSM_MMCC_8996=y
-CONFIG_HWSPINLOCK=y
-CONFIG_HWSPINLOCK_QCOM=y
-CONFIG_ARM_MHU=y
-CONFIG_PLATFORM_MHU=y
-CONFIG_BCM2835_MBOX=y
-CONFIG_HI6220_MBOX=y
-CONFIG_ROCKCHIP_IOMMU=y
-CONFIG_ARM_SMMU=y
-CONFIG_ARM_SMMU_V3=y
-CONFIG_RPMSG_QCOM_SMD=y
-CONFIG_RASPBERRYPI_POWER=y
-CONFIG_QCOM_SMEM=y
-CONFIG_QCOM_SMD_RPM=y
-CONFIG_QCOM_SMP2P=y
-CONFIG_QCOM_SMSM=y
-CONFIG_ROCKCHIP_PM_DOMAINS=y
-CONFIG_ARCH_TEGRA_132_SOC=y
-CONFIG_ARCH_TEGRA_210_SOC=y
-CONFIG_ARCH_TEGRA_186_SOC=y
-CONFIG_EXTCON_USB_GPIO=y
-CONFIG_IIO=y
-CONFIG_EXYNOS_ADC=y
-CONFIG_ROCKCHIP_SARADC=m
-CONFIG_PWM=y
-CONFIG_PWM_BCM2835=m
-CONFIG_PWM_CROS_EC=m
-CONFIG_PWM_MESON=m
-CONFIG_PWM_ROCKCHIP=y
-CONFIG_PWM_SAMSUNG=y
-CONFIG_PWM_TEGRA=m
-CONFIG_PHY_RCAR_GEN3_USB2=y
-CONFIG_PHY_HI6220_USB=y
-CONFIG_PHY_SUN4I_USB=y
-CONFIG_PHY_ROCKCHIP_INNO_USB2=y
-CONFIG_PHY_ROCKCHIP_EMMC=y
-CONFIG_PHY_ROCKCHIP_PCIE=m
-CONFIG_PHY_XGENE=y
-CONFIG_PHY_TEGRA_XUSB=y
-CONFIG_QCOM_L2_PMU=y
-CONFIG_QCOM_L3_PMU=y
-CONFIG_TEE=y
-CONFIG_OPTEE=y
-CONFIG_ARM_SCPI_PROTOCOL=y
-CONFIG_RASPBERRYPI_FIRMWARE=y
-CONFIG_EFI_CAPSULE_LOADER=y
-CONFIG_ACPI=y
-CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=y
-CONFIG_ACPI_APEI_PCIEAER=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-CONFIG_FANOTIFY=y
-CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
-CONFIG_QUOTA=y
-CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=m
-CONFIG_CUSE=m
-CONFIG_OVERLAY_FS=m
-CONFIG_VFAT_FS=y
-CONFIG_HUGETLBFS=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_EFIVAR_FS=y
-CONFIG_SQUASHFS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V4=y
-CONFIG_NFS_V4_1=y
-CONFIG_NFS_V4_2=y
-CONFIG_ROOT_NFS=y
-CONFIG_9P_FS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=y
-CONFIG_PRINTK_TIME=y
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_FS=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_LOCKUP_DETECTOR=y
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_DEBUG_PREEMPT is not set
-# CONFIG_FTRACE is not set
-CONFIG_MEMTEST=y
-CONFIG_SECURITY=y
-CONFIG_CRYPTO_ECHAINIV=y
-CONFIG_CRYPTO_ANSI_CPRNG=y
-CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_SHA256_ARM64=m
-CONFIG_CRYPTO_SHA512_ARM64=m
-CONFIG_CRYPTO_SHA1_ARM64_CE=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_CRYPTO_GHASH_ARM64_CE=y
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
-CONFIG_CRYPTO_CRC32_ARM64_CE=m
-CONFIG_CRYPTO_AES_ARM64=m
-CONFIG_CRYPTO_AES_ARM64_CE=m
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=m
-CONFIG_CRYPTO_CHACHA20_NEON=m
-CONFIG_CRYPTO_AES_ARM64_BS=m
--- a/recipes-kernel/linux/linux-mainline/orange-pi-zero/0001-add-wifi-support.patch
+++ b/recipes-kernel/linux/linux-mainline/orange-pi-zero/0001-add-wifi-support.patch
@ -1,79 +0,0 @@
-diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
-index 6713d0f2b3f4..ad0829e8f716 100644
--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
-+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
-@@ -80,19 +80,22 @@
- 		};
- 	};
- 
-	reg_vcc_wifi: reg_vcc_wifi {
-+	vdd_wifi: vdd_wifi {
- 		compatible = "regulator-fixed";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		regulator-name = "vcc-wifi";
-		enable-active-high;
-+		regulator-name = "wifi";
-+		regulator-min-microvolt = <1800000>;
-+		regulator-max-microvolt = <1800000>;
- 		gpio = <&pio 0 20 GPIO_ACTIVE_HIGH>;
-+		startup-delay-us = <70000>;
-+		enable-active-high;
- 	};
- 
-	wifi_pwrseq: wifi_pwrseq {
-+	pwrseq_wifi: pwrseq_wifi@0 {
- 		compatible = "mmc-pwrseq-simple";
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&wifi_rst>;
- 		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>;
-		post-power-on-delay-ms = <200>;
-+		post-power-on-delay-ms = <50>;
- 	};
- };
- 
-@@ -124,9 +127,11 @@
- &mmc1 {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&mmc1_pins_a>;
-	vmmc-supply = <&reg_vcc_wifi>;
-	mmc-pwrseq = <&wifi_pwrseq>;
-+	vmmc-supply = <&reg_vcc3v3>;
-+	vqmmc-supply = <&vdd_wifi>;
-+	mmc-pwrseq = <&pwrseq_wifi>;
- 	bus-width = <4>;
-+	max-frequency = <16000000>;
- 	non-removable;
- 	status = "okay";
- 
-@@ -136,9 +141,30 @@
- 	 */
- 	xr819: sdio_wifi@1 {
- 		reg = <1>;
-+		compatible = "xradio,xr819";
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&wifi_wake>;
-+		interrupt-parent = <&pio>;
-+		interrupts = <6 10 IRQ_TYPE_EDGE_RISING>;
-+		interrupt-names = "host-wake";
-+		local-mac-address = [dc 44 6d c0 ff ee];
- 	};
- };
- 
-+&pio {
-+	wifi_wake: wifi_wake {
-+		pins = "PG10";
-+		function = "gpio_in";
-+    };
-+};
-+
-+&r_pio {
-+	wifi_rst: wifi_rst {
-+		pins = "PL7";
-+		function = "gpio_out";
-+    };
-+};
-+
- &mmc1_pins_a {
- 	bias-pull-up;
- };
--- a/recipes-kernel/linux/linux-mainline_4.16.13.bb
+++ b/recipes-kernel/linux/linux-mainline_4.16.13.bb
@ -1,32 +0,0 @@
-SECTION = "kernel"
-DESCRIPTION = "Mainline Linux kernel"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
-
-inherit kernel
-
-require linux.inc
-
-# Since we're not using git, this doesn't make a difference, but we need to fill
-# in something or kernel-yocto.bbclass will fail.
-KBRANCH ?= "master"
-
-# Pull in the devicetree files into the rootfs
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree"
-
-KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
-
-S = "${WORKDIR}/linux-${PV}"
-	
-SRC_URI[md5sum] = "86f56f586f35ac3a98e086dccfd2ff99"
-SRC_URI[sha256sum] = "6f0a7b3abd48eca3df5e29bfbcfc1c06dd2792f86d23cdb9ad37cf3e572df2e3"
-
-SRC_URI = "https://www.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \
-        file://0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch \
-        file://defconfig \
-        "
-
-SRC_URI_append_orange-pi-zero += "\
-	file://0001-add-wifi-support.patch \
-	"
--- a/recipes-kernel/linux/linux.inc
+++ b/recipes-kernel/linux/linux.inc
@ -1,10 +1,11 @@
 DESCRIPTION = "Linux Kernel"
 SECTION = "kernel"
 LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"

 INC_PR = "r0"

-inherit kernel kernel-yocto siteinfo
+inherit kernel siteinfo

 # Enable OABI compat for people stuck with obsolete userspace
 ARM_KEEP_OABI ?= "0"
@ -15,14 +16,12 @@ CMDLINE_DEBUG ?= "loglevel=3"

 # Kernel bootlogo is distro-specific (default is OE logo).
 # Logo resolution (qvga, vga, ...) is machine-specific.
-LOGO_SIZE ?= '${@oe.utils.conditional("MACHINE_GUI_CLASS", "bigscreen", "vga", "qvga", d)}'
+LOGO_SIZE ?= '${@base_conditional("MACHINE_GUI_CLASS", "bigscreen", "vga", "qvga", d)}'
 # To use this, add file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 or similar
 # to your kernel recipe, and then structure your logos for each resolution
 # accordingly.

 LOCALVERSION ?= ""
-KCONFIG_MODE ?= "alldefconfig"
-KMACHINE ?= "${MACHINE}"

 #kernel_conf_variable CMDLINE "\"${CMDLINE} ${CMDLINE_DEBUG}\""
 kernel_conf_variable() {
@ -35,11 +34,8 @@ kernel_conf_variable() {
    fi
 }

-do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}binutils:do_populate_sysroot"
-do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot"
-do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot"
-
 do_configure_prepend() {
+    echo "" > ${B}/.config
    CONF_SED_SCRIPT=""

    #
@ -115,6 +111,9 @@ do_configure_prepend() {
        kernel_conf_variable CMDLINE \"${CMDLINE_NFSROOT_USB} ${CMDLINE_DEBUG}\"
    fi

+    sed -e "${CONF_SED_SCRIPT}" \
+    < '${WORKDIR}/defconfig' >>'${B}/.config'
+
    yes '' | oe_runmake -C ${S} O=${B} oldconfig
 }

--- a/recipes-kernel/linux/linux-mainline/arm/defconfig
+++ b/recipes-kernel/linux/linux-mainline/arm/defconfig
@ -511,7 +511,6 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_POWER_RESET=y
 CONFIG_THERMAL=y
-CONFIG_THERMAL_OF=y
 CONFIG_CPU_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_SUNXI_WATCHDOG=y
@ -688,27 +687,6 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PLATFORM=y
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_SIMPLE=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_PL2303=m
 CONFIG_MMC=y
 CONFIG_MMC_SUNXI=y
 CONFIG_LEDS_CLASS=y
@ -751,23 +729,9 @@ CONFIG_PWM_SUN4I=y
 CONFIG_PHY_SUN4I_USB=y
 CONFIG_PHY_SUN9I_USB=y
 CONFIG_EXT4_FS=y
-CONFIG_XFS_FS=m
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_FANOTIFY=y
 CONFIG_AUTOFS4_FS=m
 CONFIG_FUSE_FS=m
-CONFIG_OVERLAY_FS=m
-CONFIG_FSCACHE=m
-CONFIG_FSCACHE_STATS=y
-CONFIG_FSCACHE_HISTOGRAM=y
-CONFIG_CACHEFILES=m
-CONFIG_CACHEFILES_HISTOGRAM=y
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
 CONFIG_VFAT_FS=y
 CONFIG_TMPFS=y
 CONFIG_NFS_FS=y
@ -783,4 +747,3 @@ CONFIG_CRYPTO_SHA1_ARM_NEON=y
 CONFIG_CRYPTO_SHA256_ARM=y
 CONFIG_CRYPTO_SHA512_ARM_NEON=y
 CONFIG_CRYPTO_AES_ARM_BS=y
-CONFIG_USB_STORAGE=y
--- a/recipes-kernel/linux/linux_4.4.40.bb
+++ b/recipes-kernel/linux/linux_4.4.40.bb
@ -0,0 +1,24 @@
+SECTION = "kernel"
+DESCRIPTION = "Mainline Linux kernel"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i)"
+
+inherit kernel
+
+require recipes-kernel/linux/linux-dtb.inc
+require linux.inc
+
+# Pull in the devicetree files into the rootfs
+RDEPENDS_kernel-base += "kernel-devicetree"
+
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
+
+S = "${WORKDIR}/linux-${PV}"
+	
+SRC_URI[md5sum] = "2944984c89c272115649c4a08b43f8d0"
+SRC_URI[sha256sum] = "c4bc5ed6e73ed7393cc1b3714b822664224ab866db114eed663de1315718a4e1"
+
+SRC_URI = "https://www.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \
+        file://defconfig \
+        "
--- a/recipes-kernel/linux/linux-mainline_git.bb
+++ b/recipes-kernel/linux/linux-mainline_git.bb
@ -1,29 +1,26 @@
 SECTION = "kernel"
 DESCRIPTION = "Mainline Linux kernel"
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i)"

 inherit kernel

+require recipes-kernel/linux/linux-dtb.inc
 require linux.inc

-# Since we're not using git, this doesn't make a difference, but we need to fill
-# in something or kernel-yocto.bbclass will fail.
-KBRANCH ?= "master"
-
 # Pull in the devicetree files into the rootfs
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree"
+RDEPENDS_kernel-base += "kernel-devicetree"

 # Default is to use stable kernel version
 # If you want to use latest git version set to "1"
-DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE = "-1" 

 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 	
-# v4.17-rc7
-PV = "v4.17-rc7+git${SRCPV}"
-SRCREV_pn-${PN} = "b04e217704b7f879c6b91222b066983a44a7a09f"
+# 4.9.0
+PV = "4.9.0+git${SRCPV}"
+SRCREV_pn-${PN} = "69973b830859bc6529a7a0468ba0d80ee5117826"

 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;branch=master \
        file://defconfig \
--- a/recipes-kernel/xradio-firmware/xradio-firmware.bb
+++ b/recipes-kernel/xradio-firmware/xradio-firmware.bb
@ -1,25 +0,0 @@
-DESCRIPTION = "Xradio xr819 WiFi firmware"
-LICENSE = "CC0-1.0"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=0ceb3372c9595f0a8067e55da801e4a1"
-
-PV = "1.0"
-PR = "r0"
-
-SRCREV = "8b4a4ed16f7f9d12e59ff2f9ceba3cc335374dbe"
-
-COMPATIBLE_MACHINE = "orange-pi-zero"
-
-SRC_URI = "git://github.com/armbian/build.git;protocol=https"
-
-S = "${WORKDIR}/git"
-
-do_install() {
-    install -d ${D}${base_libdir}/firmware/xr819
-    install -m 0644 ${S}/bin/firmware-overlay/xr819/boot_xr819.bin ${D}${base_libdir}/firmware/xr819/
-    install -m 0644 ${S}/bin/firmware-overlay/xr819/sdd_xr819.bin ${D}${base_libdir}/firmware/xr819/
-    install -m 0644 ${S}/bin/firmware-overlay/xr819/fw_xr819.bin ${D}${base_libdir}/firmware/xr819/
-}
-
-FILES_${PN} = "${base_libdir}/*"
-
-PACKAGES = "${PN}"
--- a/recipes-kernel/xradio/xradio.bb
+++ b/recipes-kernel/xradio/xradio.bb
@ -1,23 +0,0 @@
-SUMMARY = "Xradio WiFi driver for orangepi-zero"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a23a74b3f4caf9616230789d94217acb"
-
-inherit module
-
-PV = "0.1"
-PR = "r0"
-
-RDEPENDS_${PN} += "xradio-firmware"
-
-COMPATIBLE_MACHINE = "orange-pi-zero"
-
-SRCREV = "d649e5a78efdc56ecd0951e35ca60db175650232"
-
-SRC_URI = "git://github.com/fifteenhex/xradio.git;protocol=https \
-          "
-
-S = "${WORKDIR}/git"
-
-EXTRA_OEMAKE += "-C ${STAGING_KERNEL_DIR} M=${S}"
-
-KERNEL_MODULE_AUTOLOAD += "xradio_wlan"
Author	SHA1	Message	Date
Enrico Butera	318c872680	sdcard_image-sunxi: fix dependency loop As suggested by Andrei Gherzan (see #178): "The current implementation inherits sdcard_image-sunxi.bbclass unconditionally which in turn, sets two depends on do_rootfs unconditionally again. This means that if I want to build an initramfs image in the kernel image I will get a dependency loop." Signed-off-by: Enrico Butera <ebutera@users.sourceforge.net> (cherry picked from commit `a84d6a40c1`)	2017-04-27 10:19:42 +02:00
Enrico Butera	3fd8a3fcc7	Merge pull request #179 from koenkooi/uboot-gcc6-morty u-boot-sunxi: gcc6 fix	2017-04-25 23:41:52 +02:00
Trevor Woerner	41e1179afb	u-boot-sunxi: gcc6 fix Fix the following build error when compiling u-boot-sunxi with gcc6: linux/compiler-gcc6.h: No such file or directory Signed-off-by: Trevor Woerner <twoerner@gmail.com>	2017-04-25 07:49:43 +02:00
Enrico Butera	12e77f9741	Merge pull request #166 from xpete/disabletslib Disable tslib bbappend Its usefulness is unknown and it's the only recipe that make us depend on meta-oe (cherry picked from commit `aaf413d6a7`)	2017-04-11 21:42:34 +02:00
Enrico Butera	941171c912	sdcard_image-sunxi: build fix Signed-off-by: Enrico Butera <ebutera@users.sourceforge.net>	2017-04-06 23:09:47 +02:00