Update for 2017.08.1

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
linux-headers: bump 4.{4, 9, 13}.x series
2017-10-23 23:41:14 +02:00 · 2017-10-23 00:41:33 +02:00 · 2017-10-23 00:40:34 +02:00 · 2017-10-23 00:40:02 +02:00 · 2017-10-23 00:39:43 +02:00 · 2017-10-23 00:39:21 +02:00
1569 changed files with 61896 additions and 17282 deletions
@@ -1,2 +0,0 @@
-[flake8]
-max-line-length=132
@@ -8,7 +8,7 @@ image: buildroot/base

 .defconfig_script: &defconfig_script
    - echo 'Configure Buildroot'
-    - make ${CI_JOB_NAME}
+    - make ${CI_BUILD_NAME}
    - echo 'Build buildroot'
    - |
        make > >(tee build.log |grep '>>>') 2>&1 || {
@@ -51,7 +51,7 @@ check-DEVELOPERS:
    # runner will clean up those files for us.
    # Multiply every emulator timeout by 10 to avoid sporadic failures in
    # elastic runners.
-    script: ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${CI_JOB_NAME}
+    script: ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${CI_BUILD_NAME}
    artifacts:
        when: always
        expire_in: 2 weeks
@@ -76,7 +76,6 @@ at91sam9x5ek_defconfig: *defconfig
 at91sam9x5ek_dev_defconfig: *defconfig
 at91sam9x5ek_mmc_defconfig: *defconfig
 at91sam9x5ek_mmc_dev_defconfig: *defconfig
-atmel_sama5d27_som1_ek_mmc_dev_defconfig: *defconfig
 atmel_sama5d2_xplained_mmc_defconfig: *defconfig
 atmel_sama5d2_xplained_mmc_dev_defconfig: *defconfig
 atmel_sama5d3_xplained_defconfig: *defconfig
@@ -88,8 +87,6 @@ atmel_sama5d4_xplained_defconfig: *defconfig
 atmel_sama5d4_xplained_dev_defconfig: *defconfig
 atmel_sama5d4_xplained_mmc_defconfig: *defconfig
 atmel_sama5d4_xplained_mmc_dev_defconfig: *defconfig
-bananapi_m1_defconfig: *defconfig
-bananapi_m2_plus_defconfig: *defconfig
 bananapro_defconfig: *defconfig
 beagleboardx15_defconfig: *defconfig
 beaglebone_defconfig: *defconfig
@@ -100,7 +97,6 @@ ci40_defconfig: *defconfig
 csky_gx6605s_defconfig: *defconfig
 cubieboard2_defconfig: *defconfig
 engicam_imx6qdl_icore_defconfig: *defconfig
-engicam_imx6qdl_icore_qt5_defconfig: *defconfig
 engicam_imx6qdl_icore_rqs_defconfig: *defconfig
 engicam_imx6ul_geam_defconfig: *defconfig
 engicam_imx6ul_isiot_defconfig: *defconfig
@@ -123,11 +119,8 @@ gdb_bfin_bf512_defconfig: *defconfig
 grinn_chiliboard_defconfig: *defconfig
 grinn_liteboard_defconfig: *defconfig
 imx23evk_defconfig: *defconfig
-imx6-sabreauto_defconfig: *defconfig
-imx6-sabresd_defconfig: *defconfig
-imx6-sabresd_qt5_defconfig: *defconfig
+imx6q-sabresd_defconfig: *defconfig
 imx6ulpico_defconfig: *defconfig
-imx7dpico_defconfig: *defconfig
 lego_ev3_defconfig: *defconfig
 linksprite_pcduino_defconfig: *defconfig
 minnowboard_max-graphical_defconfig: *defconfig
@@ -179,7 +172,6 @@ qemu_mips64r6el_malta_defconfig: *defconfig
 qemu_nios2_10m50_defconfig: *defconfig
 qemu_or1k_defconfig: *defconfig
 qemu_ppc64_pseries_defconfig: *defconfig
-qemu_ppc64le_pseries_defconfig: *defconfig
 qemu_ppc_g3beige_defconfig: *defconfig
 qemu_ppc_mpc8544ds_defconfig: *defconfig
 qemu_ppc_virtex_ml507_defconfig: *defconfig
@@ -195,7 +187,6 @@ raspberrypi0_defconfig: *defconfig
 raspberrypi2_defconfig: *defconfig
 raspberrypi3_64_defconfig: *defconfig
 raspberrypi3_defconfig: *defconfig
-raspberrypi3_qt5we_defconfig: *defconfig
 raspberrypi_defconfig: *defconfig
 riotboard_defconfig: *defconfig
 roseapplepi_defconfig: *defconfig
@@ -214,7 +205,6 @@ toradex_apalis_imx6_defconfig: *defconfig
 ts4800_defconfig: *defconfig
 ts4900_defconfig: *defconfig
 ts5x00_defconfig: *defconfig
-ts7680_defconfig: *defconfig
 wandboard_defconfig: *defconfig
 warp7_defconfig: *defconfig
 warpboard_defconfig: *defconfig
@@ -233,6 +223,8 @@ tests.fs.test_ext.TestExt3: *runtime_test
 tests.fs.test_ext.TestExt4: *runtime_test
 tests.fs.test_iso9660.TestIso9660Grub2External: *runtime_test
 tests.fs.test_iso9660.TestIso9660Grub2Internal: *runtime_test
+tests.fs.test_iso9660.TestIso9660GrubExternal: *runtime_test
+tests.fs.test_iso9660.TestIso9660GrubInternal: *runtime_test
 tests.fs.test_iso9660.TestIso9660SyslinuxExternal: *runtime_test
 tests.fs.test_iso9660.TestIso9660SyslinuxInternal: *runtime_test
 tests.fs.test_jffs2.TestJffs2: *runtime_test
@@ -8,7 +8,7 @@ image: buildroot/base

 .defconfig_script: &defconfig_script
    - echo 'Configure Buildroot'
-    - make ${CI_JOB_NAME}
+    - make ${CI_BUILD_NAME}
    - echo 'Build buildroot'
    - |
        make > >(tee build.log |grep '>>>') 2>&1 || {
@@ -51,7 +51,7 @@ check-DEVELOPERS:
    # runner will clean up those files for us.
    # Multiply every emulator timeout by 10 to avoid sporadic failures in
    # elastic runners.
-    script: ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${CI_JOB_NAME}
+    script: ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${CI_BUILD_NAME}
    artifacts:
        when: always
        expire_in: 2 weeks
@@ -1,136 +1,3 @@
-2017.11, Released November 30, 2017
-
-	Fixes all over the tree.
-
-	Toolchain: Use github mirror for Glibc.
-
-	Defconfigs: Correct boot.cmd for bananapi-m1.
-
-	Makefiles: Workaround include order issues for certain make
-	versions by explicitly sorting the result of wildcard where it
-	matters.
-
-	Download: Ensure subversion runs in non-interactive mode.
-
-	Updated/fixed packages: asterisk, boost, chrony, dovecot,
-	dvb-apps, exim, feh, freerdp, fwup, google-breakpad, jose,
-	kvm-unit-test, lftp, libcurl, libevent, libfastjson, libpjsip,
-	libupnp, linphone, localedef, lttng-tools, mp4v2, mtools,
-	ndisc6, oracle-mysql, parted, pdbg, qt, qt5connectivity,
-	qt5declarative, qt5webkit, rauc, runc, samba4, shairport-sync,
-	systemd-bootchart, webkitgtk, wireguard, xlib_libXcursor,
-	xlib_libXfont, xlib_libXfont2,
-
-	Issues resolved (http://bugs.buildroot.org):
-
-	10501: host-localedef fails to compile on Ubuntu 17.10
-	10506: Changed kernel image type (e.g. zImage to uImage)...
-
-2017.11-rc2, Released November 13th, 2017
-
-	Fixes all over the tree.
-
-	Updated/fixed packages: collectd, ffmpeg, freerdp,
-	go-bootstrap, imagemagick, jimtcl, libpjsip, libplist, libuv,
-	mesa3d, nodejs, ntp, openjpeg, postgresql, python-numpy, ruby,
-	snmp++, usb_modeswitch, util-linux, vboot-utils, webkitgtk,
-	wireshark, wpa_supplicant, xapp_xdriinfo
-
-	Issues resolved (http://bugs.buildroot.org):
-
-	#10326: mesa3d package fails to build when BR2_SHARED_STATIC_LIBS=y
-	#10491: Cannot output security warning when compiled with buildroot..
-
-2017.11-rc1, Released November 6th, 2017
-
-	Fixes all over the tree and new features.
-
-	Openssl is now a virtual package, which may be provided by
-	OpenSSL (now renamed to libopenssl) or LibreSSL.
-
-	libssh2: there is now an explicit choice of the backend to use
-	(mbedtls, gnutls or openssl). Previously, the choice was implicit
-	based on the TLS library that was selected. Now, it is possible to
-	choose the backend, which is important if several TLS libraries are
-	selected.
-
-	netsnmp: all MIB files are now installed, making the target filesystem a
-	bit bigger than before. To remove unneeded MIBS, you should use a
-	post-build script.
-
-	Toolchain: Linaro toolchains updated to 2017.08, ARC toolchain
-	updated to 2017.09, Glibc updated to 2.26, Glibc support for
-	ARCv2. The toolchain wrapper now handles SOURCE_DATE_EPOCH for
-	older (pre-gcc7.x) toolchains for BR2_REPRODUCIBLE.
-
-	New defconfigs: Atmel SAM45D27, Bananapi M1 and M2 Plus,
-	Engicam i.CoreM6 Qt5 configuration, i.MX6 sabreauto (mainline
-	kernel/u-boot), i.MX6Q sabresd Qt5 configuration, i.MX7d-pico,
-	QEMU ppc64le, Raspberry pi3 Qt5 webengine configuration,
-	Technologic TS-7680.
-
-	New packages: asterisk, azmq, bcg729, boinc, dahdi-linux,
-	dahdi-tools, freeswitch-mod-bcg729, fscryptctl, libb64,
-	libpri, libss7, lua-basexx, lua-compat53, lua-cqueues,
-	lua-curl, lua-datafile, lua-fifo, lua-httpd,
-	lua-lpeg-patterns, lua-markdown, lua-sailor, lua-value,
-	luksmeta, minetest, minetest-game, pdmenu, prosody,
-	python-aiocoap, python-automat, python-ibmiotf,
-	python-iso8601, python-m2r, python-simplesqlite,
-	python-websockets, python-xmltodict, qt5wayland, qt5webengine,
-	restorecond, selinux-python, semodule-utils, uhubctl,
-	wireguard, wsapi-fcgi, wsapi-xavante
-
-	Removed packages: aiccu, rfkill, sepolgen
-
-	Issues resolved (http://bugs.buildroot.org):
-
-	#10281: lsblk does not compile for util-linux
-	#10336: lttng compilation fails : linking error
-	#10351: glibc missing in rootfs
-	#10356: nfs-utils missing header
-	#10361: python3 python-config script generates invalid includes
-	#10366: dropbear download url has changed
-	#10391: WiringPi retrieves wrong (old) version
-	#10406: Beaglebone black: Buggy SGX driver version, swapped...
-	#10426: uboot-tools' fw_setenv does not update the redundant...
-	#10451: libpcap 1.8.x and 1.7x does not compile on PPC
-
-2017.08.2, Released November 28th, 2017
-
-	Important / security related fixes.
-
-	Qt: 5.6 version updated to 5.6.3.
-
-	Reproducible: Do not override SOURCE_DATE_EPOCH if already set
-	in the environment.
-
-	Makefiles: Workaround include order issues for certain make
-	versions by explicitly sorting the result of wildcard where it
-	matters.
-
-	Updated/fixed packages: apr, apr-util, arqp-standalone,
-	azure-iot-sdk-c, collectd, dvb-apps, ffmpeg, go-bootstrap,
-	google-breakpad, gstreamer, imagemagick, irssi, jimtcl,
-	kvm-unit-test, libcurl, libfastjson, libglib2, libidn,
-	libpjsip, libplist, localedef, lttng-tools, luajit, mesa3d,
-	moarvm, mp4v2, openssh, openssl, oracle-mysql, postgresql,
-	python3, python-pyqt5, qt, qt5base, qt5canvas3d,
-	qt5connectivity, qt5declarative, qt5engineio,
-	qt5graphicaleffects, qt5imageformats, qt5location,
-	qt5multimedia, qt5quickcontrols, qt5quickcontrols2, qt5script,
-	qt5sensors, qt5serialbus, qt5serialport, qt5svg, qt5tools,
-	qt5webchannel, qt5webkit, qt5websockets, qt5x11extras,
-	qt5xmlpatterns, quagga, redis, ruby, samba4, sdl2, snmppp,
-	swupdate, ti-gfx, uboot-tools, usb_modeswitch, vboot-utils,
-	webkitgtk, wget, wireshark, xapp_xdriinfo.
-
-	Issues resolved (http://bugs.buildroot.org):
-
-	10326: mesa3d package fails to build when BR2_SHARED_STATIC_LIBS=y
-	10361: python3 python-config script generates invalid includes
-	10501: host-localedef fails to compile on Ubuntu 17.10
-
 2017.08.1, Released October 23rd, 2017

 	Important / security related fixes.
@@ -660,81 +527,6 @@
 	#9846: musl libc not installed correctly in target folder
 	#9856: build libubox failed on ubuntu 17.04 64bit

-2017.02.8, Released November 27th, 2017
-
-	Important / security related fixes.
-
-	Qt: 5.6 version updated to 5.6.3.
-
-	Reproducible: Do not override SOURCE_DATE_EPOCH if already set
-	in the environment.
-
-	Updated/fixed packages: apr, apr-util, arqp-standalone,
-	collectd, dvb-apps, ffmpeg, google-breakpad, gstreamer,
-	imagemagick, libfastjson, libglib2, libpjsip, libplist,
-	localedef, luajit, mesa3d, openssh, openssl, postgresql,
-	python3, python-pyqt5, qt5base, qt5canvas3d, qt5connectivity,
-	qt5declarative, qt5engineio, qt5graphicaleffects,
-	qt5imageformats, qt5location, qt5multimedia, qt5quickcontrols,
-	qt5quickcontrols2, qt5script, qt5sensors, qt5serialbus,
-	qt5serialport, qt5svg, qt5tools, qt5webchannel, qt5webkit,
-	qt5websockets, qt5x11extras, qt5xmlpatterns, quagga, ruby,
-	samba4, snmppp, ti-gfx, vboot-utils, webkitgtk, wireshark,
-	xapp_xdriinfo.
-
-	Issues resolved (http://bugs.buildroot.org):
-
-	10326: mesa3d package fails to build when BR2_SHARED_STATIC_LIBS=y
-	10361: python3 python-config script generates invalid includes
-	10501: host-localedef fails to compile on Ubuntu 17.10
-
-2017.02.7, Released October 28th, 2017
-
-	Important / security related fixes.
-
-	Webkitgtk bumped to the 2.18.x series, fixing a large number
-	of security issues.
-
-	Defconfigs: wandboard: Correct rootfs offset
-
-	Toolchain: Linaro toolchains updated to 2017.08 release,
-	fixing a number of issues. Musl: fix for CVE-2017-15650.
-
-	Updated/fixed packages: busybox, bzip2, dnsmasq, git, go,
-	hostapd, irssi, iucode-tool, lame, libcurl, libffi, libnspr,
-	libnss, nodejs, openssh, openvpn, qemu, qt, redis, sdl2,
-	webkitgtk, wget, wpa_supplicant, xen, xlib_libXfont,
-	xlib_libXfont2, xserver_xorg-server
-
-2017.02.6, Released September 24th, 2017
-
-	Important / security related fixes.
-
-	Cmake: Ensure correct pkg-config is used when building host
-	packages
-
-	fs/iso9660: Ensure files from earlier builds are not included.
-
-	Updated/fixed packages: apache, bcusdk, bind, binutils,
-	bluez5_utils, botan, cmake, connman, dbus, dialog, e2fsprogs,
-	faad2, fakeroot, ffmpeg, file, flashrom, gcc, gd, gdb,
-	gdk-pixbuf, git, gnupg, gpsd, grub2, gst1-plugins-bad,
-	imagemagick, iostat, iucode-tool, jack2, libarchive, libcurl,
-	libgcrypt, libidn, libphidget, librsync, librsvg, libsoup,
-	libxml2, linux-tools, lua, mariadb, mbedtls, mediastreamer,
-	minidlna, netplug, nss-pam-ldapd, nvidia-driver, openjpeg,
-	postgresql, proxychains-ng, python-libconfig,
-	python-service-identity, qt, rpcbind, ruby, samba4, squashfs,
-	squid, strongswan, subversion, supervisor, sysvinit, tcpdump,
-	tor, transmission, unrar, valgrind, vim, webkitgtk, whois,
-	xen, zmqpp
-
-	Issues resolved (http://bugs.buildroot.org):
-
-	#10141: Squashfs extended attribute failures
-	#10261: Grub2 fails to build for x86_64
-	#10276: BR2_PACKAGE_LINUX_TOOLS_GPIO fails for MIPS with...
-
 2017.02.5, Released July 27th, 2017

 	Important / security related fixes.
@@ -63,7 +63,7 @@ config BR2_HOST_GCC_AT_LEAST_7
 	select BR2_HOST_GCC_AT_LEAST_6

 # Hidden boolean selected by packages in need of Java in order to build
-# (example: kodi)
+# (example: xbmc)
 config BR2_NEEDS_HOST_JAVA
 	bool

@@ -106,7 +106,7 @@ config BR2_WGET

 config BR2_SVN
 	string "Subversion (svn) command"
-	default "svn --non-interactive"
+	default "svn"

 config BR2_BZR
 	string "Bazaar (bzr) command"
@@ -539,7 +539,6 @@ config BR2_GOOGLE_BREAKPAD_ENABLE
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC)
 	depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS
-	depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS
 	help
 	  This option will enable the use of google breakpad, a library
 	  and tool suite that allows you to distribute an application to
@@ -713,8 +712,6 @@ config BR2_COMPILER_PARANOID_UNSAFE_PATH

 config BR2_REPRODUCIBLE
 	bool "Make the build reproducible (experimental)"
-	# SOURCE_DATE_EPOCH support in toolchain-wrapper requires GCC 4.4
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_4
 	help
 	  This option will remove all sources of non-reproducibility
 	  from the build process. For a given Buildroot configuration,
@@ -142,127 +142,9 @@ comment "build, or run, in unpredictable ways.               "
 comment "----------------------------------------------------"
 endif

-###############################################################################
-comment "Legacy options removed in 2017.11"
-
-config BR2_PACKAGE_RFKILL
-	bool "rfkill package removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_UTIL_LINUX
-	select BR2_PACKAGE_UTIL_LINUX_RFKILL
-	help
-	  The rfkill program is now provided by the util-linux package.
-
-config BR2_PACKAGE_UTIL_LINUX_RESET
-	bool "util-linux reset option removed"
-	select BR2_LEGACY
-	help
-	  The util-linux package no longer offers a "reset" command. Use
-	  either the reset command provided by BusyBox or select ncurses
-	  programs, which will install a symlink from "tset" to reset.
-
-config BR2_PACKAGE_POLICYCOREUTILS_AUDIT2ALLOW
-	bool "policycoreutils audit2allow option removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_SELINUX_PYTHON
-	select BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW
-	help
-	  The policycoreutils package no longer offers audit2allow
-	  as a option. This package has been moved into the
-	  selinux-python package by the SELinux maintainers.
-
-config BR2_PACKAGE_POLICYCOREUTILS_RESTORECOND
-	bool "policycoreutils restorecond option removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_RESTORECOND
-	help
-	  The policycoreutils package no longer offers restorecond
-	  as a option.  This package has been moved into a seperate
-	  package maintained by the SELinux maintainers.
-
-config BR2_PACKAGE_SEPOLGEN
-	bool "sepolgen package has been removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_SELINUX_PYTHON
-	select BR2_PACKAGE_SELINUX_PYTHON_SEPOLGEN
-	help
-	  Sepolgen is no longer a individual package, but instead has
-	  been moved into the selinux-python package by the SELinux
-	  maintainers.
-
-config BR2_PACKAGE_OPENOBEX_BLUEZ
-	bool "openobex bluez option removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_BLUEZ_UTILS
-	help
-	  The OpenOBEX package no longer offers an option to enable or
-	  disable BlueZ support. Instead, BlueZ support is always
-	  included when the bluez5_utils or bluez_utils package is
-	  selected.
-
-config BR2_PACKAGE_OPENOBEX_LIBUSB
-	bool "openobex libusb option removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_LIBUSB
-	help
-	  The OpenOBEX package no longer offers an option to enable or
-	  disable libusb support. Instead, USB support is always
-	  included when the libusb package is selected.
-
-config BR2_PACKAGE_OPENOBEX_APPS
-	bool "openobex apps option removed"
-	select BR2_LEGACY
-	help
-	  The OpenOBEX package no longer offers an option to enable or
-	  disable apps support.
-
-config BR2_PACKAGE_OPENOBEX_SYSLOG
-	bool "openobex syslog option removed"
-	select BR2_LEGACY
-	help
-	  The OpenOBEX package no longer offers an option to enable or
-	  disable syslog support.
-
-config BR2_PACKAGE_OPENOBEX_DUMP
-	bool "openobex dump option removed"
-	select BR2_LEGACY
-	help
-	  The OpenOBEX package no longer offers an option to enable or
-	  disable dump support.
-
-config BR2_PACKAGE_AICCU
-	bool "aiccu utility removed"
-	select BR2_LEGACY
-	help
-	  As the SixXS project has ceased its operation on 2017-06-06,
-	  the AICCU utility has no use anymore and has been removed.
-
-	  https://www.sixxs.net/sunset/
-
-config BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS
-	bool "util-linux login utilities option removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_UTIL_LINUX_LAST
-	select BR2_PACKAGE_UTIL_LINUX_LOGIN
-	select BR2_PACKAGE_UTIL_LINUX_RUNUSER
-	select BR2_PACKAGE_UTIL_LINUX_SU
-	select BR2_PACKAGE_UTIL_LINUX_SULOGIN
-	help
-	  Login utilities (last, login, runuser, su, sulogin) now have
-	  their own configuration options in the util-linux menu.
-
 ###############################################################################
 comment "Legacy options removed in 2017.08"

-config BR2_TARGET_GRUB
-	bool "grub (aka grub-legacy) has been removed"
-	select BR2_LEGACY
-	help
-	  grub-legacy is no longer maintained, and no longer builds with
-	  recent binutils versions.
-
-	  Use grub2 or syslinux instead.
-
 config BR2_PACKAGE_SIMICSFS
 	bool "simicsfs support removed"
 	select BR2_LEGACY
@@ -31,16 +31,8 @@ F:	package/gstreamer1/gst1-rtsp-server/

 N:	Adam Duskett <aduskett@gmail.com>
 F:	package/audit/
-F:	package/busybox/
 F:	package/checkpolicy/
-F:	package/cppdb/
-F:	package/gstreamer1/gstreamer1/
-F:	package/gstreamer1/gst1-plugins-bad/
-F:	package/gstreamer1/gst1-plugins-base/
-F:	package/gstreamer1/gst1-plugins-good/
-F:	package/gstreamer1/gst1-plugins-ugly/
 F:	package/gstreamer1/gst1-vaapi/
-F:	package/imx-usb-loader/
 F:	package/janus-gateway/
 F:	package/libressl/
 F:	package/libselinux/
@@ -49,22 +41,14 @@ F:	package/libsepol/
 F:	package/nginx-naxsi/
 F:	package/policycoreutils/
 F:	package/python-mutagen/
-F:	package/restorecond/
 F:	package/refpolicy/
-F:	package/selinux-python/
-F:	package/semodule-utils/
+F:	package/sepolgen/
 F:	package/setools/
 F:	package/sngrep/

 N:	Adrian Perez de Castro <aperez@igalia.com>
-F:	package/libepoxy/
 F:	package/webkitgtk/

-N:	Aleksander Morgado <aleksander@aleksander.es>
-F:	package/libmbim/
-F:	package/libqmi/
-F:	package/modem-manager/
-
 N:	Alex Suykov <alex.suykov@gmail.com>
 F:	package/vboot-utils/

@@ -125,7 +109,6 @@ N:	Andy Kennedy <andy.kennedy@adtran.com>
 F:	package/libunwind/

 N:	Angelo Compagnucci <angelo.compagnucci@gmail.com>
-F:	package/i2c-tools/
 F:	package/mono/
 F:	package/mono-gtksharp3/
 F:	package/monolite/
@@ -192,17 +175,9 @@ F:	package/sigrok-cli/

 N:	Baruch Siach <baruch@tkos.co.il>
 F:	package/daemon/
-F:	package/dropbear/
 F:	package/ebtables/
-F:	package/i2c-tools/
-F:	package/libcurl/
-F:	package/libpcap/
 F:	package/openipmi/
-F:	package/socat/
-F:	package/strace/
-F:	package/tcpdump/
 F:	package/ti-uim/
-F:	package/uhubctl/

 N:	Ben Boeckel <mathstuf@gmail.com>
 F:	package/taskd/
@@ -216,9 +191,7 @@ F:	package/alsa-utils/
 F:	package/apache/
 F:	package/apr/
 F:	package/apr-util/
-F:	package/bcg729/
 F:	package/bluez-tools/
-F:	package/boinc/
 F:	package/clamav/
 F:	package/dovecot/
 F:	package/dovecot-pigeonhole/
@@ -227,7 +200,6 @@ F:	package/eudev/
 F:	package/exim/
 F:	package/fetchmail/
 F:	package/freeswitch/
-F:	package/freeswitch-mod-bcg729/
 F:	package/ffmpeg/
 F:	package/ghostscript/
 F:	package/giflib/
@@ -270,7 +242,6 @@ F:	package/libogg/
 F:	package/libopenh264/
 F:	package/libpciaccess/
 F:	package/libplatform/
-F:	package/libpng/
 F:	package/libsidplay2/
 F:	package/libsilk/
 F:	package/libsndfile/
@@ -355,9 +326,6 @@ N:	Bogdan Radulescu <bogdan@nimblex.net>
 F:	package/iftop/
 F:	package/ncdu/

-N:	Brock Williams <brock@cottonwoodcomputer.com>
-F:	package/pdmenu/
-
 N:	Bryan Brinsko <bryan.brinsko@rockwellcollins.com>
 F:	package/pps-tools/

@@ -427,6 +395,7 @@ F:	package/libselinux/
 F:	package/libsemanage/
 F:	package/libsepol/
 F:	package/policycoreutils/
+F:	package/sepolgen/
 F:	package/ustr/

 N:	Corentin Guillevic <corentin.guillevic@smile.fr>
@@ -516,9 +485,6 @@ F:	package/nss-pam-ldapd/
 F:	package/sp-oops-extract/
 F:	package/unscd/

-N:	Dushara Jayasinghe <nidujay@gmail.com>
-F:	package/prosody/
-
 N:	Ed Swierk <eswierk@skyportsystems.com>
 F:	package/xxhash/

@@ -553,7 +519,6 @@ F:	package/efivar/
 F:	package/fwts/
 F:	package/spi-tools/
 F:	package/xdotool/
-F:	configs/pc_x86_64_*

 N:	Erik Stromdahl <erik.stromdahl@gmail.com>
 F:	package/mxsldr/
@@ -578,7 +543,6 @@ F:	package/supertuxkart/
 N:	Fabio Estevam <festevam@gmail.com>
 F:	board/warp7/
 F:	configs/freescale_imx*
-F:	configs/imx6-sabresd*
 F:	configs/imx6ulpico_defconfig
 F:	configs/mx6cubox_defconfig
 F:	configs/mx6sx_udoo_neo_defconfig
@@ -602,7 +566,6 @@ F:	package/alljoyn/
 F:	package/alljoyn-base/
 F:	package/alljoyn-tcl/
 F:	package/alljoyn-tcl-base/
-F:	package/boinc/
 F:	package/gtksourceview/
 F:	package/gssdp/
 F:	package/gupnp/
@@ -610,7 +573,6 @@ F:	package/gupnp-dlna/
 F:	package/gupnp-tools/
 F:	package/hiredis/
 F:	package/igd2-for-linux/
-F:	package/libupnp/
 F:	package/minissdpd/
 F:	package/motion/
 F:	package/tinycbor/
@@ -651,8 +613,6 @@ F:	package/qemu/
 F:	package/sdl2_mixer/
 F:	package/sdl2_net/
 F:	package/tekui/
-F:	package/wsapi-fcgi/
-F:	package/wsapi-xavante/
 F:	utils/scancpan

 N:	Frank Hunleth <fhunleth@troodon-software.com>
@@ -670,7 +630,6 @@ F:	package/zxing-cpp/

 N:	Gaël Portay <gael.portay@savoirfairelinux.com>
 F:	package/qt5/qt5virtualkeyboard/
-F:	package/qt5/qt5webengine/

 N:	Gary Bisson <gary.bisson@boundarydevices.com>
 F:	board/boundarydevices/
@@ -720,6 +679,157 @@ F:	arch/Config.in.csky
 F:	board/csky/
 F:	configs/csky_*

+N:	Gustavo Zacarias <gustavo@zacarias.com.ar>
+F:	arch/Config.in.powerpc
+F:	board/qemu/
+F:	configs/qemu_*
+F:	package/argp-standalone/
+F:	package/arptables/
+F:	package/audiofile/
+F:	package/autossh/
+F:	package/bitstream-vera/
+F:	package/blktrace/
+F:	package/bmon/
+F:	package/btrfs-progs/
+F:	package/c-ares/
+F:	package/cantarell/
+F:	package/check/
+F:	package/collectd/
+F:	package/comix-cursors/
+F:	package/connman-gtk/
+F:	package/conntrack-tools/
+F:	package/cppdb/
+F:	package/crda/
+F:	package/cryptodev-linux/
+F:	package/dbus-cpp/
+F:	package/debianutils/
+F:	package/dt/
+F:	package/exfat/
+F:	package/exfat-utils/
+F:	package/f2fs-tools/
+F:	package/faad2/
+F:	package/fping/
+F:	package/ftop/
+F:	package/gcr/
+F:	package/geoip/
+F:	package/gpsd/
+F:	package/granite/
+F:	package/graphite2/
+F:	package/gsettings-desktop-schemas/
+F:	package/gstreamer1/
+F:	package/hans/
+F:	package/haveged/
+F:	package/heimdal/
+F:	package/hostapd/
+F:	package/ifupdown/
+F:	package/inconsolata/
+F:	package/iodine/
+F:	package/iperf3/
+F:	package/ipset/
+F:	package/iw/
+F:	package/jhead/
+F:	package/jquery-keyboard/
+F:	package/kompexsqlite/
+F:	package/kvmtool/
+F:	package/lame/
+F:	package/lft/
+F:	package/libao/
+F:	package/libcroco/
+F:	package/libcue/
+F:	package/libcuefile/
+F:	package/libepoxy/
+F:	package/libgee/
+F:	package/libglib2/
+F:	package/libgtk2/
+F:	package/libgtk3/
+F:	package/libmcrypt/
+F:	package/libmemcached/
+F:	package/libmhash/
+F:	package/libmnl/
+F:	package/libmng/
+F:	package/libmpdclient/
+F:	package/libnetfilter_acct/
+F:	package/libnetfilter_conntrack/
+F:	package/libnetfilter_cthelper/
+F:	package/libnetfilter_cttimeout/
+F:	package/libnetfilter_log/
+F:	package/libnetfilter_queue/
+F:	package/libnfnetlink/
+F:	package/libnl/
+F:	package/liboping/
+F:	package/libreplaygain/
+F:	package/libsamplerate/
+F:	package/libtorrent/
+F:	package/libuv/
+F:	package/lksctp-tools/
+F:	package/lshw/
+F:	package/lz4/
+F:	package/lzip/
+F:	package/mbedtls/
+F:	package/mcrypt/
+F:	package/memcached/
+F:	package/minizip/
+F:	package/mpd/
+F:	package/mpv/
+F:	package/mtr/
+F:	package/musepack/
+F:	package/ncmpc/
+F:	package/net-tools/
+F:	package/netstat-nat/
+F:	package/nettle/
+F:	package/nfacct/
+F:	package/nftables/
+F:	package/nload/
+F:	package/nmap/
+F:	package/noip/
+F:	package/norm/
+F:	package/obsidian-cursors/
+F:	package/ocf-linux/
+F:	package/opencore-amr/
+F:	package/openswan/
+F:	package/openvpn/
+F:	package/opusfile/
+F:	package/p11-kit/
+F:	package/p910nd/
+F:	package/pax-utils/
+F:	package/procrank_linux/
+F:	package/php-*
+F:	package/pkgconf/
+F:	package/privoxy/
+F:	package/protobuf-c/
+F:	package/ptpd/
+F:	package/ptpd2/
+F:	package/pwgen/
+F:	package/ramspeed/
+F:	package/rng-tools/
+F:	package/rtorrent/
+F:	package/samba4/
+F:	package/sbc/
+F:	package/snmppp/
+F:	package/sox/
+F:	package/spidev_test/
+F:	package/squid/
+F:	package/start-stop-daemon/
+F:	package/swig/
+F:	package/thrift/
+F:	package/twolame/
+F:	package/ulogd/
+F:	package/unionfs/
+F:	package/unrar/
+F:	package/ushare/
+F:	package/vala/
+F:	package/vorbis-tools/
+F:	package/wavpack/
+F:	package/wayland-protocols/
+F:	package/webkitgtk/
+F:	package/whois/
+F:	package/wireshark/
+F:	package/wpa_supplicant/
+F:	package/wpan-tools/
+F:	package/x11r7/xdriver_xf86-video-qxl/
+F:	package/xtables-addons/
+F:	package/zd1211-firmware/
+
 N:	Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
 F:	package/gnuradio/
 F:	package/gqrx/
@@ -748,11 +858,8 @@ N:	Ilias Apalodimas <apalos@gmail.com>
 F:	package/keepalived/

 N:	Jagan Teki <jagan@amarulasolutions.com>
-F:	board/bananapi/
 F:	board/engicam/
-F:	configs/bananapi_m1_defconfig
 F:	configs/engicam_imx6qdl_icore_defconfig
-F:	configs/engicam_imx6qdl_icore_qt5_defconfig
 F:	configs/engicam_imx6qdl_icore_rqs_defconfig
 F:	configs/engicam_imx6ul_geam_defconfig
 F:	configs/engicam_imx6ul_isiot_defconfig
@@ -793,11 +900,6 @@ F:	package/fxload/

 N:	Joel Stanley <joel@jms.id.au>
 F:	package/pdbg/
-F:	board/qemu/ppc64le-pseries/
-F:	configs/qemu_ppc64le_pseries_defconfig
-
-N:	Joseph Kogut <joseph.kogut@gmail.com>
-F:	package/python-websockets/

 N:	Johan Derycke <johanderycke@gmail.com>
 F:	package/python-libconfig/
@@ -845,9 +947,6 @@ F:	package/libuio/
 F:	package/netsniff-ng/
 F:	package/rabbitmq-c/

-N:	Joshua Henderson <joshua.henderson@microchip.com>
-F:	package/qt5/qt5wayland/
-
 N:	Juha Rantanen <juha@codercoded.com>
 F:	package/acsccid/

@@ -967,7 +1066,7 @@ F:	support/legal-info/
 N:	Lucas De Marchi <lucas.de.marchi@gmail.com>
 F:	package/fswebcam/

-N:	Ludovic Desroches <ludovic.desroches@microchip.com>
+N:	Ludovic Desroches <ludovic.desroches@atmel.com>
 F:	board/atmel/
 F:	configs/at91*
 F:	configs/atmel_*
@@ -1039,73 +1138,33 @@ F:	configs/ts4900_defconfig
 F:	package/ts4900-fpga/

 N:	Matt Weber <matthew.weber@rockwellcollins.com>
-F:	package/argp-standalone/
-F:	package/aufs/
-F:	package/aufs-util/
 F:	package/bc/
-F:	package/bridge-utils/
 F:	package/checkpolicy/
 F:	package/cgroupfs-mount/
-F:	package/crda/
-F:	package/devmem2/
-F:	package/dnsmasq/
-F:	package/dosfstools/
-F:	package/eeprog/
 F:	package/eigen/
-F:	package/ethtool/
-F:	package/flashbench/
 F:	package/fmc/
 F:	package/fmlib/
-F:	package/git/
-F:	package/gnutls/
-F:	package/hostapd/
-F:	package/i2c-tools/
-F:	package/ifplugd/
 F:	package/igmpproxy/
-F:	package/iperf/
-F:	package/iperf3/
 F:	package/iputils/
-F:	package/iw/
 F:	package/libcsv/
-F:	package/libcurl/
-F:	package/libfcgi/
-F:	package/libopenssl/
 F:	package/libselinux/
 F:	package/libsemanage/
 F:	package/libsepol/
-F:	package/libssh2/
 F:	package/libqmi/
-F:	package/lighttpd/
-F:	package/logrotate/
-F:	package/makedevs/
-F:	package/memtester/
-F:	package/mii-diag/
-F:	package/mrouted/
-F:	package/mtd/
-F:	package/mtools/
 F:	package/nginx-upload/
 F:	package/omniorb/
 F:	package/paxtest/
-F:	package/picocom/
 F:	package/policycoreutils/
-F:	package/proftpd/
-F:	package/protobuf-c/
-F:	package/protobuf/
 F:	package/python-ipy/
 F:	package/python-posix-ipc/
 F:	package/python-pypcap/
 F:	package/python-pyrex/
 F:	package/raptor/
-F:	package/rng-tools/
-F:	package/rsyslog/
+F:	package/sepolgen/
 F:	package/setools/
 F:	package/smcroute/
 F:	package/tclap/
-F:	package/uboot-tools/
-F:	package/unionfs/
 F:	package/valijson/
-F:	package/wpa_supplicant/
-F:	package/wireless_tools/

 N:	Mauro Condarelli <mc5686@mclink.it>
 F:	package/mc/
@@ -1166,6 +1225,7 @@ N:	Maxime Ripard <maxime.ripard@free-electrons.com>
 F:	package/kmsxx/

 N:	Michael Rommel <rommel@layer-7.net>
+F:	package/aiccu/
 F:	package/knock/
 F:	package/python-crc16/
 F:	package/python-pyzmq/
@@ -1187,9 +1247,8 @@ N:	Murat Demirten <mdemirten@yh.com.tr>
 F:	package/jpeg-turbo/
 F:	package/libgeotiff/

-N:	Mike Harmony <mike.harmony@snapav.com>
-F:	board/sinovoip/m2-plus/
-F:	configs/bananapi_m2_plus_defconfig
+N:	Naoki Matsumoto <n-matsumoto@melcoinc.co.jp>
+F:	package/pcre2/

 N:	Nathan Lynch <ntl@pobox.com>
 F:	package/chrony/
@@ -1225,7 +1284,6 @@ N:	Olivier Matz <olivier.matz@6wind.com>
 F:	package/python-pyelftools/

 N:	Olivier Schonken <olivier.schonken@gmail.com>
-F:	package/cups/
 F:	package/ijs/
 F:	package/poppler/
 F:	package/qpdf/
@@ -1255,13 +1313,9 @@ F:	package/libunistring/
 N:	Peter Korsgaard <peter@korsgaard.com>
 F:	board/orangepi/
 F:	configs/orangepi_pc_defconfig
-F:	package/dump1090/
 F:	package/flickcurl/
-F:	package/fscryptctl/
 F:	package/jo/
-F:	package/jose/
 F:	package/libfastjson/
-F:	package/luksmeta/
 F:	package/lzop/
 F:	package/memtool/
 F:	package/mosquitto/
@@ -1300,19 +1354,8 @@ N:	Petr Kulhavy <brain@jikos.cz>
 F:	package/linuxptp/

 N:	Petr Vorel <petr.vorel@gmail.com>
-F:	package/connman/
-F:	package/feh/
-F:	package/imlib2/
-F:	package/iproute2/
-F:	package/iputils/
-F:	package/libmbim/
-F:	package/libqmi/
 F:	package/linux-backports/
 F:	package/ltp-testsuite/
-F:	package/modem-manager/
-F:	package/network-manager/
-F:	package/ofono/
-F:	package/python-networkmanager/

 N:	Phil Eichinger <phil.eichinger@gmail.com>
 F:	package/libqrencode/
@@ -1385,9 +1428,6 @@ N:	Rico Bachmann <bachmann@tofwerk.com>
 F:	package/apr-util/
 F:	package/subversion/

-N:	RJ Ascani <rj.ascani@gmail.com>
-F:	package/azmq/
-
 N:	Rodrigo Rebello <rprebello@gmail.com>
 F:	package/chocolate-doom/
 F:	package/irssi/
@@ -1407,13 +1447,10 @@ F:	package/libspatialindex/
 F:	package/linux-syscall-support/
 F:	package/lugaru/
 F:	package/mcelog/
-F:	package/minetest/
-F:	package/minetest-game/
 F:	package/openpowerlink/
 F:	package/physfs/
 F:	package/stress-ng/
 F:	package/supertux/
-F:	package/supertuxkart/
 F:	package/terminology/
 F:	package/upower/
 F:	package/xenomai/
@@ -1578,9 +1615,6 @@ N:	Steven Noonan <steven@uplinklabs.net>
 F:	package/hwloc/
 F:	package/powertop/

-N:	Sven Haardiek <sven.haardiek@greenbone.net>
-F:	package/lcdproc/
-
 N:	Sven Neumann <neumann@teufel.de>
 F:	package/gstreamer1/gst1-libav/

@@ -1704,6 +1738,7 @@ N:	Vinicius Tinti <viniciustinti@gmail.com>
 F:	package/python-thrift/

 N:	Volkov Viacheslav <sv99@inbox.ru>
+F:	package/rfkill/
 F:	package/v4l2grab/
 F:	package/zbar/

@@ -1744,11 +1779,8 @@ F:	package/fwup/

 N:	Yann E. MORIN <yann.morin.1998@free.fr>
 F:	fs/squashfs/
-F:	package/asterisk/
 F:	package/cegui06/
 F:	package/celt051/
-F:	package/dahdi-linux/
-F:	package/dahdi-tools/
 F:	package/dtc/
 F:	package/dtv-scan-tables/
 F:	package/dvb-apps/
@@ -1759,9 +1791,7 @@ F:	package/libedit/
 F:	package/libgsm/
 F:	package/libinput/
 F:	package/libiscsi/
-F:	package/libpri/
 F:	package/libseccomp/
-F:	package/libss7/
 F:	package/linux-tools/
 F:	package/mesa3d-headers/
 F:	package/nbd/
@@ -87,9 +87,9 @@ all:
 .PHONY: all

 # Set and export the version string
-export BR2_VERSION := 2017.11
+export BR2_VERSION := 2017.08.1
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1512070000
+BR2_VERSION_EPOCH = 1508790000

 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@@ -254,7 +254,7 @@ export LANG = C
 export LC_ALL = C
 export GZIP = -n
 BR2_VERSION_GIT_EPOCH = $(shell GIT_DIR=$(TOPDIR)/.git $(GIT) log -1 --format=%at)
-export SOURCE_DATE_EPOCH ?= $(if $(wildcard $(TOPDIR)/.git),$(BR2_VERSION_GIT_EPOCH),$(BR2_VERSION_EPOCH))
+export SOURCE_DATE_EPOCH = $(if $(wildcard $(TOPDIR)/.git),$(BR2_VERSION_GIT_EPOCH),$(BR2_VERSION_EPOCH))
 DEPENDENCIES_HOST_PREREQ += host-fakedate
 endif

@@ -483,13 +483,13 @@ include system/system.mk
 include package/Makefile.in
 # arch/arch.mk.* must be after package/Makefile.in because it may need to
 # complement variables defined therein, like BR_NO_CHECK_HASH_FOR.
-include $(sort $(wildcard arch/arch.mk.*))
+-include $(wildcard arch/arch.mk.*)
 include support/dependencies/dependencies.mk

 PACKAGES += $(DEPENDENCIES_HOST_PREREQ)

-include $(sort $(wildcard toolchain/*.mk))
-include $(sort $(wildcard toolchain/*/*.mk))
+include toolchain/*.mk
+include toolchain/*/*.mk

 # Include the package override file if one has been provided in the
 # configuration.
@@ -1109,7 +1109,7 @@ print-version:
 	./support/testing/run-tests -l 2>&1 | sed -r -e '/^test_run \((.*)\).*/!d; s//\1: *runtime_test/' | LC_ALL=C sort >> $@

 include docs/manual/manual.mk
-include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(sort $(wildcard $(dir)/docs/*/*.mk)))
+-include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(dir)/docs/*/*.mk)

 .PHONY: $(noconfig_targets)

@@ -87,7 +87,6 @@ config BR2_bfin

 config BR2_csky
 	bool "csky"
-	select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
 	  csky is processor IP from china.
@@ -251,16 +250,6 @@ config BR2_xtensa

 endchoice

-# For some architectures or specific cores, our internal toolchain
-# backend is not suitable (like, missing support in upstream gcc, or
-# no ChipCo fork exists...)
-config BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
-	bool
-
-config BR2_ARCH_HAS_TOOLCHAIN_BUILDROOT
-	bool
-	default y if !BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
-
 # The following string values are defined by the individual
 # Config.in.$ARCH files
 config BR2_ARCH
@@ -4,6 +4,14 @@ choice
 	default BR2_bf532
 	help
 	  Specify target CPU
+config BR2_bf606
+	bool "bf606"
+config BR2_bf607
+	bool "bf607"
+config BR2_bf608
+	bool "bf608"
+config BR2_bf609
+	bool "bf609"
 config BR2_bf512
 	bool "bf512"
 config BR2_bf514
@@ -61,7 +61,6 @@ config BR2_mips_m5150
 config BR2_mips_m6250
 	bool "M6250"
 	depends on !BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
 	select BR2_MIPS_CPU_MIPS32R6
 config BR2_mips_p5600
 	bool "P5600"
@@ -104,7 +103,6 @@ config BR2_mips_i6400
 config BR2_mips_p6600
 	bool "P6600"
 	depends on BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
 	select BR2_MIPS_CPU_MIPS64R6
 endchoice

@@ -1,34 +0,0 @@
-# Image for SD card boot on Atmel SAMA5D2 Xplained boards
-#
-image boot.vfat {
-	vfat {
-		files = {
-			"zImage",
-			"at91-sama5d27_som1_ek.dtb",
-			"at91-sama5d27_som1_ek_pda4.dtb",
-			"at91-sama5d27_som1_ek_pda7.dtb",
-			"at91-sama5d27_som1_ek_pda7b.dtb",
-			"boot.bin",
-			"u-boot.bin"
-		}
-	}
-	size = 16M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-		offset = 1M
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-		size = 512M
-	}
-}
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-BOARD_DIR="$(dirname $0)"
-GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
-GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
-
-rm -rf "${GENIMAGE_TMP}"
-
-genimage                               \
-	--rootpath "${TARGET_DIR}"     \
-	--tmppath "${GENIMAGE_TMP}"    \
-	--inputpath "${BINARIES_DIR}"  \
-	--outputpath "${BINARIES_DIR}" \
-	--config "${GENIMAGE_CFG}"
@@ -1,7 +0,0 @@
-setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
-
-mmc dev 0
-fatload mmc 0 $kernel_addr_r zImage
-fatload mmc 0 $fdt_addr_r sun7i-a20-bananapi.dtb
-
-bootz $kernel_addr_r - $fdt_addr_r
@@ -1,33 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"zImage",
-			"sun7i-a20-bananapi.dtb",
-			"boot.scr"
-		}
-	}
-	size = 64M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8192
-		size = 1040384 # 1MB - 8192
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}
@@ -1,37 +0,0 @@
-Intro
-=====
-
-This default configuration will allow you to start experimenting with the
-buildroot environment for the Bananapi M1. With the current configuration
-it will bring-up the board, and allow access through the serial console.
-
-Bananapi M1 link:
-http://www.banana-pi.org/m1.html
-
-Wiki link:
-https://openedev.amarulasolutions.com/display/ODWIKI/Bananapi+M1
-
-This configuration uses U-Boot mainline and kernel mainline.
-
-How to build
-============
-
-    $ make bananapi_m1_defconfig
-    $ make
-
-Note: you will need access to the internet to download the required
-sources.
-
-How to write the SD card
-========================
-
-Once the build process is finished you will have an image called "sdcard.img"
-in the output/images/ directory.
-
-Copy the bootable "sdcard.img" onto an SD card with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
-  $ sudo sync
-
-Insert the micro SDcard in your Bananapi M1 and power it up. The console
-is on the serial line, 115200 8N1.
@@ -3,9 +3,7 @@ image boot.vfat {
 		files = {
 			"uImage",
 			"imx6dl-icore.dtb",
-			"imx6q-icore.dtb",
-			"imx6q-icore-ofcap10.dtb",
-			"imx6q-icore-ofcap12.dtb"
+			"imx6q-icore.dtb"
 		}
 	}
 	size = 64M
@@ -1,4 +0,0 @@
-# Currently kernel mainline exhibits issues when running cpufreq as ondemand
-# governor on mx6.
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
@@ -7,8 +7,6 @@ platform boards.

 i.CoreM6 Quad/Dual/DualLite/Solo SOM Starter kits:
 https://www.engicam.com/vis-prod/101120
-i.CoreM6 Quad/Dual/DualLite/Solo Open Frame 10.1 C.TOUCH kits:
-https://www.engicam.com/vis-prod/101133

 This configuration uses U-Boot mainline and kernel mainline.

@@ -17,6 +15,8 @@ Build

 First, configure Buildroot for the Engicam i.CoreM6:

+- for i.CoreM6 Quad/Dual/DualLite/Solo:
+
  make engicam_imx6qdl_icore_defconfig

 Build all components:
@@ -24,10 +24,10 @@ Build all components:
  make

 You will find the following files in output/images/:
-  - imx6q-icore.dtb (for i.CoreM6 Quad/Dual)
-  - imx6dl-icore.dtb (for i.CoreM6 DualLite/Solo)
-  - imx6q-icore-ofcap10.dtb (for i.CoreM6 Quad/Dual ofcap 10)
-  - imx6q-icore-ofcap12.dtb (for i.CoreM6 Quad/Dual ofcap 12)
+- for i.CoreM6 Quad/Dual:
+  - imx6q-icore.dtb
+- for i.CoreM6 DualLite/Solo:
+  - imx6dl-icore.dtb
  - rootfs.ext4
  - rootfs.tar
  - sdcard.img
@@ -66,28 +66,4 @@ To boot your newly created system:
 - close JM3 for sd boot.
 - power on the board.

-Testing graphics on i.CoreM6:
-============================
-
-Build with support for Etnaviv, Qt5 and demo applications:
-
-  make engicam_imx6qdl_icore_qt5_defconfig
-  make
-
-Running kmscube
-# kmscube -D /dev/dri/card1
-
-Running glmark2-es2-drm
-# glmark2-es2-drm
-
-Running Qt5 Cinematic Demo:
- for i.CoreM6 Starter Kit
-# export QT_QPA_EGLFS_KMS_CONFIG=/root/imx6qdl-icore.json
- for i.CoreM6 ofcap10
-# export QT_QPA_EGLFS_KMS_CONFIG=/root/imx6qdl-icore-ofcap10.json
- for i.CoreM6 ofcap12
-# export QT_QPA_EGLFS_KMS_CONFIG=/root/imx6qdl-icore-ofcap12.json
-
-# CinematicExperience-demo
-
 Enjoy!
@@ -1,11 +0,0 @@
-{
-  "device": "/dev/dri/card1",
-  "hwcursor": false,
-  "pbuffers": true,
-  "outputs": [
-    {
-      "name": "LVDS-1",
-      "mode": "1280x800"
-    }
-  ]
-}
@@ -1,11 +0,0 @@
-{
-  "device": "/dev/dri/card1",
-  "hwcursor": false,
-  "pbuffers": true,
-  "outputs": [
-    {
-      "name": "LVDS-1",
-      "mode": "1280x480"
-    }
-  ]
-}
@@ -1,11 +0,0 @@
-{
-  "device": "/dev/dri/card1",
-  "hwcursor": false,
-  "pbuffers": true,
-  "outputs": [
-    {
-      "name": "LVDS-1",
-      "mode": "800x480"
-    }
-  ]
-}
@@ -1,46 +0,0 @@
-# Minimal SD card image for the Freescale boards Template for SPL Boot
-#
-# We mimic the .sdcard Freescale's image format:
-# * the SD card must have 1 kB free space at the beginning,
-# * U-Boot is dumped as is,
-# * a FAT partition at offset 8MB is containing zImage/uImage and DTB files
-# * a single root filesystem partition is required (ext2, ext3 or ext4)
-#
-
-image boot.vfat {
-  vfat {
-    files = {
-      %FILES%
-    }
-  }
-  size = 16M
-}
-
-image sdcard.img {
-  hdimage {
-  }
-
-  partition spl {
-    in-partition-table = "no"
-    image = "SPL"
-    offset = 1024
-  }
-
-  partition u-boot-img {
-    in-partition-table = "no"
-    image = "u-boot.img"
-    offset = 69K
-  }
-
-  partition boot {
-    partition-type = 0xC
-    bootable = "true"
-    image = "boot.vfat"
-    offset = 8M
-  }
-
-  partition rootfs {
-    partition-type = 0x83
-    image = "rootfs.ext2"
-  }
-}
@@ -28,15 +28,6 @@ linux_image()
 	fi
 }

-genimage_type()
-{
-	if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then
-		echo "genimage.cfg.template_spl"
-	else
-		echo "genimage.cfg.template"
-	fi
-}
-
 main()
 {
 	local FILES="$(dtb_list) $(linux_image)"
@@ -44,7 +35,7 @@ main()
 	local GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"

 	sed -e "s/%FILES%/${FILES}/" \
-		board/freescale/common/imx/$(genimage_type) > ${GENIMAGE_CFG}
+		board/freescale/common/imx/genimage.cfg.template > ${GENIMAGE_CFG}

 	rm -rf "${GENIMAGE_TMP}"

@@ -1,5 +0,0 @@
-# Currently mx6sabresd exhibits touchscreen issues when running cpufreq as
-# ondemand governor with a mainline kernel.
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-CONFIG_VIDEO_CODA=m
@@ -1,110 +0,0 @@
-*******************************
-Freescale i.MX6 Sabre SD boards
-*******************************
-
-This file documents the Buildroot support for the Freescale i.MX6 Sabre SD
-boards based on i.MX6Q, i.MX6DL and iMX6QP.
-
-Thanks to the SPL support in U-Boot it is possible to run a single
-sdcard.img in all i.MX6 Sabre SD board variants.
-
-This configuration uses U-Boot mainline and kernel mainline.
-
-Build
-=====
-
-First, configure Buildroot for the i.MX6 Sabre SD board:
-
-  make imx6-sabresd_defconfig
-
-Build all components:
-
-  make
-
-You will find the following files in output/images/ :
-  - imx6q-sabresd.dtb
-  - imx6dl-sabresd.dtb
-  - imx6qp-sabresd.dtb
-  - rootfs.ext4
-  - rootfs.tar
-  - sdcard.img
-  - u-boot.imx
-  - zImage
-
-Create a bootable SD card
-=========================
-
-To determine the device associated to the SD card have a look in the
-/proc/partitions file:
-
-  cat /proc/partitions
-
-Buildroot prepares a bootable "sdcard.img" image in the output/images/
-directory, ready to be dumped on a SD card. Launch the following
-command as root:
-
-  dd if=output/images/sdcard.img of=/dev/<your-sd-device>
-
-*** WARNING! This will destroy all the card content. Use with care! ***
-
-For details about the medium image layout, see the definition in
-board/freescale/common/imx/genimage.cfg.template.
-
-Boot the i.MX6 Sabre SD board
-=============================
-
-To boot your newly created system:
- insert the SD card in the SD3 slot of the board (close to the HDMI connector);
- put a micro USB cable into the Debug USB Port and connect using a terminal
-  emulator at 115200 bps, 8n1;
- power on the board.
-
-Testing graphics on the i.MX6 Sabre SD board
-============================================
-
-The imx6-sabresd_qt5_defconfig allows to quickly test the graphics
-capabilities of i.MX6 using the opensource Etnaviv graphics stack
-and kernel mainline.
-
-In order to build it:
-
-make imx6-sabresd_qt5_defconfig
-make
-
-Then flash the SD card as explained above.
-
-Running kmscube application:
-
-# kmscube
-
-Running Qt5 Cinematic Demo:
-
-# export QT_QPA_EGLFS_KMS_CONFIG=/root/sabresd.json
-# /usr/share/Qt5/CinematicExperience/Qt5_CinematicExperience
-
-Running gl2mark benchmark:
-
-# glmark2-es2-drm
-
-Testing video playback on the i.MX6 Sabre SD board
-==================================================
-
-As the mx6sabresd has two display outputs (LVDS and HDMI), it is necessary to
-know what is the connector that corresponds to the HDMI output.
-
-This information can be found by running:
-
-# modetest
-
-And search for the HDMI connector number. In our case it shows up as 37.
-
-In the mx6sabresd prompt run the following Gstreamer pipeline:
-
-# gst-launch-1.0 filesrc location=/root/trailer_1080p_h264_mp3.avi ! avidemux ! \
-h264parse ! v4l2video1dec capture-io-mode=dmabuf ! kmssink connector-id=37    \
-name=imx-drm sync=0
-
-(The video used on this example was retrieved from:
-http://linode.boundarydevices.com/videos/trailer_1080p_h264_mp3.avi)
-
-Enjoy!
@@ -1,15 +0,0 @@
-{
-  "device": "/dev/dri/card0",
-  "hwcursor": false,
-  "pbuffers": true,
-  "outputs": [
-    {
-      "name": "HDMI-1",
-      "mode": "off"
-    },
-    {
-      "name": "LVDS-1",
-      "mode": "1024x768"
-    }
-  ]
-}
@@ -0,0 +1,57 @@
+*******************************
+Freescale i.MX6Q Sabre SD board
+*******************************
+
+This file documents the Buildroot support for the Freescale i.MX6Q Sabre SD
+board.
+
+This configuration uses U-Boot mainline and kernel mainline.
+
+Build
+=====
+
+First, configure Buildroot for the i.MX6Q Sabre SD board:
+
+  make imx6q-sabresd_defconfig
+
+Build all components:
+
+  make
+
+You will find the following files in output/images/ :
+  - imx6q-sabresd.dtb
+  - rootfs.ext4
+  - rootfs.tar
+  - sdcard.img
+  - u-boot.imx
+  - zImage
+
+Create a bootable SD card
+=========================
+
+To determine the device associated to the SD card have a look in the
+/proc/partitions file:
+
+  cat /proc/partitions
+
+Buildroot prepares a bootable "sdcard.img" image in the output/images/
+directory, ready to be dumped on a SD card. Launch the following
+command as root:
+
+  dd if=output/images/sdcard.img of=/dev/<your-sd-device>
+
+*** WARNING! This will destroy all the card content. Use with care! ***
+
+For details about the medium image layout, see the definition in
+board/freescale/common/imx/genimage.cfg.template.
+
+Boot the i.MX6Q Sabre SD board
+==============================
+
+To boot your newly created system:
+- insert the SD card in the SD3 slot of the board (close to the HDMI connector);
+- put a micro USB cable into the Debug USB Port and connect using a terminal
+  emulator at 115200 bps, 8n1;
+- power on the board.
+
+Enjoy!
@@ -18,8 +18,8 @@ Read the SABRE for Automotive Infotainment Quick Start Guide for an
 introduction to the board:
 http://cache.freescale.com/files/32bit/doc/user_guide/IMX6SABREINFOQSG.pdf

-Building with NXP kernel and NXP U-Boot
-=======================================
+Build
+=====

 First, configure Buildroot for your SABRE board.
 For i.MX6Q SABRE SD board:
@@ -54,27 +54,6 @@ You will find in ./output/images/ the following files:
  - u-boot.imx
  - uImage, or zImage for i.MX6 SoloX

-Building with mainline kernel and mainline U-Boot
-=================================================
-
-Mainline U-Boot uses SPL and can support the three
-variants of mx6sabreauto boards: mx6q, mx6dl and mx6qp.
-
-First, configure Buildroot for your mx6sabreauto board
-
-  make imx6-sabreauto_defconfig
-
-Build all components:
-
-  make
-
-You will find in output/images/ the following files:
-  - imx6dl-sabresd.dtb, imx6q-sabresd.dtb, imx6q-sabresd.dtb
-  - rootfs.ext2
-  - SPL and u-boot.img
-  - u-boot.imx
-  - zImage
-
 Create a bootable SD card
 =========================

@@ -1,6 +0,0 @@
-set default="0"
-set timeout="5"
-
-menuentry "Buildroot" {
-	linux /boot/bzImage root=/dev/sda1 rootwait console=tty1
-}
@@ -1,6 +0,0 @@
-set default="0"
-set timeout="5"
-
-menuentry "Buildroot" {
-	linux /bzImage root=/dev/sda2 rootwait console=tty1
-}
@@ -1,14 +1,35 @@
 #!/bin/sh

-BOARD_DIR="$(dirname $0)"
-
 # Detect boot strategy, EFI or BIOS
 if [ -f ${BINARIES_DIR}/efi-part/startup.nsh ]; then
-  cp -f ${BOARD_DIR}/grub-efi.cfg ${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg
+  BOOT_TYPE=efi
+  # grub.cfg needs customization for EFI since the root partition is
+  # number 2, and bzImage is in the EFI partition (1)
+  cat >${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg <<__EOF__
+set default="0"
+set timeout="5"
+
+menuentry "Buildroot" {
+	linux /bzImage root=/dev/sda2 rootwait console=tty1
+}
+__EOF__
 else
-  cp -f ${BOARD_DIR}/grub-bios.cfg ${TARGET_DIR}/boot/grub/grub.cfg
+  BOOT_TYPE=bios
  # Copy grub 1st stage to binaries, required for genimage
  cp -f ${HOST_DIR}/lib/grub/i386-pc/boot.img ${BINARIES_DIR}
 fi

+BOARD_DIR="$(dirname $0)"
+GENIMAGE_CFG="${BOARD_DIR}/genimage-${BOOT_TYPE}.cfg"
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+
+rm -rf "${GENIMAGE_TMP}"
+
+genimage                           \
+       --rootpath "${TARGET_DIR}"     \
+       --tmppath "${GENIMAGE_TMP}"    \
+       --inputpath "${BINARIES_DIR}"  \
+       --outputpath "${BINARIES_DIR}" \
+       --config "${GENIMAGE_CFG}"
+
 exit $?
@@ -35,44 +35,3 @@ Bare PC sample config
  the setup as well.

 3. Enjoy
-
-Emulation in qemu (BIOS)
-========================
-
-1. Edit grub-bios.cfg
-
-  Since the driver will show up in the virtual machine as /dev/vda,
-  change board/pc/grub-bios.cfg to use root=/dev/vda2 instead of
-  root=/dev/sda2. Then rebuild grub2 and the image.
-
-2. Run the emulation with:
-
-qemu-system-x86_64 \
-	-M pc \
-	-drive file=output/images/disk.img,if=virtio,format=raw \
-	-net nic,model=virtio \
-	-net user
-
-
-Emulation in qemu (UEFI)
-========================
-
-1. Edit grub-efi.cfg
-
-  Since the driver will show up in the virtual machine as /dev/vda,
-  change board/pc/grub-efi.cfg to use root=/dev/vda2 instead of
-  root=/dev/sda2. Then rebuild grub2 and the image.
-
-2. Run the emulation with:
-
-qemu-system-x86_64 \
-	-M pc \
-	-bios </path/to/OVMF_CODE.fd> \
-	-drive file=output/images/disk.img,if=virtio,format=raw \
-	-net nic,model=virtio \
-	-net user
-
-Note that </path/to/OVMF.fd> needs to point to a valid x86_64 UEFI
-firmware image for qemu. It may be provided by your distribution as a
-edk2 or OVMF package, in path such as
-/usr/share/edk2/ovmf/OVMF_CODE.fd .
@@ -1,6 +1,6 @@
 Run the emulation with:

-  qemu-system-aarch64 -M virt -cpu cortex-a57 -nographic -smp 1 -kernel output/images/Image -append "root=/dev/vda console=ttyAMA0" -netdev user,id=eth0 -device virtio-net-device,netdev=eth0 -drive file=output/images/rootfs.ext4,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0
+  qemu-system-aarch64 -M virt -cpu cortex-a57 -nographic -smp 1 -kernel output/images/Image -append "console=ttyAMA0" -netdev user,id=eth0 -device virtio-net-device,netdev=eth0

 The login prompt will appear in the terminal that started Qemu.

@@ -1,6 +1,6 @@
 Run the emulation with:

- qemu-system-ppc64 -M pseries -cpu POWER7 -m 256 -kernel output/images/vmlinux -append "console=hvc0 root=/dev/sda" -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses
+ qemu-system-ppc64 -M pseries -cpu POWER7 -m 256 -kernel output/images/vmlinux -append 'console=hvc0 root=/dev/sda' -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses

 The login prompt will appear in the terminal that started Qemu.

@@ -1,9 +0,0 @@
-Run the emulation with:
-
-qemu-system-ppc64le -M pseries -nographic \
-		-kernel output/images/vmlinux \
-		-initrd output/images/rootfs.ext2
-
-The login prompt will appear in the terminal window.
-
-Tested with QEMU 2.10.0
@@ -1,6 +1,6 @@
 Run the emulation with:

-  qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "root=/dev/vda" -net nic,model=virtio -net user
+  qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append root=/dev/vda -net nic,model=virtio -net user

 Optionally add -smp N to emulate a SMP system with N CPUs.

@@ -1,6 +1,6 @@
 Run the emulation with:

-  qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "root=/dev/vda" -net nic,model=virtio -net user
+  qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append root=/dev/vda -net nic,model=virtio -net user

 Optionally add -smp N to emulate a SMP system with N CPUs.

@@ -1,53 +1,42 @@
-#!/bin/bash
-
-set -e
+#!/bin/sh

 BOARD_DIR="$(dirname $0)"
 BOARD_NAME="$(basename ${BOARD_DIR})"
 GENIMAGE_CFG="${BOARD_DIR}/genimage-${BOARD_NAME}.cfg"
 GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"

-for arg in "$@"
-do
-	case "${arg}" in
-		--add-pi3-miniuart-bt-overlay)
-		if ! grep -qE '^dtoverlay=' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
-			echo "Adding 'dtoverlay=pi3-miniuart-bt' to config.txt (fixes ttyAMA0 serial console)."
-			cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
+case "${2}" in
+	--add-pi3-miniuart-bt-overlay)
+	if ! grep -qE '^dtoverlay=' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
+		echo "Adding 'dtoverlay=pi3-miniuart-bt' to config.txt (fixes ttyAMA0 serial console)."
+		cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"

 # fixes rpi3 ttyAMA0 serial console
 dtoverlay=pi3-miniuart-bt
 __EOF__
-		fi
-		;;
-		--aarch64)
-		# Run a 64bits kernel (armv8)
-		sed -e '/^kernel=/s,=.*,=Image,' -i "${BINARIES_DIR}/rpi-firmware/config.txt"
-		if ! grep -qE '^arm_control=0x200' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
-			cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
+	fi
+	;;
+	--aarch64)
+	# Run a 64bits kernel (armv8)
+	sed -e '/^kernel=/s,=.*,=Image,' -i "${BINARIES_DIR}/rpi-firmware/config.txt"
+	if ! grep -qE '^arm_control=0x200' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
+		cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"

 # enable 64bits support
 arm_control=0x200
 __EOF__
-		fi
+	fi

-		# Enable uart console
-		if ! grep -qE '^enable_uart=1' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
-			cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
+	# Enable uart console
+	if ! grep -qE '^enable_uart=1' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
+		cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"

 # enable rpi3 ttyS0 serial console
 enable_uart=1
 __EOF__
-		fi
-		;;
-		--gpu_mem_256=*|--gpu_mem_512=*|--gpu_mem_1024=*)
-		# Set GPU memory
-		gpu_mem="${arg:2}"
-		sed -e "/^${gpu_mem%=*}=/s,=.*,=${gpu_mem##*=}," -i "${BINARIES_DIR}/rpi-firmware/config.txt"
-		;;
-	esac
-
-done
+	fi
+	;;
+esac

 rm -rf "${GENIMAGE_TMP}"

@@ -1,7 +0,0 @@
-setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
-
-mmc dev 0
-fatload mmc 0 $kernel_addr_r zImage
-fatload mmc 0 $fdt_addr_r sun8i-h3-bananapi-m2-plus.dtb
-
-bootz $kernel_addr_r - $fdt_addr_r
@@ -1,33 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"zImage",
-			"sun8i-h3-bananapi-m2-plus.dtb",
-			"boot.scr"
-		}
-	}
-	size = 64M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8192
-		size = 1040384 # 1MB - 8192
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}
@@ -1,59 +0,0 @@
-****************************
-Technexion i.MX7D Pico board
-****************************
-
-This file documents the Buildroot support for the Technexion i.MX7D Pico board.
-
-Build
-=====
-
-First, configure Buildroot for the i.MX7D Pico board:
-
-  make imx7dpico_defconfig
-
-Build all components:
-
-  make
-
-You will find in output/images/ the following files:
-  - imx7d-pico.dtb
-  - rootfs.ext4
-  - rootfs.tar
-  - sdcard.img
-  - u-boot.imx
-  - zImage
-
-Flash the eMMC
-==============
-
-In the U-Boot prompt lauch:
-
-=> ums 0 mmc 0
-
-This will mount the eMMC content in the host PC as a mass storage device.
-
-To determine the device associated to the eMMC card have a look in the
-/proc/partitions file:
-
-  cat /proc/partitions
-
-Buildroot prepares a bootable "sdcard.img" image in the output/images/
-directory, ready to be dumped on the eMMC card. Launch the following
-command as root:
-
-  dd if=output/images/sdcard.img of=/dev/<your-sd-device>
-
-*** WARNING! This will destroy all the eMMC content. Use with care! ***
-
-For details about the medium image layout, see the definition in
-board/freescale/common/imx/genimage.cfg.template.
-
-Boot the i.MX7D Pico board
-==========================
-
-To boot your newly created system:
- put a micro USB cable into the Debug USB Port and connect using a terminal
-  emulator at 115200 bps, 8n1;
- power on the board.
-
-Enjoy!
@@ -1,14 +0,0 @@
-image sdcard.img {
-	hdimage {
-	}
-
-	partition unused {
-		size =  512B
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-		size = 256M
-	}
-}
@@ -1,51 +0,0 @@
-Technologic Systems TS-7680 SBC
-===============================
-
-This document explains how to set up a basic Buildroot system for
-the Technologic Systems TS-7680 Single Board Computer.
-
-The TS-7680 SBC is based on the Freescale i.MX286 ARM ARM926EJ-S
-running at 454MHz. The TS-7680 features are 10/100 Ethernet ports,
-Wi-Fi, microSD card, eMMC, NOR Flash, USB host port, CAN ports,
-relays and ADC/DAC. More details on the board here:
-https://wiki.embeddedarm.com/wiki/TS-7680
-
-The TS-7680 uses a 3.14.28 Linux kernel provided by
-Technologic Systems.
-
-To build the default configuration you only have to run:
-
-  $ make ts7680_defconfig
-  $ make
-
-The output looks like:
-output/images
-├── imx28-ts7680.dtb
-├── rootfs.ext2
-├── rootfs.ext4 -> rootfs.ext2
-├── rootfs.tar
-├── sdcard.img
-└── uImage
-
-The provided genimage configuration generates an image file containing
-two partitions. The first one is unused, but mandatory as the
-TS-7680 built-in bootloader loads the Linux uImage from the /boot
-directory in the second partition. The second partition contains the
-rootfs with the Linux uImage into the /boot directory.
-
-  $ fdisk output/images/sdcard.img
-  output/images/sdcard.img1          1      1       1  512B  0 Empty
-  output/images/sdcard.img2          2 524289  524288  256M 83 Linux
-
-This image can be directly written to an SD card.
-
-    $ sudo dd if=output/images/sdcard.img of=/dev/mmcblk0
-
-To boot with Buildroot, insert this SD card on the board, make sure
-the SD jumper is present and the U-Boot jumper is not.
-
-The bootloader comes pre-flashed on the board on an SPI flash. Since
-updating the bootloader is risky and not trivial, it is not included
-in the Buildroot defconfig. Refer to
-https://wiki.embeddedarm.com/wiki/TS-7680#U-Boot for details on
-which U-Boot config to use and how to flash it.
@@ -0,0 +1,48 @@
+# Minimal microSD card image for Udoo MX6Q/DL boards
+#
+# We mimic the .sdcard Freescale's image format for i.MX6:
+# * the microSD card must have 1 kB free space at the beginning,
+# * U-Boot is dumped as is,
+# * a FAT partition at offset 16 MB is containing zImage and dtbs,
+# * a single root filesystem partition is required (Ext4 in this case).
+#
+
+image boot.vfat {
+	vfat {
+		files = {
+			"imx6q-udoo.dtb",
+			"imx6dl-udoo.dtb",
+			"zImage"
+		}
+	}
+	size = 16M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition SPL {
+		in-partition-table = "no"
+		image = "SPL"
+		offset = 1K
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot.img"
+		offset = 69K
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+		offset = 16M
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+	}
+}
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+BOARD_DIR="$(dirname $0)"
+GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+
+rm -rf "${GENIMAGE_TMP}"
+
+genimage \
+  --rootpath "${TARGET_DIR}" \
+  --tmppath "${GENIMAGE_TMP}" \
+  --inputpath "${BINARIES_DIR}" \
+  --outputpath "${BINARIES_DIR}" \
+  --config "${GENIMAGE_CFG}"
@@ -7,6 +7,7 @@ source "boot/at91dataflashboot/Config.in"
 source "boot/arm-trusted-firmware/Config.in"
 source "boot/barebox/Config.in"
 source "boot/boot-wrapper-aarch64/Config.in"
+source "boot/grub/Config.in"
 source "boot/grub2/Config.in"
 source "boot/gummiboot/Config.in"
 source "boot/lpc32xxcdl/Config.in"
@@ -14,7 +14,7 @@ choice
 	  Select the specific ATF version you want to use

 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
-	bool "v1.4"
+	bool "v1.2"

 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL
 	bool "Custom tarball"
@@ -33,7 +33,7 @@ endif

 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION
 	string
-	default "v1.4"		if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
+	default "v1.2"		if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
 	default "custom"	if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL
 	default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION \
 				if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 6dae02acd85278394bfad6e2683e186e5332a711e4491ac4632ad6480f6e5494 arm-trusted-firmware-v1.4.tar.gz
-sha256 487795b8023df866259fa159bab94706b747fb0d623b7913f1c4955c0ab5f164  license.rst
+sha256 cbdd9b770ec1ab4933fc7f9f520daea5a364bb4dc964820fb017a0cf8c7df556 arm-trusted-firmware-v1.2.tar.gz
+md5 fac2c08bd74337fec2e14a98fc9f748f arm-trusted-firmware-v1.2.tar.gz
@@ -6,7 +6,7 @@

 ARM_TRUSTED_FIRMWARE_VERSION = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION))
 ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3-Clause
-ARM_TRUSTED_FIRMWARE_LICENSE_FILES = license.rst
+ARM_TRUSTED_FIRMWARE_LICENSE_FILES = license.md

 ARM_TRUSTED_FIRMWARE_DEPENDENCIES += uboot

@@ -49,7 +49,7 @@ define ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES_CMDS
 	cp -dpf $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/release/*.bin $(BINARIES_DIR)/
 endef

-# Configuration check
+# Configuration ckeck
 ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR_BUILDING),yy)

 ifeq ($(ARM_TRUSTED_FIRMWARE_VERSION),custom)
@@ -12,7 +12,7 @@ choice
 	  Select the specific Barebox version you want to use

 config BR2_TARGET_BAREBOX_LATEST_VERSION
-	bool "2017.09.0"
+	bool "2017.02.0"

 config BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	bool "Custom version"
@@ -40,7 +40,7 @@ endif

 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2017.09.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
+	default "2017.02.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
 	default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
@@ -1,5 +1,5 @@
-# http://www.barebox.org/download/barebox-2017.09.0.tar.bz2.md5
-md5 b92e9c99cda7fbb61d01baf5679df261 barebox-2017.09.0.tar.bz2
+# http://www.barebox.org/download/barebox-2017.02.0.tar.bz2.md5
+md5 4651f5fa5e794a9739dd71eece0fe702  barebox-2017.02.0.tar.bz2

 # Locally calculated
-sha256 43283edc019f95a53fdb7d1b7c294afc4741bfcace348d6beeded5fe5147a81b barebox-2017.09.0.tar.bz2
+sha256 d65d864fe598d61ed9c6712e32d50742e6996aae02acaae5955c3b22166344cb  barebox-2017.02.0.tar.bz2
@@ -0,0 +1,200 @@
+config BR2_TARGET_GRUB
+	bool "grub"
+	depends on BR2_i386 || BR2_x86_64
+	select BR2_HOSTARCH_NEEDS_IA32_COMPILER
+	help
+	  The GRand Unified Bootloader for x86 systems.
+
+	  Some notes on creating a disk image with Grub installed:
+	    1. Create an empty disk image
+	       dd if=/dev/zero of=disk.img bs=1M count=32
+	    2. Create one primary partition
+	       cfdisk -h 16 -s 63 disk.img
+	    3. Set up a loop device
+	       sudo losetup -f disk.img
+	    4. Set up loop devices per partitions
+	       sudo partx -a /dev/loop0
+	    5. Create the ext2 filesystem
+	       sudo mkfs.ext2 -L root /dev/loop0p1
+	    6. Mount the filesystem
+	       mount /dev/loop0p1 /mnt
+	    7. Extract the root filesystem
+	       sudo tar -C /mnt -xf output/images/rootfs.tar
+	    8. Unmount the filesystem, clean up loop device
+	       sudo umount /mnt
+	       sudo partx -d /dev/loop0
+	       sudo losetup -d /dev/loop0
+	    9. Install grub
+	       output/host/sbin/grub --device-map=/dev/null
+	       and in the grub shell, enter:
+		device (hd0) disk.img
+		geometry (hd0) <cylinders> 16 63
+		root (hd0,0)
+		setup (hd0)
+	    10. Image is ready
+		Can be tested in Qemu, with:
+		  qemu-system-{i386,x86-64} -hda disk.img
+
+if BR2_TARGET_GRUB
+
+config BR2_TARGET_GRUB_SPLASH
+	bool "Splashimage support"
+	help
+	  Add support for splashimage.
+
+	  A splashimage is a 14-color indexed .xpm picture which is
+	  displayed as background for the grub menu. See
+	  http://www.katspace.org/computers/Grub_Splash/ for details
+	  on how to generate a splashimage.
+
+config BR2_TARGET_GRUB_DISKLESS
+	bool "diskless support"
+	help
+	  enable diskless support
+
+menu "filesystem drivers"
+
+config BR2_TARGET_GRUB_FS_EXT2
+	bool "ext2"
+	default y
+	help
+	  Enable support for the ext2 filesystem in Grub
+
+config BR2_TARGET_GRUB_FS_FAT
+	bool "FAT"
+	default y
+	help
+	  Enable support for the FAT filesystem in Grub.
+
+config BR2_TARGET_GRUB_FS_ISO9660
+	bool "ISO9660"
+	help
+	  Enable support for the ISO9660 filesystem in Grub.
+
+config BR2_TARGET_GRUB_FS_JFS
+	bool "IBM JFS"
+	help
+	  Enable support for the JFS filesystem in Grub.
+
+config BR2_TARGET_GRUB_FS_REISERFS
+	bool "ReiserFS"
+	help
+	  Enable support for the ReiserFS filesystem in Grub.
+
+config BR2_TARGET_GRUB_FS_XFS
+	bool "SGI XFS"
+	help
+	  Enable support for the XFS filesystem in Grub.
+
+endmenu
+
+menu "network drivers"
+
+config BR2_TARGET_GRUB_3c595
+	bool "3Com595 driver"
+	help
+	  enable 3Com595 driver
+
+config BR2_TARGET_GRUB_3c90x
+	bool "3Com90x driver"
+	help
+	  enable 3Com90x driver
+
+config BR2_TARGET_GRUB_davicom
+	bool "Davicom driver"
+	help
+	  enable Davicom driver
+
+config BR2_TARGET_GRUB_e1000
+	bool "Etherexpress Pro/1000 driver"
+	help
+	  enable Etherexpress Pro/1000 driver
+
+config BR2_TARGET_GRUB_eepro100
+	bool "Etherexpress Pro/100 driver"
+	help
+	  enable Etherexpress Pro/100 driver
+
+config BR2_TARGET_GRUB_epic100
+	bool "SMC 83c170 EPIC/100 driver"
+	help
+	  enable SMC 83c170 EPIC/100 driver
+
+config BR2_TARGET_GRUB_forcedeth
+	bool "Nvidia Geforce driver"
+	help
+	  enable Nvidia Geforce driver
+
+config BR2_TARGET_GRUB_natsemi
+	bool "NatSemi DP8381x driver"
+	help
+	  enable NatSemi DP8381x driver
+
+config BR2_TARGET_GRUB_ns83820
+	bool "NS83820 driver"
+	help
+	  enable NS83820 driver
+
+config BR2_TARGET_GRUB_ns8390
+	bool "NE2000 PCI driver"
+	help
+	  enable NE2000 PCI driver
+
+config BR2_TARGET_GRUB_pcnet32
+	bool "AMD Lance/PCI PCNet/32 driver"
+	help
+	  enable AMD Lance/PCI PCNet/32 driver
+
+config BR2_TARGET_GRUB_pnic
+	bool "Bochs Pseudo Nic driver"
+	help
+	  enable Bochs Pseudo Nic driver
+
+config BR2_TARGET_GRUB_rtl8139
+	bool "Realtek 8139 driver"
+	help
+	  enable Realtek 8139 driver
+
+config BR2_TARGET_GRUB_r8169
+	bool "Realtek 8169 driver"
+	help
+	  enable Realtek 8169 driver
+
+config BR2_TARGET_GRUB_sis900
+	bool "SIS 900 and SIS 7016 driver"
+	help
+	  enable SIS 900 and SIS 7016 driver
+
+config BR2_TARGET_GRUB_tg3
+	bool "Broadcom Tigon3 driver"
+	help
+	  enable Broadcom Tigon3 driver
+
+config BR2_TARGET_GRUB_tulip
+	bool "Tulip driver"
+	help
+	  enable Tulip driver
+
+config BR2_TARGET_GRUB_tlan
+	bool "TI ThunderLAN driver"
+	help
+	  enable TI ThunderLAN driver
+
+config BR2_TARGET_GRUB_undi
+	bool "PXE UNDI driver"
+	help
+	  enable PXE UNDI driver
+
+config BR2_TARGET_GRUB_via_rhine
+	bool "Rhine-I/II driver"
+	help
+	  enable Rhine-I/II driver
+
+config BR2_TARGET_GRUB_w89c840
+	bool "Winbond W89c840 driver"
+	help
+	  enable Winbond W89c840 driver
+
+endmenu
+
+endif # BR2_TARGET_GRUB
@@ -0,0 +1,13 @@
+Index: b/stage2/disk_io.c
+===================================================================
+--- a/stage2/disk_io.c
+++ b/stage2/disk_io.c
+@@ -365,7 +365,7 @@
+ int
+ devwrite (unsigned int sector, int sector_count, char *buf)
+ {
+-#if defined(GRUB_UTIL) && defined(__linux__)
+#if defined(GRUB_UTIL) && defined(__linux__) && !defined(SUPPORT_LOOPDEV)
+   if (current_partition != 0xFFFFFF
+       && is_disk_device (device_map, current_drive))
+     {
@@ -0,0 +1,36 @@
+Index: b/grub/asmstub.c
+===================================================================
+--- a/grub/asmstub.c
+++ b/grub/asmstub.c
+@@ -18,10 +18,13 @@
+  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
+#include <features.h>
+#if !defined __UCLIBC__ || (defined __UCLIBC__ && defined __UCLIBC_HAS_LFS__)
+ /* Try to use glibc's transparant LFS support. */
+ #define _LARGEFILE_SOURCE	1
+ /* lseek becomes synonymous with lseek64.  */
+ #define _FILE_OFFSET_BITS	64
+#endif
+ 
+ /* Simulator entry point. */
+ int grub_stage2 (void);
+Index: b/lib/device.c
+===================================================================
+--- a/lib/device.c
+++ b/lib/device.c
+@@ -18,10 +18,13 @@
+  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
+#include <features.h>
+#if !defined __UCLIBC__ || (defined __UCLIBC__ && defined __UCLIBC_HAS_LFS__)
+ /* Try to use glibc's transparant LFS support. */
+ #define _LARGEFILE_SOURCE       1
+ /* lseek becomes synonymous with lseek64.  */
+ #define _FILE_OFFSET_BITS       64
+#endif
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
@@ -0,0 +1,3 @@
+# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/g/grub/grub_0.97-68.dsc
+sha256	4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b	grub_0.97.orig.tar.gz
+sha256	a453489cf1fec5d311a0b76dea8c8b2ff67eee1a3eba6c06ab80864494d9773c	grub_0.97-68.diff.gz
@@ -0,0 +1,109 @@
+################################################################################
+#
+# grub
+#
+################################################################################
+
+GRUB_VERSION = 0.97
+GRUB_SOURCE = grub_$(GRUB_VERSION).orig.tar.gz
+GRUB_PATCH = grub_$(GRUB_VERSION)-68.diff.gz
+GRUB_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/g/grub
+
+GRUB_LICENSE = GPL-2.0+
+GRUB_LICENSE_FILES = COPYING
+
+# Passing -O0 since the default -O2 passed by Buildroot generates
+# non-working stage2.  Passing --build-id=none to the linker, because
+# the ".note.gnu.build-id" ELF sections generated by default confuse
+# objcopy when generating raw binaries. Passing -fno-stack-protector
+# to avoid undefined references to __stack_chk_fail.
+GRUB_CFLAGS = \
+	-DSUPPORT_LOOPDEV \
+	-O0 -Wl,--build-id=none \
+	-fno-stack-protector
+
+GRUB_CONFIG-y += $(if $(BR2_TARGET_GRUB_SPLASH),--enable-graphics,--disable-graphics)
+
+GRUB_CONFIG-$(BR2_TARGET_GRUB_DISKLESS) += --enable-diskless
+GRUB_CONFIG-$(BR2_TARGET_GRUB_3c595) += --enable-3c595
+GRUB_CONFIG-$(BR2_TARGET_GRUB_3c90x) += --enable-3c90x
+GRUB_CONFIG-$(BR2_TARGET_GRUB_davicom) += --enable-davicom
+GRUB_CONFIG-$(BR2_TARGET_GRUB_e1000) += --enable-e1000
+GRUB_CONFIG-$(BR2_TARGET_GRUB_eepro100) += --enable-eepro100
+GRUB_CONFIG-$(BR2_TARGET_GRUB_epic100) += --enable-epic100
+GRUB_CONFIG-$(BR2_TARGET_GRUB_forcedeth) += --enable-forcedeth
+GRUB_CONFIG-$(BR2_TARGET_GRUB_natsemi) += --enable-natsemi
+GRUB_CONFIG-$(BR2_TARGET_GRUB_ns83820) += --enable-ns83820
+GRUB_CONFIG-$(BR2_TARGET_GRUB_ns8390) += --enable-ns8390
+GRUB_CONFIG-$(BR2_TARGET_GRUB_pcnet32) += --enable-pcnet32
+GRUB_CONFIG-$(BR2_TARGET_GRUB_pnic) += --enable-pnic
+GRUB_CONFIG-$(BR2_TARGET_GRUB_rtl8139) += --enable-rtl8139
+GRUB_CONFIG-$(BR2_TARGET_GRUB_r8169) += --enable-r8169
+GRUB_CONFIG-$(BR2_TARGET_GRUB_sis900) += --enable-sis900
+GRUB_CONFIG-$(BR2_TARGET_GRUB_tg3) += --enable-tg3
+GRUB_CONFIG-$(BR2_TARGET_GRUB_tulip) += --enable-tulip
+GRUB_CONFIG-$(BR2_TARGET_GRUB_tlan) += --enable-tlan
+GRUB_CONFIG-$(BR2_TARGET_GRUB_undi) += --enable-undi
+GRUB_CONFIG-$(BR2_TARGET_GRUB_via_rhine) += --enable-via-rhine
+GRUB_CONFIG-$(BR2_TARGET_GRUB_w89c840) += --enable-w89c840
+
+GRUB_CONFIG-y += $(if $(BR2_TARGET_GRUB_FS_EXT2),--enable-ext2fs,--disable-ext2fs)
+GRUB_CONFIG-y += $(if $(BR2_TARGET_GRUB_FS_FAT),--enable-fat,--disable-fat)
+GRUB_CONFIG-y += $(if $(BR2_TARGET_GRUB_FS_ISO9660),--enable-iso9660,--disable-iso9660)
+GRUB_CONFIG-y += $(if $(BR2_TARGET_GRUB_FS_JFS),--enable-jfs,--disable-jfs)
+GRUB_CONFIG-y += $(if $(BR2_TARGET_GRUB_FS_REISERFS),--enable-reiserfs,--disable-reiserfs)
+GRUB_CONFIG-y += $(if $(BR2_TARGET_GRUB_FS_XFS),--enable-xfs,--disable-xfs)
+GRUB_CONFIG-y += --disable-ffs --disable-ufs2 --disable-minix --disable-vstafs
+
+GRUB_STAGE_1_5_TO_INSTALL += $(if $(BR2_TARGET_GRUB_FS_EXT2),e2fs)
+GRUB_STAGE_1_5_TO_INSTALL += $(if $(BR2_TARGET_GRUB_FS_FAT),fat)
+GRUB_STAGE_1_5_TO_INSTALL += $(if $(BR2_TARGET_GRUB_FS_ISO9660),iso9660)
+GRUB_STAGE_1_5_TO_INSTALL += $(if $(BR2_TARGET_GRUB_FS_JFS),jfs)
+GRUB_STAGE_1_5_TO_INSTALL += $(if $(BR2_TARGET_GRUB_FS_REISERFS),reiserfs)
+GRUB_STAGE_1_5_TO_INSTALL += $(if $(BR2_TARGET_GRUB_FS_XFS),xfs)
+
+define GRUB_DEBIAN_PATCHES
+	# Apply the patches from the Debian patch
+	(cd $(@D) ; for f in `cat debian/patches/series | grep -v ^#` ; do \
+		cat debian/patches/$$f | patch -g0 -p1 ; \
+	done)
+endef
+
+GRUB_POST_PATCH_HOOKS += GRUB_DEBIAN_PATCHES
+
+GRUB_CONF_ENV = \
+	$(HOST_CONFIGURE_OPTS) \
+	CFLAGS="$(HOST_CFLAGS) $(GRUB_CFLAGS) -m32"
+
+GRUB_CONF_OPTS = \
+	--disable-auto-linux-mem-opt \
+	$(GRUB_CONFIG-y)
+
+ifeq ($(BR2_TARGET_GRUB_SPLASH),y)
+define GRUB_INSTALL_SPLASH
+	$(INSTALL) -D -m 0644 boot/grub/splash.xpm.gz $(TARGET_DIR)/boot/grub/splash.xpm.gz
+endef
+else
+define GRUB_INSTALL_SPLASH
+	$(SED) '/^splashimage/d' $(TARGET_DIR)/boot/grub/menu.lst
+endef
+endif
+
+# We're cheating here as we're installing the grub binary not in the
+# target directory (where it is useless), but in the host
+# directory. This grub binary can be used to install grub into the MBR
+# of a disk or disk image.
+
+define GRUB_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/grub/grub $(HOST_DIR)/sbin/grub
+	$(INSTALL) -D -m 0755 $(@D)/stage1/stage1 $(TARGET_DIR)/boot/grub/stage1
+	for f in $(GRUB_STAGE_1_5_TO_INSTALL) ; do \
+		$(INSTALL) -D -m 0755 $(@D)/stage2/$${f}_stage1_5 \
+			$(TARGET_DIR)/boot/grub/$${f}_stage1_5 ; \
+	done
+	$(INSTALL) -D -m 0644 $(@D)/stage2/stage2 $(TARGET_DIR)/boot/grub/stage2
+	$(INSTALL) -D -m 0644 boot/grub/menu.lst $(TARGET_DIR)/boot/grub/menu.lst
+	$(GRUB_INSTALL_SPLASH)
+endef
+
+$(eval $(autotools-package))
@@ -0,0 +1,16 @@
+default		0
+timeout		10
+
+# Used when no splashimage is used
+color 		cyan/blue white/blue
+
+# Gets enabled/disabled depending on Grub support for splashimage
+splashimage	(hd0,0)/boot/grub/splash.xpm.gz
+
+# Used when a splashimage is enabled
+foreground 	000000
+background 	cccccc
+
+title Buildroot
+	root (hd0,0)
+	kernel /boot/bzImage rw root=/dev/sda1 rootwait
@@ -38,7 +38,7 @@ choice
 	  Select the specific U-Boot version you want to use

 config BR2_TARGET_UBOOT_LATEST_VERSION
-	bool "2017.09"
+	bool "2017.07"

 config BR2_TARGET_UBOOT_CUSTOM_VERSION
 	bool "Custom version"
@@ -86,7 +86,7 @@ endif

 config BR2_TARGET_UBOOT_VERSION
 	string
-	default "2017.09"	if BR2_TARGET_UBOOT_LATEST_VERSION
+	default "2017.07"	if BR2_TARGET_UBOOT_LATEST_VERSION
 	default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \
 		if BR2_TARGET_UBOOT_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_UBOOT_CUSTOM_TARBALL
@@ -129,12 +129,6 @@ config BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE
 	depends on BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG
 	help
 	  Path to the U-Boot configuration file.
-
-config BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES
-	string "Additional configuration fragment files"
-	help
-	  A space-separated list of configuration fragment files,
-	  that will be merged to the main U-Boot configuration file.
 endif

 config BR2_TARGET_UBOOT_NEEDS_DTC
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  b2d15f2cf5f72e706025cde73d67247c6da8cd35f7e10891eefe7d9095089744  u-boot-2017.09.tar.bz2
+sha256  5374bfdc8acb9a38c025371b1ff20f45e7533668e84e685d0df5d9e7c0e4feff  u-boot-2017.07.tar.bz2
@@ -183,13 +183,6 @@ define UBOOT_APPLY_LOCAL_PATCHES
 endef
 UBOOT_POST_PATCH_HOOKS += UBOOT_APPLY_LOCAL_PATCHES

-# Bug: https://patchwork.ozlabs.org/patch/833760/
-define UBOOT_FIX_LIBFDT_SYSTEM_PATH
-	[ ! -e $(@D)/tools/fdtgrep.c ] || \
-	$(SED) 's%<../include/libfdt.h>%"../include/libfdt.h"%' $(@D)/tools/fdtgrep.c
-endef
-UBOOT_POST_PATCH_HOOKS += UBOOT_FIX_LIBFDT_SYSTEM_PATH
-
 ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY),y)
 define UBOOT_CONFIGURE_CMDS
 	$(TARGET_CONFIGURE_OPTS) 	\
@@ -203,7 +196,6 @@ else ifeq ($(BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG),y)
 UBOOT_KCONFIG_FILE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE))
 endif # BR2_TARGET_UBOOT_USE_DEFCONFIG

-UBOOT_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES))
 UBOOT_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig
 UBOOT_KCONFIG_OPTS = $(UBOOT_MAKE_OPTS)
 define UBOOT_HELP_CMDS
@@ -5,7 +5,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_LINUX_KERNEL_DEFCONFIG="at91_dt"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek"
@@ -16,13 +16,13 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048
 BR2_TARGET_AT91BOOTSTRAP3=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.8"
 BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eknf_uboot"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_nandflash"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_PACKAGE_HOST_SAM_BA=y
@@ -19,7 +19,7 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_LINUX_KERNEL_DEFCONFIG="at91_dt"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek"
@@ -86,13 +86,13 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048
 BR2_TARGET_AT91BOOTSTRAP3=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.8"
 BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eknf_uboot"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_nandflash"
 BR2_TARGET_UBOOT_NEEDS_DTC=y

@@ -12,7 +12,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/at91sam9x5ek_mmc/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_LINUX_KERNEL_DEFCONFIG="at91_dt"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek"
@@ -25,13 +25,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_AT91BOOTSTRAP3=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.8"
 BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eksd_uboot"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_mmc"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_ENVIMAGE=y
@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/at91sam9x5ek_mmc/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_LINUX_KERNEL_DEFCONFIG="at91_dt"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek"
@@ -87,13 +87,13 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
 BR2_TARGET_AT91BOOTSTRAP3=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.8"
 BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eksd_uboot"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_mmc"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_ENVIMAGE=y
@@ -1,85 +0,0 @@
-BR2_arm=y
-BR2_cortex_a5=y
-BR2_ARM_ENABLE_NEON=y
-BR2_ARM_ENABLE_VFP=y
-BR2_ARM_INSTRUCTIONS_THUMB2=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-BR2_PTHREAD_DEBUG=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d27_som1_ek_mmc/post-image.sh"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
-BR2_LINUX_KERNEL_DEFCONFIG="sama5"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d27_som1_ek at91-sama5d27_som1_ek_pda4 at91-sama5d27_som1_ek_pda7 at91-sama5d27_som1_ek_pda7b"
-BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
-BR2_PACKAGE_ALSA_UTILS=y
-BR2_PACKAGE_ALSA_UTILS_ALSACONF=y
-BR2_PACKAGE_ALSA_UTILS_APLAY=y
-BR2_PACKAGE_FFMPEG=y
-BR2_PACKAGE_FFMPEG_GPL=y
-BR2_PACKAGE_FFMPEG_SWSCALE=y
-BR2_PACKAGE_MPG123=y
-BR2_PACKAGE_BZIP2=y
-BR2_PACKAGE_GZIP=y
-BR2_PACKAGE_UNZIP=y
-BR2_PACKAGE_XZ=y
-BR2_PACKAGE_ZIP=y
-BR2_PACKAGE_GDB=y
-BR2_PACKAGE_LMBENCH=y
-BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
-BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
-BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
-BR2_PACKAGE_MMC_UTILS=y
-BR2_PACKAGE_MTD=y
-BR2_PACKAGE_WILC1000_FIRMWARE=y
-BR2_PACKAGE_DEVMEM2=y
-BR2_PACKAGE_EVTEST=y
-BR2_PACKAGE_I2C_TOOLS=y
-BR2_PACKAGE_SETSERIAL=y
-BR2_PACKAGE_SPI_TOOLS=y
-BR2_PACKAGE_USBUTILS=y
-BR2_PACKAGE_LIBDRM=y
-BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
-BR2_PACKAGE_DTC=y
-BR2_PACKAGE_DTC_PROGRAMS=y
-BR2_PACKAGE_BLUEZ_UTILS=y
-BR2_PACKAGE_BRIDGE_UTILS=y
-BR2_PACKAGE_CAN_UTILS=y
-BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_ETHTOOL=y
-BR2_PACKAGE_IPERF=y
-BR2_PACKAGE_IPROUTE2=y
-BR2_PACKAGE_IPTABLES=y
-BR2_PACKAGE_IW=y
-BR2_PACKAGE_LRZSZ=y
-BR2_PACKAGE_MII_DIAG=y
-BR2_PACKAGE_OPENSSH=y
-BR2_PACKAGE_WGET=y
-BR2_PACKAGE_WIRELESS_TOOLS=y
-BR2_PACKAGE_WPA_SUPPLICANT=y
-BR2_PACKAGE_BASH=y
-BR2_PACKAGE_HTOP=y
-BR2_PACKAGE_VIM=y
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_4=y
-BR2_TARGET_AT91BOOTSTRAP3=y
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
-BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d27_som1_eksd_uboot"
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
-BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d27_som1_ek_mmc"
-BR2_TARGET_UBOOT_NEEDS_DTC=y
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_MTOOLS=y
@@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d2_xplained_mmc/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_LINUX_KERNEL_DEFCONFIG="sama5"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_xplained at91-sama5d2_xplained_pda4 at91-sama5d2_xplained_pda7 at91-sama5d2_xplained_pda7b"
@@ -17,13 +17,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_AT91BOOTSTRAP3=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.8"
 BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d2_xplainedsd_uboot"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d2_xplained_mmc"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
@@ -24,7 +24,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d2_xplained_mmc/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_LINUX_KERNEL_DEFCONFIG="sama5"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_xplained at91-sama5d2_xplained_pda4 at91-sama5d2_xplained_pda7 at91-sama5d2_xplained_pda7b"
@@ -89,13 +89,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_AT91BOOTSTRAP3=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.8"
 BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d2_xplainedsd_uboot"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d2_xplained_mmc"
 BR2_TARGET_UBOOT_NEEDS_DTC=y

@@ -6,7 +6,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_LINUX_KERNEL_DEFCONFIG="sama5"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained at91-sama5d3_xplained_pda4 at91-sama5d3_xplained_pda7 at91-sama5d3_xplained_pda7b"
@@ -17,13 +17,13 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048
 BR2_TARGET_AT91BOOTSTRAP3=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.8"
 BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainednf_uboot"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3_xplained_nandflash"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_PACKAGE_HOST_SAM_BA=y
@@ -21,7 +21,7 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_LINUX_KERNEL_DEFCONFIG="sama5"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained at91-sama5d3_xplained_pda4 at91-sama5d3_xplained_pda7 at91-sama5d3_xplained_pda7b"
@@ -88,13 +88,13 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048
 BR2_TARGET_AT91BOOTSTRAP3=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.8"
 BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainednf_uboot"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3_xplained_nandflash"
 BR2_TARGET_UBOOT_NEEDS_DTC=y

@@ -7,7 +7,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d3_xplained_mmc/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_LINUX_KERNEL_DEFCONFIG="sama5"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained at91-sama5d3_xplained_pda4 at91-sama5d3_xplained_pda7 at91-sama5d3_xplained_pda7b"
@@ -16,13 +16,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_AT91BOOTSTRAP3=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.8"
 BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainedsd_uboot"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3_xplained_mmc"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
@@ -23,7 +23,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d3_xplained_mmc/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_LINUX_KERNEL_DEFCONFIG="sama5"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained at91-sama5d3_xplained_pda4 at91-sama5d3_xplained_pda7 at91-sama5d3_xplained_pda7b"
@@ -88,13 +88,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_AT91BOOTSTRAP3=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.8"
 BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainedsd_uboot"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3_xplained_mmc"
 BR2_TARGET_UBOOT_NEEDS_DTC=y

@@ -7,7 +7,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_LINUX_KERNEL_DEFCONFIG="sama5"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained at91-sama5d4_xplained_hdmi at91-sama5d4_xplained_pda4 at91-sama5d4_xplained_pda7 at91-sama5d4_xplained_pda7b"
@@ -21,13 +21,13 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=0
 BR2_TARGET_AT91BOOTSTRAP3=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.8"
 BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainednf_uboot_secure"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d4_xplained_nandflash"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_PACKAGE_HOST_SAM_BA=y
@@ -22,7 +22,7 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_LINUX_KERNEL_DEFCONFIG="sama5"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained at91-sama5d4_xplained_hdmi at91-sama5d4_xplained_pda4 at91-sama5d4_xplained_pda7 at91-sama5d4_xplained_pda7b"
@@ -92,13 +92,13 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=0
 BR2_TARGET_AT91BOOTSTRAP3=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.8"
 BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainednf_uboot_secure"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d4_xplained_nandflash"
 BR2_TARGET_UBOOT_NEEDS_DTC=y

@@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d4_xplained_mmc/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_LINUX_KERNEL_DEFCONFIG="sama5"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained at91-sama5d4_xplained_hdmi at91-sama5d4_xplained_pda4 at91-sama5d4_xplained_pda7 at91-sama5d4_xplained_pda7b"
@@ -17,13 +17,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_AT91BOOTSTRAP3=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.8"
 BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainedsd_uboot_secure"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d4_xplained_mmc"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
@@ -24,7 +24,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d4_xplained_mmc/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_LINUX_KERNEL_DEFCONFIG="sama5"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained at91-sama5d4_xplained_hdmi at91-sama5d4_xplained_pda4 at91-sama5d4_xplained_pda7 at91-sama5d4_xplained_pda7b"
@@ -89,13 +89,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_AT91BOOTSTRAP3=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.8"
 BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainedsd_uboot_secure"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.6"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d4_xplained_mmc"
 BR2_TARGET_UBOOT_NEEDS_DTC=y

@@ -1,37 +0,0 @@
-BR2_arm=y
-BR2_cortex_a7=y
-BR2_ARM_EABIHF=y
-
-# Linux headers same as kernel, a 4.13 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
-
-# Bootloader
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
-BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Bananapi"
-BR2_TARGET_UBOOT_NEEDS_DTC=y
-BR2_TARGET_UBOOT_FORMAT_BIN=y
-BR2_TARGET_UBOOT_SPL=y
-BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
-BR2_TARGET_UBOOT_BOOT_SCRIPT=y
-BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m1/boot.cmd"
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.7"
-BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-bananapi"
-
-# Filesystem
-BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M1"
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_4=y
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_MTOOLS=y
-BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m1/genimage.cfg"
@@ -1,28 +0,0 @@
-BR2_arm=y
-BR2_cortex_a7=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
-BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M2 Plus"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sinovoip/m2-plus/genimage.cfg"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3"
-BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-bananapi-m2-plus"
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_4=y
-# BR2_TARGET_ROOTFS_TAR is not set
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07"
-BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Sinovoip_BPI_M2_Plus"
-BR2_TARGET_UBOOT_NEEDS_DTC=y
-BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
-BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
-BR2_TARGET_UBOOT_BOOT_SCRIPT=y
-BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/sinovoip/m2-plus/boot.cmd"
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_MTOOLS=y
@@ -4,8 +4,8 @@ BR2_cortex_a7=y
 BR2_ARM_EABIHF=y
 BR2_ARM_FPU_NEON_VFPV4=y

-# Linux headers same as kernel, a 4.13 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
+# Linux headers same as kernel, a 4.12 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_12=y

 # Toolchain
 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
@@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/lemaker/bananapro/post-image.sh"
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.1"
 BR2_LINUX_KERNEL_USE_DEFCONFIG=y
 BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/lemaker/bananapro/linux-wifi.fragment"
@@ -39,7 +39,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Bananapro"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
@@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_FPU_VFPV3=y

-# Linux headers same as kernel, a 4.13 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y

 # System
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
@@ -14,7 +14,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07-rc1"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6qdl_icore_mmc"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
@@ -25,15 +25,15 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL"
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.5"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-icore imx6q-icore imx6q-icore-ofcap10 imx6q-icore-ofcap12"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-icore imx6q-icore"

 # Filesystem
-BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam i.CoreM6 Quad/Dual/DualLite/Solo"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam i.CoreM6 Quad/Dual/DualLite/Solo Starter Kit"
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
@@ -1,81 +0,0 @@
-BR2_arm=y
-BR2_cortex_a9=y
-BR2_ARM_ENABLE_NEON=y
-BR2_ARM_ENABLE_VFP=y
-BR2_ARM_FPU_VFPV3=y
-
-# Linux headers same as kernel, a 4.13 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
-
-# System
-BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
-
-# Bootloader
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07"
-BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6qdl_icore_mmc"
-BR2_TARGET_UBOOT_NEEDS_DTC=y
-BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
-BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y
-BR2_TARGET_UBOOT_SPL=y
-BR2_TARGET_UBOOT_SPL_NAME="SPL"
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13"
-BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-icore imx6q-icore imx6q-icore-ofcap10 imx6q-icore-ofcap12"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/engicam/icorem6/linux_qt5.fragment"
-
-# Filesystem
-BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam i.CoreM6 Quad/Dual/DualLite/Solo"
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_4=y
-BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_MTOOLS=y
-BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/icorem6/genimage.cfg"
-BR2_ROOTFS_OVERLAY="board/engicam/icorem6/rootfs_overlay"
-
-# qt5 dependencies
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-
-# qt5
-BR2_PACKAGE_QT5=y
-BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y
-BR2_PACKAGE_QT5BASE_OPENGL_LIB=y
-BR2_PACKAGE_QT5BASE_LINUXFB=y
-BR2_PACKAGE_QT5BASE_FONTCONFIG=y
-BR2_PACKAGE_QT5BASE_GIF=y
-BR2_PACKAGE_QT5BASE_JPEG=y
-
-# mesa3d
-BR2_PACKAGE_MESA3D=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
-BR2_PACKAGE_MESA3D_OPENGL_ES=y
-
-# qt5 demo packages
-BR2_PACKAGE_GLMARK2=y
-BR2_PACKAGE_MESA3D_DEMOS=y
-BR2_PACKAGE_KMSCUBE=y
-BR2_PACKAGE_QT5CINEX=y
-BR2_PACKAGE_QT5CINEX_HD=y
-
-# fonts
-BR2_PACKAGE_BITSTREAM_VERA=y
-BR2_PACKAGE_CANTARELL=y
-BR2_PACKAGE_DEJAVU=y
-BR2_PACKAGE_FONT_AWESOME=y
-BR2_PACKAGE_GHOSTSCRIPT_FONTS=y
-BR2_PACKAGE_INCONSOLATA=y
-BR2_PACKAGE_LIBERATION=y
@@ -1,38 +0,0 @@
-BR2_arm=y
-BR2_cortex_a9=y
-BR2_ARM_ENABLE_NEON=y
-BR2_ARM_ENABLE_VFP=y
-BR2_ARM_FPU_VFPV3=y
-
-# Linux headers same as kernel, a 4.13 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
-
-# System
-BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
-
-# required tools to create the SD card image
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_MTOOLS=y
-
-# Filesystem
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_4=y
-
-# Bootloader
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="mx6sabreauto"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
-BR2_TARGET_UBOOT_FORMAT_IMG=y
-BR2_TARGET_UBOOT_SPL=y
-BR2_TARGET_UBOOT_SPL_NAME="SPL"
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3"
-BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabreauto imx6dl-sabreauto imx6qp-sabreauto"
@@ -1,97 +0,0 @@
-BR2_arm=y
-BR2_cortex_a9=y
-BR2_ARM_ENABLE_NEON=y
-BR2_ARM_ENABLE_VFP=y
-BR2_ARM_FPU_VFPV3=y
-
-# Linux headers same as kernel, a 4.13 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
-
-# Additional features needed for packages
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-
-# System
-BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
-
-# required tools to create the SD card image
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_MTOOLS=y
-
-# Filesystem
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_4=y
-BR2_TARGET_ROOTFS_EXT2_SIZE="320M"
-BR2_ROOTFS_OVERLAY="board/freescale/imx6-sabresd/rootfs_overlay"
-
-# Bootloader
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
-BR2_TARGET_UBOOT_FORMAT_IMG=y
-BR2_TARGET_UBOOT_SPL=y
-BR2_TARGET_UBOOT_SPL_NAME="SPL"
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3"
-BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/freescale/imx6-sabresd/linux_qt5.fragment"
-
-# GL driver
-BR2_PACKAGE_MESA3D=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
-BR2_PACKAGE_MESA3D_OPENGL_ES=y
-
-# Fonts
-BR2_PACKAGE_BITSTREAM_VERA=y
-BR2_PACKAGE_CANTARELL=y
-BR2_PACKAGE_DEJAVU=y
-BR2_PACKAGE_FONT_AWESOME=y
-BR2_PACKAGE_GHOSTSCRIPT_FONTS=y
-BR2_PACKAGE_INCONSOLATA=y
-BR2_PACKAGE_LIBERATION=y
-
-# GL demos
-BR2_PACKAGE_GLMARK2=y
-BR2_PACKAGE_KMSCUBE=y
-BR2_PACKAGE_LIBV4L=y
-BR2_PACKAGE_MESA3D_DEMOS=y
-
-# Qt5
-BR2_PACKAGE_QT5=y
-BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y
-BR2_PACKAGE_QT5BASE_OPENGL_LIB=y
-BR2_PACKAGE_QT5BASE_LINUXFB=y
-BR2_PACKAGE_QT5BASE_FONTCONFIG=y
-BR2_PACKAGE_QT5BASE_GIF=y
-BR2_PACKAGE_QT5BASE_JPEG=y
-BR2_PACKAGE_QT5CINEX=y
-BR2_PACKAGE_QT5CINEX_HD=y
-
-# NXP firmware package
-BR2_PACKAGE_FREESCALE_IMX=y
-BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q=y
-BR2_PACKAGE_FIRMWARE_IMX=y
-
-# libdrm tests
-BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
-
-# gstreamer-1.0
-BR2_PACKAGE_GSTREAMER1=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y
-BR2_PACKAGE_GST1_PLUGINS_BAD=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_KMS=y
-
-# For automatic kernel module loading
-BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
@@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_FPU_VFPV3=y

-# Linux headers same as kernel, a 4.13 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y

 # System
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
@@ -22,17 +22,15 @@ BR2_TARGET_ROOTFS_EXT2_4=y

 # Bootloader
 BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd"
+BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
-BR2_TARGET_UBOOT_FORMAT_IMG=y
-BR2_TARGET_UBOOT_SPL=y
-BR2_TARGET_UBOOT_SPL_NAME="SPL"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.05"
+BR2_TARGET_UBOOT_FORMAT_IMX=y

 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.1"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd"
@@ -1,35 +0,0 @@
-# architecture
-BR2_arm=y
-BR2_cortex_a7=y
-BR2_ARM_FPU_NEON_VFPV4=y
-
-# Linux headers same as kernel, a 4.13 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
-
-# system
-BR2_TARGET_GENERIC_GETTY_PORT="ttymxc4"
-
-# kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13"
-BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-pico"
-
-# bootloader
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="pico-imx7d"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07"
-BR2_TARGET_UBOOT_FORMAT_IMX=y
-
-# required tools to create the eMMC image
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_MTOOLS=y
-
-# filesystem / image
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_4=y
@@ -17,13 +17,13 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/linksprite/pcduino/post-image.sh"
 # For kernel modules autoloading
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y

-# Linux headers same as kernel, a 4.13 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y

 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11"
 BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-pcduino"
@@ -37,7 +37,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.03"
 BR2_TARGET_UBOOT_USE_DEFCONFIG=y
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Linksprite_pcDuino"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
@@ -2,8 +2,8 @@
 BR2_arm=y
 BR2_arm926t=y

-# Linux headers same as kernel, a 4.13 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
+# Linux headers same as kernel, a 4.9 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y

 # System
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
@@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="mx25pdk"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
 BR2_TARGET_UBOOT_FORMAT_IMX=y

 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.9"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v4_v5"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx25-pdk"
@@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="mx53loco"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.05"
 BR2_TARGET_UBOOT_FORMAT_IMX=y

 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.12"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.1"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx53-qsb imx53-qsrb"
@@ -3,8 +3,8 @@ BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_FPU_VFPV3=y
-# Linux headers same as kernel, a 4.13 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
+# Linux headers same as kernel, a 4.7 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/solidrun/mx6cubox/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/solidrun/mx6cubox/post-image.sh"
@@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="mx6cuboxi"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01"
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="SPL"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7.3"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-cubox-i imx6dl-cubox-i imx6q-hummingboard imx6dl-hummingboard"
@@ -3,8 +3,8 @@ BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_FPU_VFPV3=y
-# Linux headers same as kernel, a 4.13 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
+# Linux headers same as kernel, a 4.10 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_10=y
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/neo/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/udoo/neo/post-image.sh"
 BR2_TARGET_ROOTFS_EXT2=y
@@ -12,13 +12,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="udoo_neo"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="SPL"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-udoo-neo-basic imx6sx-udoo-neo-full imx6sx-udoo-neo-extended"
@@ -3,22 +3,22 @@ BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_FPU_VFPV3=y
-# Linux headers same as kernel, a 4.13 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
+# Linux headers same as kernel, a 4.8 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/udoo/mx6qdl/post-image.sh"
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="udoo"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01"
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="SPL"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.11"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/udoo/mx6qdl/linux.fragment"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -1,13 +1,13 @@
 BR2_aarch64=y
 BR2_cortex_a53=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_12=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
 BR2_SYSTEM_DHCP="eth0"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/nexbox/a95x/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/nexbox/a95x/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-gxbb-nexbox-a95x amlogic/meson-gxl-s905x-nexbox-a95x"
@@ -16,7 +16,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/hardkernel/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f966ebfc0e8dc88c7931b4640b8a1b4bc2e13faa"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="a7fe6f2258e30c7a547908b5480bdbe6b56d6d3c"
 BR2_LINUX_KERNEL_DEFCONFIG="odroidc2"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_BUILD_DEFAULT_DTS=y
@@ -28,7 +28,7 @@ BR2_LINUX_KERNEL_IMAGE=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/hardkernel/u-boot.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="cff3edb675933ea2e2ecd659eab127a42f3777df"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="eb5d2d16fd45f52ec49e9b4ff9d562630c08e61c"
 BR2_TARGET_UBOOT_BOARDNAME="odroidc2"

 # Required tools to create the SD image
@@ -18,7 +18,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg"
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.49"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.36"
 BR2_LINUX_KERNEL_USE_DEFCONFIG=y
 BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -34,7 +34,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
@@ -41,7 +41,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
--- a/Show More
+++ b/Show More