Makefile: release: create tarball from current branch, not master

To support stable bugfix releases. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Update for 2013.08.1
2026-01-09 06:10:17 +03:00 · 2013-09-17 13:42:07 +02:00 · 2013-09-17 13:21:15 +02:00 · 2013-09-15 23:34:25 +02:00 · 2013-09-11 12:23:37 +02:00 · 2013-09-11 12:23:21 +02:00
2256 changed files with 33068 additions and 35599 deletions
--- a/333
+++ b/333
@@ -1,334 +1,11 @@
-2014.02-rc2, Released February 20th, 2014
+2013.08.1, Released September 17th, 2013:

-	Fixes all over the tree. Static linking / nommu fixes and
-	annotations for several packages.
+	Handle the removed GCC and development files on target options
+	through Config.in.legacy.

-	Updated/fixed packages: boost, busybox, collectd, coreutils,
-	dropbear, elfutils, feh, gcc, gst1-libav, imagemagick, iozone,
-	jimtcl, kexec, libvncserver, lvm2, lxc, mplayer, netsnmp, nut,
-	opencv, python, python3, qtuio, systemd, thrift, transmission,
-	uclibc, vlc, webkit
+	Rootfs /lib symlink handling fixed (triggered by make external-deps)

-	Issues resolved (http://bugs.uclibc.org):
-
-	#5450: AT91SAM9260 Bootstrap compilation problem
-	#5582: libiconv 1.14 failed to build
-	#5624: When building directfb, BR2_TARGET_LDFLAGS not used by..
-	#5852: [2012.11] usb_modeswitch should depends of "BR2_PACK..
-	#6218: binutils-2.23.2/gas fails with undefined reference to..
-	#6236: binutils-2.23.2/bfd fails with undefined reference to..
-	#6470: If the build directory is a child of /usr, the build..
-	#6776: systemd error: static declaration of 'execvpe' follows..
-	#6818: toolchainfile.cmake has absolut path references
-
-2014.02-rc1, Released February 11th, 2014
-
-	Fixes all over the tree and new features.
-
-	Support for external packages/defconfigs (BR2_EXTERNAL). See
-	user manual for details.
-
-	Cleanup of environment variable names for consistency. The
-	download directory location override (BUILDROOT_DL_DIR) is now
-	called BR2_DL_DIR. Likewise the name of the current .config is
-	renamed from BUILDROOT_CONFIG to BR2_CONFIG. Please update
-	your post build scripts if you use this! BUILD_DIR is now also
-	exported to the post build/image scripts.
-
-	Toolchain: GCC 4.8 fix for ARM stack corruption, reverted
-	uClibc pread/pwrite backport as they cause issues on certain
-	architectures, new Linaro and Sourcery Codebench toolchains.
-	x86: Support for AMD Jaguar cores, SSE4.x, SH: SH2/SH3/SH3EB
-	variants removed, Microblaze: Internal toolchain support
-
-	Legal infrastructure: Info is now split between host and
-	target packages, large number of license annotations.
-
-	Lua: selection between lua 5.1 / 5.2, luarocks support
-
-	Python: package infrastructure, many new packages.
-
-	Defconfigs: Armadeus APF51 + Zedboard added, apf27, apf28,
-	beaglebone, microblaze, pandaboard, qemu, raspberry pi
-	updated.
-
-	Updated/fixed packages: aiccu, alsa-lib, alsa-utils,
-	am33x-cm3, aumix, autoconf, automake, barebox, bellagio,
-	berkeleydb, binutils, bison, blackbox, bluez_utils, boost,
-	bustle, busybox, cairo, can-utils, ccache, ccid, cgilua,
-	cifs-utils, civetweb, cmake, collectd, connman, copas,
-	coreutils, coxpcall, cppzmq, cramfs, crda, cryptodev-linux,
-	cryptsetup, cups, czmq, dhcpcd, dhcpdump, dhrystone, dialog,
-	dmraid, dnsmasq, dosfstools, dropbear, dropwatch, dtc, duma,
-	dvb-apps, e2fsprogs, eglibc, eigen, elf2flt, erlang, ethtool,
-	f2fs-tools, ffmpeg, file, filemq, fio, flashrom, flex,
-	fluxbox, fontconfig freerdp, freetype, gadgetfs-test, gawk,
-	gcc, gdb, gdbm, gettext, git, glibc, gnupg, gnutls, gob2,
-	gpsd, grep, grub, gst-ffmpeg, gst-plugins-good,
-	gst1-plugins-bad, gst1-plugins-base, gst1-plugins-good,
-	gst1-plugins-ugly, gstreamer, gstreamer1, gtest, icu, iftop,
-	imagemagick, inadyn, infozip, iozone, iproute2, iptables, iw,
-	jpeg, jpeg-turbo, jq, kexec, kmod, knock, lbase64, lcdapi,
-	lftp, libcdaudio, libcgi, libcgicc, libcuefile, libcurl,
-	libdmtx, libdrm, libdvdnav, libdvdread, libegl, libevent,
-	libexif, libfcgi, libfreefare, libgles, libglib2, libllcp,
-	libmicrohttpd, libmpd, libnfc, libnl, libnss, libopenmax,
-	libopenvg, libpcap, libpfm4, libplayer, libpng, libqmi,
-	libreplaygain, libroxml, libsamplerate, libsexy, libsigsegv,
-	libsndfile, libsoc, libtasn1, libtorrent, libtpl, libupnp,
-	libusb, libusb-compat, libvorbis, libxcb, libxml2, libxmlpp,
-	libyaml, lighttpd, linknx, linux-firmware, linux-pam, live555,
-	lm_sensors, lmbench, lockdev, logrotate, lrzsz, ltrace, lua,
-	lua-ev, lua-msgpack-native, luabitop, luaexpat, luaexpatutils,
-	luafilesystem, luajit, luaposix, luasec, luasocket,
-	luasql-sqlite3, m4, matchbox, mdadm, minicom, mongrel2, mpc,
-	mpd, mpg123, mplayer, mtd, mysql, lvm2, mxml, ncurses, ne10,
-	neard, neardal, netsnmp, netstat-nat, network-manager, nodejs,
-	numactl, ofone, ola, olsr, omniorb, open2300, opencv,
-	openpowerlink, openssh, openssl, openvpn, oprofile, opus,
-	opus-tools, orbit, p11-kit, parted, pcre, pcsc-lite, perl,
-	php, poco, poppler, powervr, protobuf-c, psplash, python,
-	python-bottle,
-	python-{crc16,distutilscross,dpkt,id3,ipy,m2crypto,mad,meld},
-	python-{netifaces,nfc,protobuf,pygame,pyparsing,pyro,pyzmq},
-	python-{serial,setuptools}, qt, qt5base, qt5connectivity,
-	qt5declarative, qt5graphicaleffects, qt5jsbackend,
-	qt5multimedia, qt5quick1, qt5quickcontrols, qt5script,
-	qt5webkit, radvd, redis, rings, rng-tools, rpcbind,
-	rpi-firmware, rpi-userland, rt-tests, sam-ba, samba, sawman,
-	sconeserver, scons, sdl, sg3_utils, snappy, snmppp,
-	socketcand, spice, spice-protocol, sqlcipher, sqlite, squid,
-	sshfs, strace, subversion, sunxi-mali, supervisor, sysklogd,
-	sysprof, sysstat, systemd, sysvinit, taglib, tar, tcpdump,
-	ti-gfx, ti-utils, tinymembench, tn5250, trace-cmd,
-	transmission, tvheadend, tzdata, zxing, uboot, uboot-tools,
-	uclibc, udev, udpcast, ulogd, urg, usb_modeswitch_data,
-	util-linux, vala, valgrind, vorbis-tools, wavpack, wayland,
-	weston, wget, wireless-regdb, wireshark, wpa_supplicant,
-	wsapi, xavante, xapp_xdpyinfo, xapp_xrandr, xcb-proto,
-	xdriver_xf86-video-intel, xenomai, xkeyboard-config, xl2tp,
-	xlib_lib{FS,SM,X11},
-	xlib_libX{au,aw,composite,cursor,damage,ext,fixes,font,i},
-	xlib_libX{inerama,mu,pm,randr,render,res,t,tst,v,xf86dga},
-	xlib_libXxf86vm, xlib_libdmx, xlib_libfontenc,
-	xlib_libpciaccess, xlib_xtrans, xproto_dri2proto,
-	xproto_{glproto,inputproto,presentproto,randrproto,videoproto},
-	xproto_xextproto, xproto_xproto, xutil_util-macros,
-	xutil_makedepend, zic, zmqpp, zxing, zsh, zyre
-
-	New packages: apitrace, avrdude, c-ares, ca-certificates,
-	cwiid, dbus-cpp, evemu, fping, fswebcam, gpm, gst1-libav,
-	haveged, intel-microcode, iucode-tools, jasper, joe, ktap,
-	lbreakout2, libass, libbluray, libcdio, libenca, libevdev,
-	libmbim, libmodplug, libnfs, libnftnl, libplist, libshairplay,
-	libsocketcan, ljsyscall, log4cplus, ltris, luainterpreter,
-	luarocks, minidlna, mmc-utils, modemmanager, mtr, net-tools,
-	python-configobj, python-dialog, python-json-schema-validator,
-	python-keyring, python-msgpack, python-posix-ipc,
-	python-pyasn, python-pycrypto, python-pysnmp,
-	python-pysnmp-apps, python-pysnmp-mibs, python-pyusb,
-	python-simplejson, python-tornado, python-versiontools,
-	rtmpdump, rtptools, smcroute, smstools3, tcpreplay, thrift,
-	ti-uim, tinyxml, tmux, vlc, wmctrl, xconsole
-
-	Removed packages: autoconf, automake, ccache, cpanminus, lzma,
-	netkitbase, netkittelnet, pkg-config, squashfs3, ttcp, xstroke
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#65:   new package: dbus c++ language bindings
-	#769:  Update configuration menu for MIPS target
-	#2419: Add a bundle of Lua modules
-	#2629: Segmentation faults and division by zero in Grub on ext2
-	#3811: Added auto-mount for USB and SD Card (mdev) (for 2011.05)
-	#4339: Allow override of DL_DIR in extract step
-	#4363: Make sure that copied linux and busybox defconfig are...
-	#4454: There should be simple way to update image, when chang...
-	#5024: grub fails to build for x86_64 target architecture
-	#5066: New-Package: net-tools
-	#5072: ncurses: add ncurses-progs to target
-	#5294: uclibc build ignores target CFLAGS and LDFLAGS
-	#5366: Login doesn't work with util-linux versions of login/agetty
-	#5378: dropbear Makefile broken
-	#5390: System banner - change to empty doesn't remove /etc/issue
-	#5780: spurious build failure because it cannot remove ubinize.cfg
-	#5798: ncurses-5.9 fails to compile statically
-	#5810: Buildroot 2012.11: Additional GCC option "-msoft-float" ...
-	#6080: Git fetch caching
-	#6092: Bootable ISO image creation seems to have stopped working..
-	#6272: coreutils build fails
-	#6434: apply-patches.sh does not work recursively
-	#6446: eglibc doesn't install ldconfig to target
-	#6484: Add c-ares
-	#6596: Slow bootup if mdev is chosen
-	#6656: Build Qt5 with ccache
-	#6662: internal compiler error: Segmentation fault during making..
-	#6722: Usage of $($(PKG)_DIR_PREFIX) is an issue with linux package
-	#6752: genext2fs: e2fsck must run before tunefs -U random
-	#6770: openssl 1.0.1f fails with ccache
-	#6830: Qt5: no fonts are installed
-	#6848: Qt5: no text shown in simple QWidget / frame-buffer setup
-	#6854: Update to Qt 5.2.1
-
-2013.11, Released November 30th, 2013:
-
-	Minor fixes.
-
-	Updated/fixed packages: apr, binutils, dbus-python, dropwatch,
-	ecryptfs-utils, eglibc, gdb, gpsd, grantlee, hostapd,
-	iptables, qlibiscsi, libnspr, libnss, libpfm4, libtool,
-	lua-ev, lvm2, mplayer, qt, qt5, quagga, ruby, tinymembench,
-	tvheadend, util-linux, wpa_supplicant
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#1279: Buildroot compiled Busybox and Coreutils LFS issues
-	#2995: -fstack-protector-all causes ssh to SIGSEGV
-	#5570: Cannot compile software on the target machine
-	#6428: util-linux libmount segfaults with patch from buildroot
-	#6500: php fails to build for armel
-	#6554: gdb needs to dependents on host texinfo
-	#6692: GNU nano fails to compile for x86_64
-	#6704: wpa_supplicant: fix wrong path to executable file in D-Bus
-
-2013.11-rc3, Released November 26th, 2013
-
-	Fixes all over the tree.
-
-	Architecture: Mark MIPS I, II, III and IV as deprecated.
-
-	Updated/fixed packages: beecrypt, dbus, e2fsprogs, libcap-ng,
-	libglib2, libroxml, libsigsegv, libvncserver, lxc, mdadm,
-	mongoose, nut, ola, omniorb, openssl, pcre, php, poco,
-	protobuf-c, pv, qt5base, ruby, schifra, squid, sunxi-mail,
-	swig, ti-gfx, tinymembench, uclibc, udisks, vim
-
-2013.11-rc2, Released November 18th, 2013
-
-	Fixes all over the tree.
-
-	Defconfigs: qemu_arm_versatile, qemu_arm_nuri, sheevaplug:
-	Adjust kernel versions.
-
-	Toolchain: avr32: fix for modern kernel headers
-
-	Bootloader: Barebox updated to 2013.10.1
-
-	Updated/fixed packages: dhcp, e2fsprogs, gst1-plugins-bad,
-	libcurl, libvncserver, nano, pc, qt5base, squashfs, ttcp,
-	wayland, wvstreams
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#3601: DHCPD S80dhcp-server startup script issues
-	#6320: Fix kernel compile issue if BR2_LINUX_KERNEL_CUSTOM_GIT_VERS..
-	#6416: Xenomai package, patch alternative
-	#6590: directfb-examples build failed whit linaro toolchain
-
-2013.11-rc1, Released November 12th, 2013
-
-	Architectures: Nios-II support, MIPS arch handling fixes
-
-	Defconfigs: cubieboard2, freescale i.MX 6sololite evk,
-	sabre-sd, wandboard added, rpi renamed to raspberrypi_defconfig
-
-	Toolchain: glibc support, upstream uClibc fixes, uClibc 0.9.31
-	for avr32, crosstool-ng backend removed, external musl
-	toolchain support, gcc 4.8.2, updated Linaro external
-	toolchains. Fortran and objective-C support deprecated,
-	mudflap support
-
-	Bootloaders: U-Boot: u-boot.imx support, version bumps
-
-	Linux: use kmod instead of module-init-tools
-
-	System: default to devtmpfs for /dev
-
-	Infrastructure: Make 3.82 fixes, locales generation fixes, CVS
-	download support, post-rsync hooks
-
-	Fs: u-boot image support for cpio
-
-	Updated/fixed packages: aircrack-ng, alsamixergui, apr,
-	apr-util, atk, automake, bellagio, berkeleydb, bind, binutils,
-	bison, boost, busybox, can-utils, ccache, ccid, cgilua,
-	chrony, cifs-utils, cjson, collectd, connman, conntrack-tools,
-	copas, cppcms, cppzmq, czmq, dash, dbus, dhcpcd, diffutils,
-	directfb, dmidecode, dnsmaqs, docker, dosfstools, dropbear,
-	dropwatch, ebtables, eglibc, elf2flt, empty, enchant, erlang,
-	ethtool, fbgrab, fbv, fdk-aac, feh, ffmpeg, file, findutils,
-	fltk, fmtools, freetype, gdk-pixbuf, gettext, git,
-	glib-networking, gmp, gnupg, gnutls, gpu-viv-bin-mx6q, gsl,
-	gstreamer, gstreamer1, gst1-plugins-{bad,base,good,ugly},
-	gtest, gutenprint, hplip, i2c-tools, icu, ifplugd,
-	imagemagick, iozone, iproute2, ipset, iptables, iw, jamvm,
-	jansson, jpeg-turbo, kismet, kmod, lcms2, libassuan, libcap,
-	libcap-ng, libcdaudio, libcec, libcue, libcurl, libdrm,
-	libedit, libevas, libevent, libfreefare, libfuse,
-	libgpg-error, libiconv, liblog4c-localtime, libmicrohttpd,
-	libmnl, libmodbus,
-	libnetfilter_{acct,conntrack,cthelper,cttimeout,log,queue},
-	libnfnetlink, libnl, libpng, libqmi, libqrencode, libroxml,
-	libsecret, libsigsegv, libsoup, libtirpc, libunwind, libusb,
-	libvpx, lighttpd, linphone, linux-pam, lmbench,
-	lockfile-progs, log4cxx, logrotate, logsurfer, ltp-testsuite,
-	ltrace, luacrypto, luaposix, lvm2, m4, matchbox-lib,
-	media-ctl, mediastreamer, minicom, minidlna, mongoose, monit,
-	mpc, mpd, mpg123, mplayer, mrouted, mtdev, mutt, mysql_client,
-	nano, ncftp, ndisc6, neard, neardal, neon, net-snmp, netatalk,
-	netcat, netkitbase, netperf, netplug, nettle, nfacct,
-	nfs-utils, ngircd, ngrep, noip, nuttcp, olsr, openssh, opkg,
-	oprofile, opus-tools, orc, ortp, pciutils, pcre, pcsc-lite,
-	perf, perl, perl-cross, php, picocom, pkgconf, polarssl,
-	poppler, pppd, proftpd, protobuf, proxychains-ng, pulseaudio,
-	pv, qemu, qt, qt5base, qt5webkit, quagga, radvd, redis,
-	rpi-{firmware,userland}, rrdtool, rsync, rtorrent, ruby,
-	samba, scons, screen, sdl_sound, ser2net, setserial,
-	smartmontools, socat, socketcand, sqlcipher, sqlite, squid,
-	stress, strongswan, stunnel, sudo, syslinux, systemd,
-	sysvinit, tcl, ti-gfx, time, transmission, tremor, tslib,
-	tstools, tvheadend, tzdata, uboot-tools, uclibc, udpcast,
-	uemacs, ulogd, usb_modeswitch{,_data}, util-linux, vala,
-	valgrind, vde2, vorbus-tools, vpnc, vsftpd, vtun, wayland,
-	webkit, webp, webrtc-audio-processing, weston, wget,
-	wireshark, wsapi, xavante, xdriver_xf86-video-geode, xenomai,
-	xinetd, xlib_libpthread-stubs, xl2tp, xmlstarlet,
-	xserver_xorg-server, xz, zeromq, zic, zmqpp
-
-	New packages: aiccu, autossh, bc, civetweb, cppdb, cryptsetup,
-	duma, eigen, harfbuzz, igmpproxy, iputils, jq, knock, kobs-ng,
-	lesstif, libcgroup, libsepol, libsoc, libssh2, luasec, luasql,
-	lxc, nut, ola, omniorb, openpowerlink, orbit, p910nd, psplash,
-	python-crc16, python-ipy, python-pyzmq, qt5sensors,
-	qt5serialport, qt5x11extras, snmppp, subversion, tcping,
-	trace-cmd, xscreensaver, zsh
-
-	Removed packages: module-init-tools
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#1138: Buildroot fails to build packages if BR2_GCC_SHARED_LIBGCC=y
-	#5408: qt build failure with Sourcery CodeBench ARM 2010.09
-	#5630: makefile error with toolchain helpers.mk
-	#5672: htop: remove X11 stuff
-	#5678: linux.mk: linux-menuconfig fails
-	#5696: python3 installation is too large, patches from python2 needed
-	#5978: Erlang does not build for arm in 2013.02-rc3
-	#6392: Extended ARM uImage kernel options
-	#6404: Buildroot's coreutils 'uname -p' reports 'Unknown' on recent..
-	#6428: util-linux libmount segfaults with patch from buildroot
-	#6452: eglibc from Linaro 2013.07 not copied to target correctly
-	#6566: PHP segfault when crosscompiled to mips64 - patch included
-	#6572: [PowerPC] Buildroot uses wrong external toolchain libraries..
-	#6578: udisks package broken
-	#6602: ebtables 64 bit kernel + 32 bit userland alignment error..
-	#6608: ebtables missing ethertypes - fix included
-	#6620: Sysvinit package missing killall5 and symlinks - patch included
-	#6632: CMake use host pkg-config
-	#6638: pkgconf doesn't download
-	#6644: "all" target doesn't work in out-of-tree builds
-	#6650: Segmentation fault when trying to build latest buildroot
-	#6668: iptables limit module alignment problem on mips64
+	Updated/fixed packages: elf2flt, ti-gfx

 2013.08, Released August 31th, 2013:

--- a/Config.in
+++ b/Config.in
@@ -14,22 +14,12 @@ config BR2_HOSTARCH
 	string
 	option env="HOSTARCH"

-config BR2_EXTERNAL
-	string
-	option env="BR2_EXTERNAL"
-
 # Hidden boolean selected by pre-built packages for x86, when they
 # need to run on x86-64 machines (example: pre-built external
 # toolchains, binary tools like SAM-BA, etc.).
 config BR2_HOSTARCH_NEEDS_IA32_LIBS
 	bool

-# Hidden boolean selected by packages that need to build 32 bits
-# binaries with the host compiler, even on 64 bits build machines (e.g
-# bootloaders).
-config BR2_HOSTARCH_NEEDS_IA32_COMPILER
-	bool
-
 source "arch/Config.in"

 menu "Build options"
@@ -52,10 +42,6 @@ config BR2_GIT
 	string "Git command"
 	default "git"

-config BR2_CVS
-	string "CVS command"
-	default "cvs"
-
 config BR2_LOCALFILES
 	string "Local files retrieval command"
 	default "cp"
@@ -126,7 +112,7 @@ config BR2_DL_DIR
 	default "$(TOPDIR)/dl"
 	help
 	  Directory to store all the source files that we need to fetch.
-	  If the Linux shell environment has defined the BR2_DL_DIR
+	  If the Linux shell environment has defined the BUILDROOT_DL_DIR
 	  environment variable, then this overrides this configuration item.

 	  The default is $(TOPDIR)/dl
@@ -217,14 +203,6 @@ config BR2_DEBIAN_MIRROR

 endif

-config BR2_LUAROCKS_MIRROR
-	string "LuaRocks mirror"
-	default "http://luarocks.org/repositories/rocks"
-	help
-	  LuaRocks repository.
-
-	  See http://luarocks.org
-
 endmenu

 config BR2_JLEVEL
@@ -262,26 +240,6 @@ config BR2_DEPRECATED
 	help
 	  This option hides outdated/obsolete versions of packages.

-if BR2_DEPRECATED
-
-config BR2_DEPRECATED_SINCE_2013_05
-	bool
-	default y
-
-config BR2_DEPRECATED_SINCE_2013_08
-	bool
-	default y
-
-config BR2_DEPRECATED_SINCE_2013_11
-	bool
-	default y
-
-config BR2_DEPRECATED_SINCE_2014_02
-	bool
-	default y
-
-endif
-
 config BR2_ENABLE_DEBUG
 	bool "build packages with debugging symbols"
 	help
@@ -440,23 +398,6 @@ config BR2_OPTIMIZE_S

 endchoice

-config BR2_ENABLE_SSP
-	bool "build code with Stack Smashing Protection"
-	depends on BR2_TOOLCHAIN_HAS_SSP
-	help
-	  Enable stack smashing protection support using GCCs
-	  -fstack-protector-all option.
-
-	  See http://www.linuxfromscratch.org/hints/downloads/files/ssp.txt
-	  for details.
-
-	  Note that this requires the toolchain to have SSP
-	  support. This is always the case for glibc and eglibc
-	  toolchain, but is optional in uClibc toolchains.
-
-comment "enabling Stack Smashing Protection requires support in the toolchain"
-	depends on !BR2_TOOLCHAIN_HAS_SSP
-
 config BR2_PREFER_STATIC_LIB
 	bool "prefer static libraries"
 	help
@@ -468,6 +409,16 @@ config BR2_PREFER_STATIC_LIB

 	  WARNING: This is highly experimental at the moment.

+config BR2_HAVE_DOCUMENTATION
+	bool "documentation on the target"
+	# We no longer want to support a toolchain on the target
+	depends on BR2_DEPRECATED
+	help
+	  Install the documentation, including manual pages and info
+	  pages, on the target.
+	  If you say n here, your target will not contain any
+	  documentation.
+
 config BR2_PACKAGE_OVERRIDE_FILE
 	string "location of a package override file"
 	default "$(TOPDIR)/local.mk"
@@ -479,22 +430,18 @@ config BR2_PACKAGE_OVERRIDE_FILE
 	  Buildroot documentation for more details on this feature.

 config BR2_GLOBAL_PATCH_DIR
-	string "global patch directories"
+	string "global patch directory"
 	help
-	  You may specify a space separated list of one or more directories
-	  containing global package patches. For a specific version
-	  <packageversion> of a specific package <packagename>, patches are
-	  applied as follows:
+	  You may specify a directory containing global package patches.
+	  For a specific version <packageversion> of a specific package
+	  <packagename>, patches are applied as follows.

-	  First, the default Buildroot patch set for the package is applied
-	  from the package's directory in Buildroot.
+	  First, the default Buildroot patch set for the package is applied.

-	  Then for every directory - <global-patch-dir> - that exists in
-	  BR2_GLOBAL_PATCH_DIR, if the directory
-	  <global-patch-dir>/<packagename>/<packageversion>/ exists, then all
-	  *.patch files in this directory will be applied.
+	  If the directory $(BR2_GLOBAL_PATCH_DIR)/<packagename>/<packageversion>
+	  exists, then all *.patch files in the directory will be applied.

-	  Otherwise, if the directory <global-patch-dir>/<packagename> exists,
+	  Otherwise, if the directory $(BR2_GLOBAL_PATCH_DIR)/<packagename> exists,
 	  then all *.patch files in the directory will be applied.

 endmenu
@@ -514,10 +461,3 @@ source "boot/Config.in"
 source "package/Config.in.host"

 source "Config.in.legacy"
-
-menu "User-provided options"
-	depends on BR2_EXTERNAL != "support/dummy-external"
-
-source "$BR2_EXTERNAL/Config.in"
-
-endmenu
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -1,9 +1,13 @@
 #
 # Config.in.legacy - support for backward compatibility
 #
-# When an existing Config.in symbol is removed, it should be added again in
-# this file, and take appropriate action to approximate backward compatibility.
-# This will make the transition for the user more convenient.
+# When an existing Config.in symbol is removed, it should be added again in this
+# file, and take appropriate action to approximate backward compatibility. If
+# there is an equivalent (set of) new symbols, these can just be select'ed by
+# the old symbol. This makes sure that running 'make oldconfig' will make things
+# "just work" when upgrading to a new buildroot version. If the change is too
+# fundamental and cannot be fixed by a simple select, then the old symbol should
+# select BR2_LEGACY.  If that symbol is set, the build will issue an error.
 #
 # When adding legacy symbols to this file, add them to the front. The oldest
 # symbols will be removed again after about two years.
@@ -11,46 +15,6 @@
 # The symbol should be copied as-is from the place where it was previously
 # defined, but the help text should be removed or replaced with something that
 # explains how to fix it.
-#
-# For bool options, the old symbol should select BR2_LEGACY, so that the user
-# is informed at build-time about selected legacy options.
-# If there is an equivalent (set of) new symbols, these should be select'ed by
-# the old symbol for backwards compatibility.
-#
-# For string options, it is not possible to directly select another symbol. In
-# this case, a hidden wrap bool option has to be added, that defaults to y if
-# the old string is not set at its default value. The wrap symbol should select
-# BR2_LEGACY.
-# If the original symbol has been renamed, the new symbol should use the value
-# of the old symbol as default. This requires a change outside of
-# Config.in.legacy, and this should be clearly marked as such below, so that
-# removal of legacy options also include the removal of these external
-# references.
-#
-# [Example: renaming a string option from FOO to BAR]
-# original symbol:
-#     config BR2_FOO_STRING
-#             string "Some foo string"
-#
-# becomes:
-#     config BR2_BAR_STRING
-#             string "Some bar string"
-#             default BR2_FOO_STRING if BR2_FOO_STRING != ""  # legacy
-#
-# and in Config.in.legacy:
-#     config BR2_FOO_STRING
-#             string "The foo string has been renamed"
-#             help
-#               <suitable help text>
-#
-#     config BR2_FOO_STRING_WRAP
-#             bool
-#             default y if BR2_FOO_STRING != ""
-#             select BR2_LEGACY
-#
-#     # Note: BR2_FOO_STRING is still referenced from package/foo/Config.in
-#
-# [End of example]

 config BR2_LEGACY
 	bool
@@ -68,322 +32,18 @@ comment "Legacy detected: check the content of the menu below"
 menu "Legacy config options"

 if BR2_LEGACY
-comment "----------------------------------------------------"
 comment "Your old configuration uses legacy options that no  "
-comment "longer exist in buildroot, as indicated in the menu "
-comment "below. As long as these options stay selected, or in"
-comment "case of string options are non-empty, the build     "
+comment "longer exist in buildroot.                          "
+comment "Please look at the options which have been selected "
+comment "and read their help text.                           "
+comment "As long as these options stay selected, the build   "
 comment "will fail.                                          "
-comment "*                                                   "
-comment "Where possible, an automatic conversion from old to "
-comment "new symbols has been performed. Before making any   "
-comment "change in this legacy menu, make sure to exit the   "
-comment "configuration editor a first time and save the      "
-comment "configuration. Otherwise, the automatic conversion  "
-comment "of symbols will be lost.                            "
-comment "*                                                   "
-comment "After this initial save, reopen the configuration   "
-comment "editor, inspect the options selected below, read    "
-comment "their help texts, and verify/update the new         "
-comment "configuration in the corresponding configuration    "
-comment "menus. When everything is ok, you can disable the   "
-comment "legacy options in the menu below. Once you have     "
-comment "disabled all legacy options, this text will         "
-comment "disappear and you will be able to start the build.  "
-comment "*                                                   "
 comment "Note: at some point in the future, the oldest legacy"
 comment "options will be removed, and configuration files    "
 comment "that still have those options set, will fail to     "
 comment "build, or run, in unpredictable ways.               "
-comment "----------------------------------------------------"
 endif

-###############################################################################
-comment "Legacy options removed in 2014.02"
-
-config BR2_sh2
-	bool "sh2 support removed"
-	help
-	  Due to an inexistent user base and generally poor Linux
-	  support, the support for the SH2 architecture was removed.
-
-config BR2_sh3
-	bool "sh3 support removed"
-	help
-	  Due to an inexistent user base and generally poor Linux
-	  support, the support for the SH3 architecture was removed.
-
-config BR2_sh3eb
-	bool "sh3eb support removed"
-	help
-	  Due to an inexistent user base and generally poor Linux
-	  support, the support for the SH3eb architecture was removed.
-
-config BR2_KERNEL_HEADERS_3_1
-	bool "kernel headers version 3.1.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_2
-	select BR2_LEGACY
-	help
-	  Version 3.1.x of the Linux kernel headers have been deprecated
-	  for more than four buildroot releases and are now removed.
-	  As an alternative, version 3.2.x of the headers have been
-	  automatically selected in your configuration.
-
-config BR2_KERNEL_HEADERS_3_3
-	bool "kernel headers version 3.3.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_4
-	select BR2_LEGACY
-	help
-	  Version 3.3.x of the Linux kernel headers have been deprecated
-	  for more than four buildroot releases and are now removed.
-	  As an alternative, version 3.4.x of the headers have been
-	  automatically selected in your configuration.
-
-config BR2_KERNEL_HEADERS_3_5
-	bool "kernel headers version 3.5.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_6
-	select BR2_LEGACY
-	help
-	  Version 3.5.x of the Linux kernel headers have been deprecated
-	  for more than four buildroot releases and are now removed.
-	  As an alternative, version 3.6.x of the headers have been
-	  automatically selected in your configuration.
-
-config BR2_GDB_VERSION_7_2
-	bool "gdb 7.2.x is no longer supported"
-	select BR2_GDB_VERSION_7_5
-	select BR2_LEGACY
-	help
-	  Version 7.2.x of gdb has been deprecated for more than four
-	  buildroot releases and is now removed. As an alternative, gdb
-	  7.5.x has been automatically selected in your configuration.
-
-config BR2_GDB_VERSION_7_3
-	bool "gdb 7.3.x is no longer supported"
-	select BR2_GDB_VERSION_7_5
-	select BR2_LEGACY
-	help
-	  Version 7.3.x of gdb has been deprecated for more than four
-	  buildroot releases and is now removed. As an alternative, gdb
-	  7.5.x has been automatically selected in your configuration.
-
-config BR2_PACKAGE_CCACHE
-	bool "ccache target package has been removed"
-	select BR2_LEGACY
-	help
-	  The 'ccache' target package has been removed since it has been
-	  deprecated for more than four buildroot releases.
-	  Note: using ccache for speeding up builds is still supported.
-
-config BR2_HAVE_DOCUMENTATION
-	bool "support for documentation on target has been removed"
-	select BR2_LEGACY
-	help
-	  Support for documentation on target has been removed since it has
-	  been deprecated for more than four buildroot releases.
-
-config BR2_PACKAGE_AUTOMAKE
-	bool "automake target package has been removed"
-	select BR2_LEGACY
-	help
-	  The 'automake' target package has been removed since it has been
-	  deprecated for more than four buildroot releases.
-	  Note: the host automake still exists.
-
-config BR2_PACKAGE_AUTOCONF
-	bool "autoconf target package has been removed"
-	select BR2_LEGACY
-	help
-	  The 'autoconf' target package has been removed since it has been
-	  deprecated for more than four buildroot releases.
-	  Note: the host autoconf still exists.
-
-config BR2_PACKAGE_XSTROKE
-	bool "xstroke has been removed"
-	select BR2_LEGACY
-	help
-	  The 'xstroke' package has been removed since it has been
-	  deprecated for more than four buildroot releases.
-
-config BR2_PACKAGE_LZMA
-	bool "lzma target package has been removed"
-	select BR2_LEGACY
-	help
-	  The 'lzma' target package has been removed since it has been
-	  deprecated for more than four buildroot releases.
-	  Note: generating lzma-compressed rootfs images is still supported.
-
-config BR2_PACKAGE_TTCP
-	bool "ttcp has been removed"
-	select BR2_LEGACY
-	help
-	  The 'ttcp' package has been removed since it has been
-	  deprecated for more than four buildroot releases.
-
-config BR2_PACKAGE_LIBNFC_LLCP
-	bool "libnfc-llcp has been replaced by libllcp"
-	select BR2_LEGACY
-	select BR2_PACKAGE_LIBLLCP
-	help
-	  The 'libnfc-llcp' package has been removed since upstream renamed
-	  to 'libllcp'. We have added a new package for 'libllcp' and bumped
-	  the version at the same time.
-
-config BR2_PACKAGE_MYSQL_CLIENT
-	bool "MySQL client renamed to MySQL"
-	select BR2_LEGACY
-	select BR2_PACKAGE_MYSQL
-	help
-	  The option has been renamed BR2_PACKAGE_MYSQL
-
-config BR2_PACKAGE_SQUASHFS3
-	bool "squashfs3 has been removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_SQUASHFS
-	help
-	  The 'squashfs3' package has been removed since it has been
-	  deprecated for more than four buildroot releases. Package
-	  'squashfs' (4) has been selected automatically as replacement.
-
-config BR2_TARGET_ROOTFS_SQUASHFS3
-	bool "squashfs3 rootfs support has been removed"
-	select BR2_LEGACY
-	help
-	  Together with the removal of the squashfs3 package, support
-	  for squashfs3 root filesystems has been removed too. Squashfs
-	  root filesystems will automatically use squashfs4 now.
-
-config BR2_PACKAGE_NETKITBASE
-	bool "netkitbase has been removed"
-	select BR2_LEGACY
-	help
-	  The 'netkitbase' package has been removed since it has been
-	  deprecated since 2012.11. This package provided 'inetd'
-	  which is replaced by 'xinet' and 'ping' which is replaced by
-	  'busybox' or 'fping'.
-
-config BR2_PACKAGE_NETKITTELNET
-	bool "netkittelnet has been removed"
-	select BR2_LEGACY
-	help
-	  The 'netkittelnet' package has been removed since it has
-	  been deprecated since 2012.11. 'busybox' provides a telnet
-	  client and should be used instead.
-
-config BR2_PACKAGE_LUASQL
-	bool "luasql has been replaced by luasql-sqlite3"
-	select BR2_PACKAGE_LUASQL_SQLITE3
-	select BR2_LEGACY
-	help
-	  The option has been renamed BR2_PACKAGE_LUASQL_SQLITE3.
-
-config BR2_PACKAGE_LUACJSON
-	bool "luacjson has been replaced by lua-cjson"
-	select BR2_PACKAGE_LUA_CJSON
-	select BR2_LEGACY
-	help
-	  The option has been renamed BR2_PACKAGE_LUA_CJSON.
-
-###############################################################################
-comment "Legacy options removed in 2013.11"
-
-config BR2_PACKAGE_LVM2_DMSETUP_ONLY
-	bool "lvm2's 'dmsetup only' option removed"
-	select BR2_LEGACY
-	help
-	  The BR2_PACKAGE_LVM2_DMSETUP_ONLY was a negative option, which
-	  led to problems with other packages that need the full lvm2
-	  suite. Therefore, the option has been replaced with the positive
-	  BR2_PACKAGE_LVM2_STANDARD_INSTALL option.
-
-# Note: BR2_PACKAGE_LVM2_DMSETUP_ONLY is still referenced in package/lvm2/Config.in
-# in order to automatically propagate old configs
-
-config BR2_PACKAGE_QT_JAVASCRIPTCORE
-	bool "qt javascriptcore option removed"
-	select BR2_LEGACY
-	help
-	  The BR2_PACKAGE_QT_JAVASCRIPTCORE option was available to
-	  force the activation or disabling of the JIT compiler in the
-	  Qt Javascript interpreter. However, the JIT compiler is not
-	  available for all architectures, so forcing its activation
-	  does not always work. Moreover, Qt knows by itself for which
-	  architectures JIT support is possible, and will
-	  automatically enable it if possible.
-
-	  Therefore, this option was in fact useless, and causing
-	  build problems when enabled on architectures for which the
-	  JIT support was not available. It has been removed, and
-	  there is no replacement: Qt will enable JIT at compile time
-	  when possible.
-
-config BR2_PACKAGE_MODULE_INIT_TOOLS
-	bool "module-init-tools replaced by kmod"
-	select BR2_PACKAGE_KMOD
-	select BR2_PACKAGE_KMOD_TOOLS
-	select BR2_LEGACY
-	help
-	  The 'module-init-tools' package has been removed, since it
-	  has been depracated upstream and replaced by 'kmod'.
-
-config BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL
-	string "u-boot: the git repository URL option has been renamed"
-	help
-	  The option BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL has
-	  been renamed to BR2_TARGET_UBOOT_CUSTOM_REPO_URL.
-
-config BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL_WRAP
-	bool
-	default y if BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL != ""
-	select BR2_LEGACY
-
-# Note: BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL is still referenced from
-# boot/uboot/Config.in
-
-config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION
-	string "u-boot: the git repository version option has been renamed"
-	help
-	  The option BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION has
-	  been renamed to BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION.
-
-config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION_WRAP
-	bool
-	default y if BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION != ""
-	select BR2_LEGACY
-
-# Note: BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION is still referenced from
-# boot/uboot/Config.in
-
-config BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL
-	string "linux: the git repository URL option has been renamed"
-	help
-	  The option BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL has
-	  been renamed to
-	  BR2_LINUX_KERNEL_CUSTOM_REPO_URL.
-
-config BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL_WRAP
-	bool
-	default y if BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL != ""
-	select BR2_LEGACY
-
-# Note: BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL is still referenced from
-# linux/Config.in
-
-config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
-	string "linux: the git repository version option has been renamed"
-	help
-	  The option BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION has
-	  been renamed to
-	  BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION.
-
-config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION_WRAP
-	bool
-	default y if BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION != ""
-	select BR2_LEGACY
-
-# Note: BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION is still referenced from
-# linux/Config.in
-
 ###############################################################################
 comment "Legacy options removed in 2013.08"

--- a/257
+++ b/257
@@ -1,8 +1,7 @@
-# Makefile for buildroot
+# Makefile for buildroot2
 #
 # Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
-# Copyright (C) 2006-2014 by the Buildroot developers <buildroot@uclibc.org>
-# Copyright (C) 2014 by the Buildroot developers <buildroot@buildroot.org>
+# Copyright (C) 2006-2013 by the Buildroot developers <buildroot@uclibc.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,7 +24,7 @@
 #--------------------------------------------------------------

 # Set and export the version string
-export BR2_VERSION:=2014.02-rc2
+export BR2_VERSION:=2013.08.1

 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
@@ -57,7 +56,7 @@ DATE:=$(shell date +%Y%m%d)
 export BR2_VERSION_FULL:=$(BR2_VERSION)$(shell $(TOPDIR)/support/scripts/setlocalversion)

 noconfig_targets:=menuconfig nconfig gconfig xconfig config oldconfig randconfig \
-	defconfig %_defconfig allyesconfig allnoconfig silentoldconfig release \
+	%_defconfig allyesconfig allnoconfig silentoldconfig release \
 	randpackageconfig allyespackageconfig allnopackageconfig \
 	source-check print-version olddefconfig

@@ -92,72 +91,11 @@ EXTRAMAKEARGS = O=$(O)
 NEED_WRAPPER=y
 endif

-# bash prints the name of the directory on 'cd <dir>' if CDPATH is
-# set, so unset it here to not cause problems. Notice that the export
-# line doesn't affect the environment of $(shell ..) calls, so
-# explictly throw away any output from 'cd' here.
-export CDPATH:=
-BASE_DIR := $(shell mkdir -p $(O) && cd $(O) >/dev/null && pwd)
-$(if $(BASE_DIR),, $(error output directory "$(O)" does not exist))
-
-
-# Handling of BR2_EXTERNAL.
-#
-# The value of BR2_EXTERNAL is stored in .br-external in the output directory.
-# On subsequent invocations of make, it is read in. It can still be overridden
-# on the command line, therefore the file is re-created every time make is run.
-#
-# When BR2_EXTERNAL is not set, the .br-external file is removed and we point
-# to support/dummy-external. This makes sure we can unconditionally include the
-# Config.in and external.mk from the BR2_EXTERNAL directory. In this case,
-# override is necessary so the user can clear BR2_EXTERNAL from the command
-# line, but the dummy path is still used internally.
-
-BR2_EXTERNAL_FILE = $(BASE_DIR)/.br-external
-include $(BR2_EXTERNAL_FILE)
-ifeq ($(BR2_EXTERNAL),)
-  override BR2_EXTERNAL = support/dummy-external
-  $(shell rm -f $(BR2_EXTERNAL_FILE))
-else
-  $(shell echo BR2_EXTERNAL ?= $(BR2_EXTERNAL) > $(BR2_EXTERNAL_FILE))
-endif
-
-# To make sure the the environment variable overrides the .config option,
-# set this before including .config.
-ifneq ($(BR2_DL_DIR),)
-DL_DIR := $(BR2_DL_DIR)
-endif
-
-
-# Need that early, before we scan packages
-# Avoids doing the $(or...) everytime
-BR2_GRAPH_OUT := $(or $(GRAPH_OUT),pdf)
-
-BUILD_DIR:=$(BASE_DIR)/build
-STAMP_DIR:=$(BASE_DIR)/stamps
-BINARIES_DIR:=$(BASE_DIR)/images
-TARGET_DIR:=$(BASE_DIR)/target
-# initial definition so that 'make clean' works for most users, even without
-# .config. HOST_DIR will be overwritten later when .config is included.
-HOST_DIR:=$(BASE_DIR)/host
-
-LEGAL_INFO_DIR=$(BASE_DIR)/legal-info
-REDIST_SOURCES_DIR_TARGET=$(LEGAL_INFO_DIR)/sources
-REDIST_SOURCES_DIR_HOST=$(LEGAL_INFO_DIR)/host-sources
-LICENSE_FILES_DIR_TARGET=$(LEGAL_INFO_DIR)/licenses
-LICENSE_FILES_DIR_HOST=$(LEGAL_INFO_DIR)/host-licenses
-LEGAL_MANIFEST_CSV_TARGET=$(LEGAL_INFO_DIR)/manifest.csv
-LEGAL_MANIFEST_CSV_HOST=$(LEGAL_INFO_DIR)/host-manifest.csv
-LEGAL_LICENSES_TXT_TARGET=$(LEGAL_INFO_DIR)/licenses.txt
-LEGAL_LICENSES_TXT_HOST=$(LEGAL_INFO_DIR)/host-licenses.txt
-LEGAL_WARNINGS=$(LEGAL_INFO_DIR)/.warnings
-LEGAL_REPORT=$(LEGAL_INFO_DIR)/README
-
-BR2_CONFIG=$(CONFIG_DIR)/.config
+BUILDROOT_CONFIG=$(CONFIG_DIR)/.config

 # Pull in the user's configuration file
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
-include $(BR2_CONFIG)
+-include $(BUILDROOT_CONFIG)
 endif

 # To put more focus on warnings, be less verbose as default
@@ -223,12 +161,6 @@ endif
 ifndef HOSTNM
 HOSTNM:=nm
 endif
-ifndef HOSTOBJCOPY
-HOSTOBJCOPY:=objcopy
-endif
-ifndef HOSTRANLIB
-HOSTRANLIB:=ranlib
-endif
 HOSTAR:=$(shell which $(HOSTAR) || type -p $(HOSTAR) || echo ar)
 HOSTAS:=$(shell which $(HOSTAS) || type -p $(HOSTAS) || echo as)
 HOSTFC:=$(shell which $(HOSTLD) || type -p $(HOSTLD) || echo || which g77 || type -p g77 || echo gfortran)
@@ -236,8 +168,6 @@ HOSTCPP:=$(shell which $(HOSTCPP) || type -p $(HOSTCPP) || echo cpp)
 HOSTLD:=$(shell which $(HOSTLD) || type -p $(HOSTLD) || echo ld)
 HOSTLN:=$(shell which $(HOSTLN) || type -p $(HOSTLN) || echo ln)
 HOSTNM:=$(shell which $(HOSTNM) || type -p $(HOSTNM) || echo nm)
-HOSTOBJCOPY:=$(shell which $(HOSTOBJCOPY) || type -p $(HOSTOBJCOPY) || echo objcopy)
-HOSTRANLIB:=$(shell which $(HOSTRANLIB) || type -p $(HOSTRANLIB) || echo ranlib)

 export HOSTAR HOSTAS HOSTCC HOSTCXX HOSTFC HOSTLD
 export HOSTCC_NOCCACHE HOSTCXX_NOCCACHE
@@ -245,7 +175,6 @@ export HOSTCC_NOCCACHE HOSTCXX_NOCCACHE
 # Make sure pkg-config doesn't look outside the buildroot tree
 unexport PKG_CONFIG_PATH
 unexport PKG_CONFIG_SYSROOT_DIR
-unexport PKG_CONFIG_LIBDIR

 # Having DESTDIR set in the environment confuses the installation
 # steps of some packages.
@@ -254,6 +183,17 @@ unexport DESTDIR
 # Causes breakage with packages that needs host-ruby
 unexport RUBYOPT

+# bash prints the name of the directory on 'cd <dir>' if CDPATH is
+# set, so unset it here to not cause problems. Notice that the export
+# line doesn't affect the environment of $(shell ..) calls, so
+# explictly throw away any output from 'cd' here.
+export CDPATH:=
+BASE_DIR := $(shell mkdir -p $(O) && cd $(O) >/dev/null && pwd)
+$(if $(BASE_DIR),, $(error output directory "$(O)" does not exist))
+
+BUILD_DIR:=$(BASE_DIR)/build
+
+
 ifeq ($(BR2_HAVE_DOT_CONFIG),y)

 ################################################################################
@@ -269,7 +209,6 @@ unexport CPP
 unexport CFLAGS
 unexport CXXFLAGS
 unexport GREP_OPTIONS
-unexport TAR_OPTIONS
 unexport CONFIG_SITE
 unexport QMAKESPEC
 unexport TERMINFO
@@ -283,7 +222,17 @@ GNU_HOST_NAME:=$(shell support/gnuconfig/config.guess)
 #
 ################################################################################

-BASE_TARGETS = toolchain
+ifeq ($(BR2_CCACHE),y)
+BASE_TARGETS += host-ccache
+endif
+
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
+BASE_TARGETS += toolchain-buildroot
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
+BASE_TARGETS += toolchain-external
+else ifeq ($(BR2_TOOLCHAIN_CTNG),y)
+BASE_TARGETS += toolchain-crosstool-ng
+endif

 TARGETS:=

@@ -316,23 +265,36 @@ HOST_DIR:=$(call qstrip,$(BR2_HOST_DIR))
 # locales to generate
 GENERATE_LOCALE=$(call qstrip,$(BR2_GENERATE_LOCALE))

+# stamp (dependency) files go here
+STAMP_DIR:=$(BASE_DIR)/stamps
+
+BINARIES_DIR:=$(BASE_DIR)/images
+TARGET_DIR:=$(BASE_DIR)/target
 TARGET_SKELETON=$(TOPDIR)/system/skeleton

+LEGAL_INFO_DIR=$(BASE_DIR)/legal-info
+REDIST_SOURCES_DIR=$(LEGAL_INFO_DIR)/sources
+LICENSE_FILES_DIR=$(LEGAL_INFO_DIR)/licenses
+LEGAL_MANIFEST_CSV=$(LEGAL_INFO_DIR)/manifest.csv
+LEGAL_LICENSES_TXT=$(LEGAL_INFO_DIR)/licenses.txt
+LEGAL_WARNINGS=$(LEGAL_INFO_DIR)/.warnings
+LEGAL_REPORT=$(LEGAL_INFO_DIR)/README
+
 # Location of a file giving a big fat warning that output/target
 # should not be used as the root filesystem.
 TARGET_DIR_WARNING_FILE=$(TARGET_DIR)/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM

 ifeq ($(BR2_CCACHE),y)
 CCACHE:=$(HOST_DIR)/usr/bin/ccache
-BR_CACHE_DIR = $(call qstrip,$(BR2_CCACHE_DIR))
-export BR_CACHE_DIR
+BUILDROOT_CACHE_DIR = $(call qstrip,$(BR2_CCACHE_DIR))
+export BUILDROOT_CACHE_DIR
 HOSTCC  := $(CCACHE) $(HOSTCC)
 HOSTCXX := $(CCACHE) $(HOSTCXX)
 endif

 # Scripts in support/ or post-build scripts may need to reference
 # these locations, so export them so it is easier to use
-export BR2_CONFIG
+export BUILDROOT_CONFIG
 export TARGET_DIR
 export STAGING_DIR
 export HOST_DIR
@@ -360,8 +322,13 @@ include support/dependencies/dependencies.mk
 # We also need the various per-package makefiles, which also add
 # each selected package to TARGETS if that package was selected
 # in the .config file.
-include toolchain/helpers.mk
-include toolchain/*/*.mk
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
+include toolchain/toolchain-buildroot.mk
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
+include toolchain/toolchain-external.mk
+else ifeq ($(BR2_TOOLCHAIN_CTNG),y)
+include toolchain/toolchain-crosstool-ng.mk
+endif

 # Include the package override file if one has been provided in the
 # configuration.
@@ -370,14 +337,12 @@ ifneq ($(PACKAGE_OVERRIDE_FILE),)
 -include $(PACKAGE_OVERRIDE_FILE)
 endif

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

 include boot/common.mk
 include linux/linux.mk
 include system/system.mk

-include $(BR2_EXTERNAL)/external.mk
-
 TARGETS+=target-finalize

 ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
@@ -398,6 +363,7 @@ include fs/common.mk

 TARGETS+=target-post-image

+TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
 TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS) $(BASE_TARGETS))
 TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS))
 TARGETS_ALL:=$(patsubst %,__real_tgt_%,$(TARGETS))
@@ -429,17 +395,21 @@ $(TARGETS_ALL): __real_tgt_%: $(BASE_TARGETS) %
 dirs: $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
 	$(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR)

-$(BUILD_DIR)/buildroot-config/auto.conf: $(BR2_CONFIG)
-	$(MAKE1) $(EXTRAMAKEARGS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTCXX="$(HOSTCXX_NOCCACHE)" silentoldconfig
+$(BASE_TARGETS): dirs $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake
+
+$(BUILD_DIR)/buildroot-config/auto.conf: $(BUILDROOT_CONFIG)
+	$(MAKE) $(EXTRAMAKEARGS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTCXX="$(HOSTCXX_NOCCACHE)" silentoldconfig

 prepare: $(BUILD_DIR)/buildroot-config/auto.conf

-world: $(BASE_TARGETS) $(TARGETS_ALL)
+toolchain: prepare dirs dependencies $(BASE_TARGETS)
+
+world: toolchain $(TARGETS_ALL)

 .PHONY: all world toolchain dirs clean distclean source outputmakefile \
 	legal-info legal-info-prepare legal-info-clean printvars \
 	$(BASE_TARGETS) $(TARGETS) $(TARGETS_ALL) \
-	$(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) $(TARGETS_LEGAL_INFO) \
+	$(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) $(TARGETS_LEGAL_INFO) \
 	$(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
 	$(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR)

@@ -449,7 +419,7 @@ world: $(BASE_TARGETS) $(TARGETS_ALL)
 # dependencies anywhere else
 #
 ################################################################################
-$(BUILD_DIR) $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST):
+$(BUILD_DIR) $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR):
 	@mkdir -p $@

 # We make a symlink lib32->lib or lib64->lib as appropriate
@@ -474,16 +444,13 @@ ifeq ($(BR2_ROOTFS_SKELETON_CUSTOM),y)
 TARGET_SKELETON=$(BR2_ROOTFS_SKELETON_CUSTOM_PATH)
 endif

-RSYNC_VCS_EXCLUSIONS = \
-	--exclude .svn --exclude .git --exclude .hg --exclude .bzr \
-	--exclude CVS
-
 $(BUILD_DIR)/.root:
 	mkdir -p $(TARGET_DIR)
-	rsync -a --ignore-times $(RSYNC_VCS_EXCLUSIONS) \
-		--chmod=Du+w --exclude .empty --exclude '*~' \
+	rsync -a \
+		--exclude .empty --exclude .svn --exclude .git \
+		--exclude .hg --exclude=CVS --exclude '*~' \
 		$(TARGET_SKELETON)/ $(TARGET_DIR)/
-	$(INSTALL) -m 0644 support/misc/target-dir-warning.txt $(TARGET_DIR_WARNING_FILE)
+	cp support/misc/target-dir-warning.txt $(TARGET_DIR_WARNING_FILE)
 	@ln -snf lib $(TARGET_DIR)/$(LIB_SYMLINK)
 	@mkdir -p $(TARGET_DIR)/usr
 	@ln -snf lib $(TARGET_DIR)/usr/$(LIB_SYMLINK)
@@ -495,7 +462,7 @@ STRIP_FIND_CMD = find $(TARGET_DIR)
 ifneq (,$(call qstrip,$(BR2_STRIP_EXCLUDE_DIRS)))
 STRIP_FIND_CMD += \( $(call finddirclauses,$(TARGET_DIR),$(call qstrip,$(BR2_STRIP_EXCLUDE_DIRS))) \) -prune -o
 endif
-STRIP_FIND_CMD += -type f \( -perm /111 -o -name '*.so*' \)
+STRIP_FIND_CMD += -type f -perm /111
 STRIP_FIND_CMD += -not \( $(call findfileclauses,libpthread*.so* $(call qstrip,$(BR2_STRIP_EXCLUDE_FILES))) \) -print

 target-finalize:
@@ -508,18 +475,19 @@ target-finalize:
 ifneq ($(BR2_PACKAGE_GDB),y)
 	rm -rf $(TARGET_DIR)/usr/share/gdb
 endif
+ifneq ($(BR2_HAVE_DOCUMENTATION),y)
 	rm -rf $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/man
 	rm -rf $(TARGET_DIR)/usr/info $(TARGET_DIR)/usr/share/info
 	rm -rf $(TARGET_DIR)/usr/doc $(TARGET_DIR)/usr/share/doc
 	rm -rf $(TARGET_DIR)/usr/share/gtk-doc
 	-rmdir $(TARGET_DIR)/usr/share 2>/dev/null
+endif
 ifeq ($(BR2_PACKAGE_PYTHON_PY_ONLY),y)
 	find $(TARGET_DIR)/usr/lib/ -name '*.pyc' -print0 | xargs -0 rm -f
 endif
 ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY),y)
 	find $(TARGET_DIR)/usr/lib/ -name '*.py' -print0 | xargs -0 rm -f
 endif
-	rm -rf $(TARGET_DIR)/usr/lib/luarocks
 	$(STRIP_FIND_CMD) | xargs $(STRIPCMD) 2>/dev/null || true
 	if test -d $(TARGET_DIR)/lib/modules; then \
 		find $(TARGET_DIR)/lib/modules -type f -name '*.ko' | \
@@ -530,7 +498,7 @@ endif
 # I set a breakpoint"
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
 	find $(TARGET_DIR)/lib -type f -name 'libpthread*.so*' | \
-		xargs -r $(STRIPCMD) $(STRIP_STRIP_DEBUG)
+		xargs $(STRIPCMD) $(STRIP_STRIP_DEBUG) || true
 endif

 	mkdir -p $(TARGET_DIR)/etc
@@ -554,13 +522,14 @@ endif

 	@$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \
 		$(call MESSAGE,"Copying overlay $(d)"); \
-		rsync -a --ignore-times $(RSYNC_VCS_EXCLUSIONS) \
-			--chmod=Du+w --exclude .empty --exclude '*~' \
+		rsync -a \
+			--exclude .empty --exclude .svn --exclude .git \
+			--exclude .hg --exclude=CVS --exclude '*~' \
 			$(d)/ $(TARGET_DIR)$(sep))

 	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \
 		$(call MESSAGE,"Executing post-build script $(s)"); \
-		$(USER_HOOKS_EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))
+		$(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))

 ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
 LOCALE_WHITELIST=$(BUILD_DIR)/locales.nopurge
@@ -570,7 +539,7 @@ target-purgelocales:
 	rm -f $(LOCALE_WHITELIST)
 	for i in $(LOCALE_NOPURGE); do echo $$i >> $(LOCALE_WHITELIST); done

-	for dir in $(wildcard $(addprefix $(TARGET_DIR),/usr/share/locale /usr/share/X11/locale /usr/man /usr/share/man /usr/lib/locale)); \
+	for dir in $(wildcard $(addprefix $(TARGET_DIR),/usr/share/locale /usr/share/X11/locale /usr/man /usr/share/man)); \
 	do \
 		for lang in $$(cd $$dir; ls .|grep -v man); \
 		do \
@@ -588,7 +557,7 @@ ifneq ($(GENERATE_LOCALE),)
 target-generatelocales: host-localedef
 	$(Q)mkdir -p $(TARGET_DIR)/usr/lib/locale/
 	$(Q)for locale in $(GENERATE_LOCALE) ; do \
-		inputfile=`echo $${locale} | cut -f1 -d'.'` ; \
+		inputfile=`echo $${locale} | cut -f1 -d'.' -s` ; \
 		charmap=`echo $${locale} | cut -f2 -d'.' -s` ; \
 		if test -z "$${charmap}" ; then \
 			charmap="UTF-8" ; \
@@ -597,7 +566,7 @@ target-generatelocales: host-localedef
 		I18NPATH=$(STAGING_DIR)/usr/share/i18n:/usr/share/i18n \
 		$(HOST_DIR)/usr/bin/localedef \
 			--prefix=$(TARGET_DIR) \
-			--$(call LOWERCASE,$(BR2_ENDIAN))-endian \
+			--`echo $(BR2_ENDIAN) | tr [A-Z] [a-z]`-endian \
 			-i $${inputfile} -f $${charmap} \
 			$${locale} ; \
 	done
@@ -606,7 +575,7 @@ endif
 target-post-image:
 	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \
 		$(call MESSAGE,"Executing post-image script $(s)"); \
-		$(USER_HOOKS_EXTRA_ENV) $(s) $(BINARIES_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))
+		$(s) $(BINARIES_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))

 toolchain-eclipse-register:
 	./support/scripts/eclipse-register-toolchain `readlink -f $(O)` $(notdir $(TARGET_CROSS)) $(BR2_ARCH)
@@ -614,23 +583,22 @@ toolchain-eclipse-register:
 source: dirs $(TARGETS_SOURCE) $(HOST_SOURCE)

 external-deps:
-	@$(MAKE1) -Bs DL_MODE=SHOW_EXTERNAL_DEPS $(EXTRAMAKEARGS) source | sort -u
+	@$(MAKE) -Bs DL_MODE=SHOW_EXTERNAL_DEPS $(EXTRAMAKEARGS) source | sort -u

 legal-info-clean:
 	@rm -fr $(LEGAL_INFO_DIR)

 legal-info-prepare: $(LEGAL_INFO_DIR)
 	@$(call MESSAGE,"Collecting legal info")
-	@$(call legal-license-file,buildroot,COPYING,COPYING,HOST)
-	@$(call legal-manifest,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,TARGET)
-	@$(call legal-manifest,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,HOST)
-	@$(call legal-manifest,buildroot,$(BR2_VERSION_FULL),GPLv2+,COPYING,not saved,HOST)
+	@$(call legal-license-file,buildroot,COPYING,COPYING)
+	@$(call legal-manifest,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE)
+	@$(call legal-manifest,buildroot,$(BR2_VERSION_FULL),GPLv2+,COPYING,not saved)
 	@$(call legal-warning,the Buildroot source code has not been saved)
 	@$(call legal-warning,the toolchain has not been saved)
-	@cp $(BR2_CONFIG) $(LEGAL_INFO_DIR)/buildroot.config
+	@cp $(BUILDROOT_CONFIG) $(LEGAL_INFO_DIR)/buildroot.config

-legal-info: dirs legal-info-clean legal-info-prepare $(TARGETS_LEGAL_INFO) \
-		$(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST)
+legal-info: dirs legal-info-clean legal-info-prepare $(REDIST_SOURCES_DIR) \
+		$(TARGETS_LEGAL_INFO)
 	@cat support/legal-info/README.header >>$(LEGAL_REPORT)
 	@if [ -r $(LEGAL_WARNINGS) ]; then \
 		cat support/legal-info/README.warnings-header \
@@ -642,23 +610,6 @@ legal-info: dirs legal-info-clean legal-info-prepare $(TARGETS_LEGAL_INFO) \
 show-targets:
 	@echo $(TARGETS)

-graph-build: $(O)/build/build-time.log
-	@install -d $(O)/graphs
-	$(foreach o,name build duration,./support/scripts/graph-build-time \
-					--type=histogram --order=$(o) --input=$(<) \
-					--output=$(O)/graphs/build.hist-$(o).$(BR2_GRAPH_OUT) \
-					$(if $(GRAPH_ALT),--alternate-colors)$(sep))
-	$(foreach t,packages steps,./support/scripts/graph-build-time \
-				   --type=pie-$(t) --input=$(<) \
-				   --output=$(O)/graphs/build.pie-$(t).$(BR2_GRAPH_OUT) \
-				   $(if $(GRAPH_ALT),--alternate-colors)$(sep))
-
-graph-depends:
-	@$(INSTALL) -d $(O)/graphs
-	@cd "$(CONFIG_DIR)"; \
-	$(TOPDIR)/support/scripts/graph-depends \
-	|dot -T$(BR2_GRAPH_OUT) -o $(O)/graphs/$(@).$(BR2_GRAPH_OUT)
-
 else # ifeq ($(BR2_HAVE_DOT_CONFIG),y)

 all: menuconfig
@@ -684,8 +635,7 @@ COMMON_CONFIG_ENV = \
 	KCONFIG_AUTOCONFIG=$(BUILD_DIR)/buildroot-config/auto.conf \
 	KCONFIG_AUTOHEADER=$(BUILD_DIR)/buildroot-config/autoconf.h \
 	KCONFIG_TRISTATE=$(BUILD_DIR)/buildroot-config/tristate.config \
-	BR2_CONFIG=$(BR2_CONFIG) \
-	BR2_EXTERNAL=$(BR2_EXTERNAL)
+	BUILDROOT_CONFIG=$(BUILDROOT_CONFIG)

 xconfig: $(BUILD_DIR)/buildroot-config/qconf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
@@ -725,7 +675,7 @@ allnoconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile

 randpackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
-	@grep -v BR2_PACKAGE_ $(BR2_CONFIG) > $(CONFIG_DIR)/.config.nopkg
+	@grep -v BR2_PACKAGE_ $(BUILDROOT_CONFIG) > $(CONFIG_DIR)/.config.nopkg
 	@grep '^config BR2_PACKAGE_' Config.in.legacy | \
 		while read config pkg; do \
 		echo "# $$pkg is not set" >> $(CONFIG_DIR)/.config.nopkg; done
@@ -736,7 +686,7 @@ randpackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile

 allyespackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
-	@grep -v BR2_PACKAGE_ $(BR2_CONFIG) > $(CONFIG_DIR)/.config.nopkg
+	@grep -v BR2_PACKAGE_ $(BUILDROOT_CONFIG) > $(CONFIG_DIR)/.config.nopkg
 	@grep '^config BR2_PACKAGE_' Config.in.legacy | \
 		while read config pkg; do \
 		echo "# $$pkg is not set" >> $(CONFIG_DIR)/.config.nopkg; done
@@ -747,7 +697,7 @@ allyespackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile

 allnopackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
-	@grep -v BR2_PACKAGE_ $(BR2_CONFIG) > $(CONFIG_DIR)/.config.nopkg
+	@grep -v BR2_PACKAGE_ $(BUILDROOT_CONFIG) > $(CONFIG_DIR)/.config.nopkg
 	@$(COMMON_CONFIG_ENV) \
 		KCONFIG_ALLCONFIG=$(CONFIG_DIR)/.config.nopkg \
 		$< --allnoconfig $(CONFIG_CONFIG_IN)
@@ -769,10 +719,6 @@ defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
 	@$(COMMON_CONFIG_ENV) $< --defconfig=$(TOPDIR)/configs/$@ $(CONFIG_CONFIG_IN)

-%_defconfig: $(BUILD_DIR)/buildroot-config/conf $(BR2_EXTERNAL)/configs/%_defconfig outputmakefile
-	@mkdir -p $(BUILD_DIR)/buildroot-config
-	@$(COMMON_CONFIG_ENV) $< --defconfig=$(BR2_EXTERNAL)/configs/$@ $(CONFIG_CONFIG_IN)
-
 savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
 	@$(COMMON_CONFIG_ENV) $< \
@@ -781,7 +727,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile

 # check if download URLs are outdated
 source-check:
-	$(MAKE1) DL_MODE=SOURCE_CHECK $(EXTRAMAKEARGS) source
+	$(MAKE) DL_MODE=SOURCE_CHECK $(EXTRAMAKEARGS) source

 .PHONY: defconfig savedefconfig

@@ -808,7 +754,7 @@ printvars:
 		$(info $V=$($V) ($(value $V)))))

 clean:
-	rm -rf $(TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) \
+	rm -rf $(STAGING_DIR) $(TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) \
 		$(STAMP_DIR) $(BUILD_DIR) $(BASE_DIR)/staging \
 		$(LEGAL_INFO_DIR)

@@ -819,7 +765,7 @@ endif
 ifeq ($(O),output)
 	rm -rf $(O)
 endif
-	rm -rf $(BR2_CONFIG) $(CONFIG_DIR)/.config.old $(CONFIG_DIR)/.auto.deps
+	rm -rf $(BUILDROOT_CONFIG) $(CONFIG_DIR)/.config.old $(CONFIG_DIR)/.auto.deps

 help:
 	@echo 'Cleaning:'
@@ -831,7 +777,6 @@ help:
 	@echo '  toolchain              - build toolchain'
 	@echo '  <package>-rebuild      - force recompile <package>'
 	@echo '  <package>-reconfigure  - force reconfigure <package>'
-	@echo '  <package>-graph-depends    - generate graph of the dependency tree for package'
 	@echo
 	@echo 'Configuration:'
 	@echo '  menuconfig             - interactive curses-based configurator'
@@ -860,20 +805,21 @@ endif
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 	@echo '  uclibc-menuconfig      - Run uClibc menuconfig'
 endif
+ifeq ($(BR2_TOOLCHAIN_CTNG),y)
+	@echo '  ctng-menuconfig        - Run crosstool-NG menuconfig'
+endif
 ifeq ($(BR2_TARGET_BAREBOX),y)
 	@echo '  barebox-menuconfig     - Run barebox menuconfig'
 	@echo '  barebox-savedefconfig  - Run barebox savedefconfig'
 endif
 	@echo
 	@echo 'Documentation:'
-	@echo '  manual                 - build manual in all formats'
+	@echo '  manual                 - build manual in HTML, split HTML, PDF and txt'
 	@echo '  manual-html            - build manual in HTML'
 	@echo '  manual-split-html      - build manual in split HTML'
 	@echo '  manual-pdf             - build manual in PDF'
-	@echo '  manual-text            - build manual in text'
+	@echo '  manual-txt             - build manual in txt'
 	@echo '  manual-epub            - build manual in ePub'
-	@echo '  graph-build            - generate graphs of the build times'
-	@echo '  graph-depends          - generate graph of the dependency tree'
 	@echo
 	@echo 'Miscellaneous:'
 	@echo '  source                 - download all sources needed for offline-build'
@@ -884,15 +830,8 @@ endif
 	@echo '  make V=0|1             - 0 => quiet build (default), 1 => verbose build'
 	@echo '  make O=dir             - Locate all output files in "dir", including .config'
 	@echo
-	@echo 'Built-in configs:'
 	@$(foreach b, $(sort $(notdir $(wildcard $(TOPDIR)/configs/*_defconfig))), \
 	  printf "  %-35s - Build for %s\\n" $(b) $(b:_defconfig=);)
-ifneq ($(wildcard $(BR2_EXTERNAL)/configs/*_defconfig),)
-	@echo
-	@echo 'User-provided configs:'
-	@$(foreach b, $(sort $(notdir $(wildcard $(BR2_EXTERNAL)/configs/*_defconfig))), \
-	  printf "  %-35s - Build for %s\\n" $(b) $(b:_defconfig=);)
-endif
 	@echo
 	@echo 'See docs/README, or generate the Buildroot manual for further details'
 	@echo
@@ -903,7 +842,7 @@ release: OUT=buildroot-$(BR2_VERSION)
 # documentation to the git output
 release:
 	git archive --format=tar --prefix=$(OUT)/ HEAD > $(OUT).tar
-	$(MAKE) O=$(OUT) manual-html manual-text manual-pdf
+	$(MAKE) O=$(OUT) manual-html manual-txt manual-pdf
 	tar rf $(OUT).tar $(OUT)
 	gzip -9 -c < $(OUT).tar > $(OUT).tar.gz
 	bzip2 -9 -c < $(OUT).tar > $(OUT).tar.bz2
--- a/Makefile.legacy
+++ b/Makefile.legacy
@@ -12,38 +12,6 @@ ifeq ($(BR2_LEGACY),y)
 $(error "You have legacy configuration in your .config! Please check your configuration.")
 endif

-#
-# Legacy options from 2014.02
-#
-
-# The BUILDROOT_DL_DIR environment variable was renamed by BR2_DL_DIR. We
-# want to detect someone using the old variable, _except_ if also the new
-# variable was set. By the time we get here, however, we no longer have
-# access to the BR2_DL_DIR environment variable (because it has been overridden
-# by the .config inclusion). However, the environment variable (if defined) was
-# saved in DL_DIR, so we can use that.
-ifneq ($(BUILDROOT_DL_DIR),)
-ifneq ($(BUILDROOT_DL_DIR),$(DL_DIR))
-$(error "The BUILDROOT_DL_DIR environment variable was renamed to BR2_DL_DIR.")
-endif
-endif
-
-# If a script is using the deprecated BUILDROOT_CONFIG, make sure it fails.
-# Add some directories in front just in case someone used dirname on it.
-BUILDROOT_CONFIG_FAKE = /tmp/deprecated/The-BUILDROOT_CONFIG-environment-variable-was-renamed-to-BR2_CONFIG
-
-# Similar to above for BUILDROOT_CONFIG, but here we have no .config equivalent.
-ifneq ($(BUILDROOT_CONFIG),)
-ifneq ($(BUILDROOT_CONFIG),$(BR2_CONFIG))
-ifneq ($(BUILDROOT_CONFIG),$(BUILDROOT_CONFIG_FAKE))
-$(error "The BUILDROOT_CONFIG environment variable was renamed to BR2_CONFIG.")
-endif
-endif
-endif
-
-BUILDROOT_CONFIG = $(BUILDROOT_CONFIG_FAKE)
-export BUILDROOT_CONFIG
-
 #
 # Legacy options from 2012.08
 #
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -1,11 +1,6 @@
-menu "Target options"
-
 config BR2_ARCH_IS_64
 	bool

-config BR2_KERNEL_64_USERLAND_32
-	bool
-
 config BR2_SOFT_FLOAT
 	bool

@@ -129,13 +124,6 @@ config BR2_mips64el
 	  http://www.mips.com/
 	  http://en.wikipedia.org/wiki/MIPS_Technologies

-config BR2_nios2
-	bool "Nios II"
-	help
-	  Nios II is a soft core processor from Altera Corporation.
-	  http://www.altera.com/
-	  http://en.wikipedia.org/wiki/Nios_II
-
 config BR2_powerpc
 	bool "PowerPC"
 	help
@@ -317,10 +305,6 @@ if BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el
 source "arch/Config.in.mips"
 endif

-if BR2_nios2
-source "arch/Config.in.nios2"
-endif
-
 if BR2_powerpc
 source "arch/Config.in.powerpc"
 endif
@@ -340,5 +324,3 @@ endif
 if BR2_xtensa
 source "arch/Config.in.xtensa"
 endif
-
-endmenu # Target options
--- a/arch/Config.in.arc
+++ b/arch/Config.in.arc
@@ -12,3 +12,7 @@ config BR2_ENDIAN

 config BR2_GCC_TARGET_CPU
 	default "arc700"
+
+config BR2_ARC_SITE
+	string
+	default "http://www.synopsys.com/apps/arc-developer/"
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -341,7 +341,7 @@ config BR2_ENDIAN
 	default "LITTLE" if BR2_arm
 	default "BIG"	 if BR2_armeb

-config BR2_GCC_TARGET_CPU
+config BR2_GCC_TARGET_TUNE
 	default "arm7tdmi"	if BR2_arm7tdmi
 	default "arm7tdmi"	if BR2_arm720t
 	default "arm7tdmi"	if BR2_arm740t
--- a/arch/Config.in.avr32
+++ b/arch/Config.in.avr32
@@ -3,6 +3,3 @@ config BR2_ARCH

 config BR2_ENDIAN
 	default "BIG"
-
-config BR2_GCC_TARGET_ARCH
-	default "ap"
--- a/arch/Config.in.mips
+++ b/arch/Config.in.mips
@@ -1,7 +1,8 @@
 choice
 	prompt "Target Architecture Variant"
 	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
-	default BR2_mips_32 if BR2_mips || BR2_mipsel
+	default BR2_mips_3 if BR2_mips
+	default BR2_mips_1 if BR2_mipsel
 	default BR2_mips_64 if BR2_mips64 || BR2_mips64el
 	help
 	  Specific CPU variant to use
@@ -11,16 +12,14 @@ choice

 config BR2_mips_1
 	bool "mips I (generic)"
-	depends on !BR2_ARCH_IS_64 && BR2_DEPRECATED_SINCE_2013_11
+	depends on !BR2_ARCH_IS_64
 config BR2_mips_2
 	bool "mips II"
-	depends on !BR2_ARCH_IS_64 && BR2_DEPRECATED_SINCE_2013_11
+	depends on !BR2_ARCH_IS_64
 config BR2_mips_3
 	bool "mips III"
-	depends on BR2_DEPRECATED_SINCE_2013_11
 config BR2_mips_4
 	bool "mips IV"
-	depends on BR2_DEPRECATED_SINCE_2013_11
 config BR2_mips_32
 	bool "mips 32"
 	depends on !BR2_ARCH_IS_64
@@ -29,10 +28,8 @@ config BR2_mips_32r2
 	depends on !BR2_ARCH_IS_64
 config BR2_mips_64
 	bool "mips 64"
-	depends on BR2_ARCH_IS_64
 config BR2_mips_64r2
 	bool "mips 64r2"
-	depends on BR2_ARCH_IS_64
 endchoice


@@ -50,7 +47,6 @@ config BR2_MIPS_OABI32
 config BR2_MIPS_NABI32
 	bool "n32"
 	depends on BR2_ARCH_IS_64
-	select BR2_KERNEL_64_USERLAND_32
 config BR2_MIPS_NABI64
 	bool "n64"
 	depends on BR2_ARCH_IS_64
@@ -76,7 +72,7 @@ config BR2_ENDIAN
 	default "LITTLE"	if BR2_mipsel || BR2_mips64el
 	default "BIG" 	    	if BR2_mips || BR2_mips64

-config BR2_GCC_TARGET_ARCH
+config BR2_GCC_TARGET_TUNE
 	default "mips1"		if BR2_mips_1
 	default "mips2"		if BR2_mips_2
 	default "mips3"		if BR2_mips_3
--- a/arch/Config.in.nios2
+++ b/arch/Config.in.nios2
@@ -1,5 +0,0 @@
-config BR2_ARCH
-	default "nios2"
-
-config BR2_ENDIAN
-	default "LITTLE"
--- a/arch/Config.in.sh
+++ b/arch/Config.in.sh
@@ -5,8 +5,14 @@ choice
 	help
 	  Specific CPU variant to use

+config BR2_sh2
+	bool "sh2 (SH2 big endian)"
 config BR2_sh2a
 	bool "sh2a (SH2A big endian)"
+config BR2_sh3
+	bool "sh3 (SH3 little endian)"
+config BR2_sh3eb
+	bool "sh3eb (SH3 big endian)"
 config BR2_sh4
 	bool "sh4 (SH4 little endian)"
 config BR2_sh4eb
@@ -18,7 +24,10 @@ config BR2_sh4aeb
 endchoice

 config BR2_ARCH
+	default "sh2"		if BR2_sh2
 	default "sh2a"		if BR2_sh2a
+	default "sh3"		if BR2_sh3
+	default "sh3eb"		if BR2_sh3eb
 	default "sh4"		if BR2_sh4
 	default "sh4eb"		if BR2_sh4eb
 	default "sh4a"		if BR2_sh4a
@@ -26,5 +35,7 @@ config BR2_ARCH
 	default "sh64"		if BR2_sh64

 config BR2_ENDIAN
-	default "LITTLE"	if BR2_sh4 || BR2_sh4a || BR2_sh64
-	default "BIG"		if BR2_sh2a || BR2_sh4eb || BR2_sh4aeb
+	default "LITTLE"	if BR2_sh3 || BR2_sh4 || BR2_sh4a || \
+				   BR2_x86_64 || BR2_sh64
+	default "BIG"		if BR2_sh2 || BR2_sh2a || BR2_sh3eb || \
+				   BR2_sh4eb || BR2_sh4aeb
--- a/arch/Config.in.sparc
+++ b/arch/Config.in.sparc
@@ -25,6 +25,12 @@ config BR2_ENDIAN

 config BR2_GCC_TARGET_TUNE
 	default "v8"		if BR2_sparc_v8
+	default "v9"		if BR2_sparc_v9
+	default "v9"		if BR2_sparc_v9a
+	default "v9"		if BR2_sparc_v9b
+	default "ultrasparc"	if BR2_sparc_ultrasparc
+	default "ultrasparc3"	if BR2_sparc_ultrasparc3
+	default "niagara"	if BR2_sparc_niagara

 config BR2_GCC_TARGET_CPU
 	default "sparchfleon"	if BR2_sparc_sparchfleon
--- a/arch/Config.in.x86
+++ b/arch/Config.in.x86
@@ -9,10 +9,6 @@ config BR2_X86_CPU_HAS_SSE3
 	bool
 config BR2_X86_CPU_HAS_SSSE3
 	bool
-config BR2_X86_CPU_HAS_SSE4
-	bool
-config BR2_X86_CPU_HAS_SSE42
-	bool

 choice
 	prompt "Target Architecture Variant"
@@ -124,15 +120,6 @@ config BR2_x86_barcelona
 	select BR2_X86_CPU_HAS_SSE
 	select BR2_X86_CPU_HAS_SSE2
 	select BR2_X86_CPU_HAS_SSE3
-config BR2_x86_jaguar
-	bool "jaguar"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-	select BR2_X86_CPU_HAS_SSE4
-	select BR2_X86_CPU_HAS_SSE42
 config BR2_x86_geode
 	bool "geode"
 	# Don't include MMX support because there several variant of geode
@@ -181,7 +168,6 @@ config BR2_ARCH
 	default "i686"		if BR2_x86_opteron && BR2_i386
 	default "i686"		if BR2_x86_opteron_sse3 && BR2_i386
 	default "i686"		if BR2_x86_barcelona && BR2_i386
-	default "i686"		if BR2_x86_jaguar && BR2_i386
 	default "i686"		if BR2_x86_k6
 	default "i686"		if BR2_x86_k6_2
 	default "i686"		if BR2_x86_athlon
@@ -210,7 +196,6 @@ config BR2_GCC_TARGET_TUNE
 	default "k8"		if BR2_x86_opteron
 	default "k8-sse3"	if BR2_x86_opteron_sse3
 	default "barcelona"	if BR2_x86_barcelona
-	default "btver2"	if BR2_x86_jaguar
 	default "k6"		if BR2_x86_k6
 	default "k6-2"		if BR2_x86_k6_2
 	default "athlon"	if BR2_x86_athlon
@@ -240,7 +225,6 @@ config BR2_GCC_TARGET_ARCH
 	default "k8"		if BR2_x86_opteron
 	default "k8-sse3"	if BR2_x86_opteron_sse3
 	default "barcelona"	if BR2_x86_barcelona
-	default "btver2"	if BR2_x86_jaguar
 	default "k6"		if BR2_x86_k6
 	default "k6-2"		if BR2_x86_k6_2
 	default "athlon"	if BR2_x86_athlon
--- a/board/armadeus/apf27/linux-3.13.config
+++ b/board/armadeus/apf27/linux-3.13.config
@@ -1,3 +1,4 @@
+CONFIG_EXPERIMENTAL=y
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
@@ -199,8 +200,6 @@ CONFIG_IMX_SDMA=y
 CONFIG_IMX_DMA=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_IIO=m
-CONFIG_PWM=y
-CONFIG_PWM_IMX=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_POSIX_ACL=y
--- a/board/armadeus/apf28/linux-3.12.config
+++ b/board/armadeus/apf28/linux-3.12.config
@@ -1,7 +1,10 @@
+CONFIG_EXPERIMENTAL=y
 # CONFIG_LOCALVERSION_AUTO is not set
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_EMBEDDED=y
 # CONFIG_COMPAT_BRK is not set
@@ -14,8 +17,8 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_BSD_DISKLABEL=y
 # CONFIG_IOSCHED_CFQ is not set
-# CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_MXS=y
+CONFIG_MACH_MXS_DT=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
@@ -36,6 +39,8 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_DIAG is not set
 CONFIG_IPV6=y
 CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_FLEXCAN=m
 CONFIG_BT=m
@@ -55,11 +60,8 @@ CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_FW_LOADER=m
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
-CONFIG_MTD_DATAFLASH=y
-CONFIG_MTD_M25P80=y
-# CONFIG_M25PXX_USE_FAST_READ is not set
-CONFIG_MTD_SST25L=y
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_GPMI_NAND=y
 CONFIG_MTD_UBI=y
@@ -81,18 +83,14 @@ CONFIG_RT73USB=m
 CONFIG_ZD1211RW=m
 CONFIG_INPUT_JOYDEV=y
 CONFIG_INPUT_EVDEV=y
+CONFIG_KEYBOARD_GPIO=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_UINPUT=m
-# CONFIG_SERIO_SERPORT is not set
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_LEGACY_PTYS is not set
-# CONFIG_DEVKMEM is not set
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_MXS_AUART=y
-CONFIG_TTY_PRINTK=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
@@ -104,15 +102,11 @@ CONFIG_SPI_SPIDEV=m
 CONFIG_GPIO_SYSFS=y
 CONFIG_HWMON=m
 CONFIG_WATCHDOG=y
-CONFIG_STMP3XXX_RTC_WATCHDOG=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_MEDIA_SUPPORT=m
 CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_FB=y
 CONFIG_FB_MXS=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_BACKLIGHT_PWM=y
@@ -127,17 +121,17 @@ CONFIG_USB_DEBUG=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_MON=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_CHIPIDEA=y
+CONFIG_USB_CHIPIDEA_HOST=y
 CONFIG_USB_ACM=y
 CONFIG_USB_PRINTER=y
 CONFIG_USB_WDM=y
 CONFIG_USB_STORAGE=y
-CONFIG_USB_CHIPIDEA=y
-CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_MXS_PHY=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DEBUG_FILES=y
 CONFIG_USB_ETH=m
+CONFIG_USB_ULPI=y
+CONFIG_USB_MXS_PHY=y
 CONFIG_MMC=y
 CONFIG_MMC_MXS=y
 CONFIG_NEW_LEDS=y
@@ -148,6 +142,7 @@ CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_ONESHOT=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_GPIO=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_STMP=y
--- a/board/armadeus/apf51/linux-3.12.config
+++ b/board/armadeus/apf51/linux-3.12.config
@@ -1,266 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-# CONFIG_LOCALVERSION_AUTO is not set
-# CONFIG_SWAP is not set
-CONFIG_SYSVIPC=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_EMBEDDED=y
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_BSD_DISKLABEL=y
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_MXC=y
-CONFIG_MXC_IRQ_PRIOR=y
-CONFIG_MACH_IMX51_DT=y
-CONFIG_ARM_THUMBEE=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_IMX=y
-CONFIG_CPU_IDLE=y
-CONFIG_VFP=y
-CONFIG_NEON=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-# CONFIG_SUSPEND is not set
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-CONFIG_IPV6=y
-CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
-CONFIG_CAN_VCAN=m
-CONFIG_CAN_MCP251X=m
-CONFIG_BT=m
-CONFIG_BT_L2CAP=y
-CONFIG_BT_SCO=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_HIDP=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_CFG80211=m
-CONFIG_MAC80211=m
-CONFIG_MAC80211_RC_PID=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_FW_LOADER=m
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_MXC=y
-CONFIG_MTD_UBI=y
-CONFIG_MISC_DEVICES=y
-CONFIG_EEPROM_AT24=y
-CONFIG_EEPROM_AT25=y
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=y
-CONFIG_BLK_DEV_SR=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_CHR_DEV_SCH=y
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SCAN_ASYNC=y
-CONFIG_NETDEVICES=y
-CONFIG_MII=y
-CONFIG_SMSC_PHY=y
-CONFIG_NET_ETHERNET=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
-CONFIG_RTL8187=m
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_SDIO=m
-CONFIG_RT2X00=m
-CONFIG_RT73USB=m
-CONFIG_ZD1211RW=m
-CONFIG_INPUT_JOYDEV=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_KEYBOARD_GPIO=m
-CONFIG_KEYBOARD_IMX=m
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_WM831X=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_WM831X_ON=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_8250=m
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_IMX=y
-CONFIG_SPI=y
-CONFIG_SPI_IMX=y
-CONFIG_SPI_SPIDEV=m
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_WM831X=m
-CONFIG_POWER_SUPPLY=m
-CONFIG_WM831X_BACKUP=m
-CONFIG_WM831X_POWER=m
-CONFIG_HWMON=m
-CONFIG_SENSORS_AS1531=m
-CONFIG_SENSORS_WM831X=m
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_NOWAYOUT=y
-CONFIG_WM831X_WATCHDOG=m
-CONFIG_IMX2_WDT=y
-CONFIG_MFD_WM831X_I2C=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_MFD_IMX_IPU_V3=y
-CONFIG_MEDIA_SUPPORT=m
-CONFIG_VIDEO_DEV=m
-# CONFIG_RC_CORE is not set
-# CONFIG_MEDIA_TUNER_SIMPLE is not set
-# CONFIG_MEDIA_TUNER_TDA8290 is not set
-# CONFIG_MEDIA_TUNER_TDA827X is not set
-# CONFIG_MEDIA_TUNER_TDA18271 is not set
-# CONFIG_MEDIA_TUNER_TDA9887 is not set
-# CONFIG_MEDIA_TUNER_TEA5761 is not set
-# CONFIG_MEDIA_TUNER_TEA5767 is not set
-# CONFIG_MEDIA_TUNER_MT20XX is not set
-# CONFIG_MEDIA_TUNER_MT2060 is not set
-# CONFIG_MEDIA_TUNER_MT2266 is not set
-# CONFIG_MEDIA_TUNER_MT2131 is not set
-# CONFIG_MEDIA_TUNER_QT1010 is not set
-# CONFIG_MEDIA_TUNER_XC2028 is not set
-# CONFIG_MEDIA_TUNER_XC5000 is not set
-# CONFIG_MEDIA_TUNER_MXL5005S is not set
-# CONFIG_MEDIA_TUNER_MXL5007T is not set
-# CONFIG_MEDIA_TUNER_MC44S803 is not set
-# CONFIG_MEDIA_TUNER_MAX2165 is not set
-# CONFIG_MEDIA_TUNER_TDA18218 is not set
-CONFIG_VIDEO_VIVI=m
-CONFIG_USB_VIDEO_CLASS=m
-# CONFIG_RADIO_ADAPTERS is not set
-CONFIG_FB=y
-CONFIG_FB_MX5=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_SOUND=m
-# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-CONFIG_SND=m
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-# CONFIG_SND_DRIVERS is not set
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_SPI is not set
-# CONFIG_SND_USB is not set
-CONFIG_SND_SOC=m
-CONFIG_SND_IMX_SOC=m
-CONFIG_SND_SOC_APF51_DEV_WM8960=m
-CONFIG_USB=y
-CONFIG_USB_DEBUG=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_SUSPEND=y
-CONFIG_USB_OTG=y
-# CONFIG_USB_OTG_WHITELIST is not set
-CONFIG_USB_MON=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_MXC=y
-CONFIG_USB_ACM=y
-CONFIG_USB_PRINTER=y
-CONFIG_USB_WDM=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_CHIPIDEA=y
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_PHY=y
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_USB_GPIO_VBUS=y
-CONFIG_USB_ULPI=y
-CONFIG_USB_GADGET=m
-CONFIG_USB_GADGET_DEBUG_FILES=y
-CONFIG_USB_GADGET_DEBUG_FS=y
-CONFIG_USB_ETH=m
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_CDC_COMPOSITE=m
-CONFIG_USB_G_MULTI=m
-CONFIG_USB_G_MULTI_CDC=y
-CONFIG_USB_G_HID=m
-CONFIG_MMC=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_MMC_SDHCI_ESDHC_IMX=y
-CONFIG_MMC_SPI=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_WM831X_STATUS=m
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_MXC=y
-CONFIG_RTC_DRV_WM831X=y
-CONFIG_STAGING=y
-CONFIG_IIO=m
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT2_FS_XIP=y
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_AUTOFS4_FS=y
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_CMODE_NONE=y
-CONFIG_UBIFS_FS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_NFS_V4=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_DEBUG_FS=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
--- a/board/avnet/zedboard/readme.txt
+++ b/board/avnet/zedboard/readme.txt
@@ -1,28 +0,0 @@
-This is the buildroot board support for the Avnet Zedboard. The Zedboard is
-a development board based on the Xilinx Zynq-7000 based All-Programmable
-System-On-Chip.
-
-Zedboard information including schematics, reference designs, and manuals are
-available from http://www.zedboard.org .
-
-To boot the Zedboard using a buildroot generated image copy the following files
-to the sdcard:
-	zynq-zed.dtb -> devicetree.dtb
-	rootfs.cpio.gz.uboot -> uramdisk.image.gz
-	uImage -> uImage
-
-Uboot Support
-------------
-
-Uboot is installed in a wrapper file called BOOT.BIN located on the root of
-the SD card.  To create the BOOT.BIN file do the following.
-
-source <path/to/xilinx/settings.sh>
-cat <<EOF > boot.bif
-{
-   [bootloader]<path/to/fsbl.elf>
-   <path/to/system.bit>
-   <path/to/uboot.elf>
-}
-EOF
-bootgen -image boot.bif -o i BOOT.BIN
--- a/board/beaglebone/linux-3.12.config
+++ b/board/beaglebone/linux-3.12.config
@@ -1,3 +1,5 @@
+CONFIG_EXPERIMENTAL=y
+CONFIG_DEFAULT_HOSTNAME="beaglebone"
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_NO_HZ=y
@@ -7,67 +9,39 @@ CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=16
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_EXPERT=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_EMBEDDED=y
 CONFIG_SLAB=y
 CONFIG_PROFILING=y
+CONFIG_OPROFILE=m
 CONFIG_KPROBES=y
 CONFIG_MODULES=y
 CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SRCVERSION_ALL=y
 # CONFIG_BLK_DEV_BSG is not set
-CONFIG_ARCH_OMAP2PLUS=y
+CONFIG_ARCH_OMAP=y
 CONFIG_OMAP_RESET_CLOCKS=y
 CONFIG_OMAP_MUX_DEBUG=y
-CONFIG_ARCH_OMAP3=y
-CONFIG_ARCH_OMAP4=y
-CONFIG_SOC_AM43XX=y
-# CONFIG_ARCH_OMAP2PLUS_TYPICAL is not set
-# CONFIG_SOC_TI81XX is not set
-# CONFIG_MACH_OMAP3_BEAGLE is not set
-# CONFIG_MACH_DEVKIT8000 is not set
-# CONFIG_MACH_OMAP_LDP is not set
-# CONFIG_MACH_OMAP3530_LV_SOM is not set
-# CONFIG_MACH_OMAP3_TORPEDO is not set
-# CONFIG_MACH_OVERO is not set
-# CONFIG_MACH_OMAP3EVM is not set
-# CONFIG_MACH_OMAP3_PANDORA is not set
-# CONFIG_MACH_TOUCHBOOK is not set
-# CONFIG_MACH_OMAP_3430SDP is not set
-# CONFIG_MACH_NOKIA_RM680 is not set
-# CONFIG_MACH_NOKIA_RX51 is not set
-# CONFIG_MACH_OMAP_ZOOM2 is not set
-# CONFIG_MACH_OMAP_ZOOM3 is not set
-# CONFIG_MACH_CM_T35 is not set
-# CONFIG_MACH_CM_T3517 is not set
-# CONFIG_MACH_IGEP0020 is not set
-# CONFIG_MACH_IGEP0030 is not set
-# CONFIG_MACH_SBC3530 is not set
-# CONFIG_MACH_OMAP_3630SDP is not set
+# CONFIG_ARCH_OMAP2 is not set
+# CONFIG_ARCH_OMAP3 is not set
+# CONFIG_ARCH_OMAP4 is not set
 CONFIG_ARM_THUMBEE=y
-CONFIG_HAVE_ARM_ARCH_TIMER=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-CONFIG_HIGHMEM=y
+CONFIG_ARM_ERRATA_720789=y
+CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"
 CONFIG_KEXEC=y
+CONFIG_AUTO_ZRELADDR=y
 CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_GENERIC_CPUFREQ_CPU0=y
-# CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set
-CONFIG_FPE_NWFPE=y
-CONFIG_VFP=y
 CONFIG_NEON=y
 CONFIG_BINFMT_MISC=y
-CONFIG_PM_RUNTIME=y
 CONFIG_PM_DEBUG=y
 CONFIG_NET=y
 CONFIG_PACKET=y
@@ -87,41 +61,41 @@ CONFIG_IP_PNP_RARP=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_OMAP_OCP2SCP=y
+CONFIG_OMAP_INTERCONNECT=y
 CONFIG_CONNECTOR=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_CROSSBAR=y
 CONFIG_EEPROM_93CX6=y
-CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_SCAN_ASYNC=y
-CONFIG_MD=y
+CONFIG_ATA=y
+# CONFIG_SATA_PMP is not set
+CONFIG_SATA_AHCI_PLATFORM=m
+# CONFIG_ATA_SFF is not set
 CONFIG_NETDEVICES=y
-# CONFIG_NET_VENDOR_ARC is not set
-# CONFIG_NET_CADENCE is not set
+CONFIG_MII=y
 # CONFIG_NET_VENDOR_BROADCOM is not set
 # CONFIG_NET_VENDOR_CIRRUS is not set
 # CONFIG_NET_VENDOR_FARADAY is not set
 # CONFIG_NET_VENDOR_INTEL is not set
 # CONFIG_NET_VENDOR_MARVELL is not set
 # CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_NATSEMI is not set
 # CONFIG_NET_VENDOR_SEEQ is not set
 # CONFIG_NET_VENDOR_SMSC is not set
 # CONFIG_NET_VENDOR_STMICRO is not set
 CONFIG_TI_CPSW=y
-CONFIG_TI_CPTS=y
-# CONFIG_NET_VENDOR_VIA is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
-CONFIG_AT803X_PHY=y
 CONFIG_SMSC_PHY=y
 # CONFIG_WLAN is not set
+CONFIG_INPUT_POLLDEV=m
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
-CONFIG_SERIO_LIBPS2=y
+CONFIG_INPUT_MISC=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_8250=y
@@ -132,15 +106,11 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 CONFIG_SERIAL_8250_DETECT_IRQ=y
 CONFIG_SERIAL_8250_RSA=y
-CONFIG_SERIAL_OMAP=y
-CONFIG_SERIAL_OMAP_CONSOLE=y
 CONFIG_HW_RANDOM=y
-CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_OMAP=y
 CONFIG_SPI=y
 CONFIG_SPI_OMAP24XX=y
-CONFIG_SPI_TI_QSPI=y
+CONFIG_DEBUG_PINCTRL=y
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_DEBUG_GPIO=y
 CONFIG_GPIO_SYSFS=y
@@ -150,31 +120,27 @@ CONFIG_THERMAL=y
 CONFIG_THERMAL_GOV_FAIR_SHARE=y
 CONFIG_THERMAL_GOV_USER_SPACE=y
 CONFIG_CPU_THERMAL=y
-CONFIG_TI_SOC_THERMAL=y
-CONFIG_TI_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_OMAP_WATCHDOG=y
-CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TPS65217=y
-CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_PBIAS=y
 CONFIG_REGULATOR_TPS65023=y
 CONFIG_REGULATOR_TPS6507X=y
 CONFIG_REGULATOR_TPS65217=y
-CONFIG_REGULATOR_TIAVSCLASS0=y
 CONFIG_USB=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_SUSPEND=y
 CONFIG_USB_MON=y
-CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_HDRC=m
-CONFIG_USB_MUSB_OMAP2PLUS=m
-CONFIG_USB_MUSB_DSPS=m
-CONFIG_USB_TI_CPPI41_DMA=y
+CONFIG_USB_MUSB_AM35X=m
 CONFIG_USB_STORAGE=y
-CONFIG_AM335X_PHY_USB=y
+CONFIG_USB_TEST=y
+CONFIG_OMAP_USB2=m
+CONFIG_OMAP_USB3=m
+CONFIG_OMAP_CONTROL_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DEBUG=y
+CONFIG_USB_GADGET_DEBUG_FILES=y
 CONFIG_USB_GADGET_DEBUG_FS=y
 CONFIG_USB_ZERO=m
 CONFIG_USB_ETH=m
@@ -186,7 +152,6 @@ CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_SDIO_UART=y
 CONFIG_MMC_OMAP=y
-CONFIG_MMC_OMAP_HS=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y
@@ -203,10 +168,7 @@ CONFIG_RTC_DRV_OMAP=y
 CONFIG_DMADEVICES=y
 CONFIG_TI_EDMA=y
 CONFIG_DMA_OMAP=y
-CONFIG_TI_CPPI41=y
-CONFIG_COMMON_CLK_DEBUG=y
-CONFIG_OMAP_USB2=y
-CONFIG_OMAP_PIPE3=y
+CONFIG_STAGING=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_XATTR is not set
@@ -216,24 +178,23 @@ CONFIG_QFMT_V2=y
 CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_TMPFS=y
+# CONFIG_MISC_FILESYSTEMS is not set
 CONFIG_NFS_FS=y
-CONFIG_NFS_V4=y
 CONFIG_ROOT_NFS=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_PRINTK_TIME=y
-CONFIG_DEBUG_INFO=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
 CONFIG_PROVE_LOCKING=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_INFO=y
 CONFIG_CRYPTO_MANAGER=m
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
 CONFIG_CRC_CCITT=y
 CONFIG_CRC_T10DIF=y
 CONFIG_CRC_ITU_T=y
--- a/board/boundarydevices/nitrogen6x/6q_bootscript
+++ b/board/boundarydevices/nitrogen6x/6q_bootscript
--- a/board/boundarydevices/nitrogen6x/6q_upgrade
+++ b/board/boundarydevices/nitrogen6x/6q_upgrade
--- a/board/boundarydevices/nitrogen6x/6x_bootscript
+++ b/board/boundarydevices/nitrogen6x/6x_bootscript
--- a/board/boundarydevices/nitrogen6x/post-build.sh
+++ b/board/boundarydevices/nitrogen6x/post-build.sh
@@ -1,18 +1,18 @@
 #!/bin/sh
 # post-build fixups
-# for further details, see
-#
-#  http://boundarydevices.com/u-boot-on-i-mx6/
-#
+# for furthe details, see
+# http://boundarydevices.com/u-boot-conventions-for-i-mx6-nitrogen6x-and-sabrelite/

+TARGET_DIR=$1
+IMAGES_DIR=$1/../images
 BOARD_DIR="$(dirname $0)"

 # bd u-boot looks for bootscript here
-cp $BOARD_DIR/6x_bootscript $TARGET_DIR
+cp $BOARD_DIR/6q_bootscript $TARGET_DIR

 # u-boot / update script for bd upgradeu command
-if [ -e $BINARIES_DIR/u-boot.imx ];
+if [ -e $IMAGES_DIR/u-boot.bin ];
 then
-    cp $BINARIES_DIR/u-boot.imx $TARGET_DIR
-    cp $BOARD_DIR/6x_upgrade $TARGET_DIR
+    cp $IMAGES_DIR/u-boot.bin $TARGET_DIR
+    cp $BOARD_DIR/6q_upgrade $TARGET_DIR
 fi
--- a/board/cubietech/cubieboard/linux-cubieboard2.config
+++ b/board/cubietech/cubieboard/linux-cubieboard2.config
@@ -1,749 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_SYSVIPC=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_AUDIT=y
-CONFIG_IRQ_DOMAIN_DEBUG=y
-CONFIG_RCU_FAST_NO_HZ=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=19
-CONFIG_CGROUPS=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
-CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y
-CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_CGROUP=y
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_PERF_COUNTERS=y
-# CONFIG_COMPAT_BRK is not set
-CONFIG_JUMP_LABEL=y
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SRCVERSION_ALL=y
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_OSF_PARTITION=y
-CONFIG_AMIGA_PARTITION=y
-CONFIG_MAC_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_UNIXWARE_DISKLABEL=y
-CONFIG_SGI_PARTITION=y
-CONFIG_SUN_PARTITION=y
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-CONFIG_CFQ_GROUP_IOSCHED=y
-CONFIG_ARCH_SUN7I=y
-CONFIG_SUNXI_SCALING_MIN=408
-# CONFIG_CACHE_L2X0 is not set
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_SMP=y
-CONFIG_ARM_ARCH_TIMER=y
-CONFIG_NR_CPUS=2
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-CONFIG_HIGHMEM=y
-CONFIG_COMPACTION=y
-CONFIG_KSM=y
-CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/mmc0p1 rw init=/init loglevel=8"
-CONFIG_KEXEC=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_DEFAULT_GOV_FANTASY=y
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-CONFIG_CPU_FREQ_USR_EVNT_NOTIFY=y
-CONFIG_CPU_FREQ_DVFS=y
-CONFIG_CPU_IDLE=y
-CONFIG_VFP=y
-CONFIG_NEON=y
-CONFIG_BINFMT_MISC=y
-CONFIG_PM_RUNTIME=y
-CONFIG_PM_DEBUG=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM_USER=y
-CONFIG_NET_KEY=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_FIB_TRIE_STATS=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-CONFIG_NET_IPIP=y
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_ARPD=y
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=y
-CONFIG_INET_ESP=y
-CONFIG_INET_IPCOMP=y
-CONFIG_INET_DIAG=m
-CONFIG_INET_UDP_DIAG=m
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=y
-CONFIG_TCP_CONG_WESTWOOD=y
-CONFIG_TCP_CONG_HTCP=y
-CONFIG_TCP_CONG_HSTCP=y
-CONFIG_TCP_CONG_HYBLA=y
-CONFIG_TCP_CONG_SCALABLE=y
-CONFIG_TCP_CONG_LP=y
-CONFIG_TCP_CONG_VENO=y
-CONFIG_TCP_CONG_YEAH=y
-CONFIG_TCP_CONG_ILLINOIS=y
-CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=y
-CONFIG_IPV6_PRIVACY=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IPV6_PIMSM_V2=y
-# CONFIG_ANDROID_PARANOID_NETWORK is not set
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NETWORK_PHY_TIMESTAMPING=y
-CONFIG_NETFILTER=y
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NETFILTER_TPROXY=m
-CONFIG_NETFILTER_XT_SET=m
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA2=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_IP_SET=m
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-CONFIG_IP_VS_IPV6=y
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_PE_SIP=m
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_REJECT_SKERR=y
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_QUEUE=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_REJECT_SKERR=y
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_ULOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_L2TP=m
-CONFIG_L2TP_V3=y
-CONFIG_L2TP_IP=m
-CONFIG_L2TP_ETH=m
-CONFIG_BRIDGE=m
-CONFIG_VLAN_8021Q=m
-CONFIG_VLAN_8021Q_GVRP=y
-CONFIG_BATMAN_ADV=m
-CONFIG_OPENVSWITCH=m
-CONFIG_NETPRIO_CGROUP=m
-CONFIG_NET_PKTGEN=m
-CONFIG_IRDA=m
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-CONFIG_IRDA_ULTRA=y
-CONFIG_IRTTY_SIR=m
-CONFIG_KINGSUN_DONGLE=m
-CONFIG_KSDAZZLE_DONGLE=m
-CONFIG_KS959_DONGLE=m
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_MCS_FIR=m
-CONFIG_BT=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_AF_RXRPC=m
-CONFIG_RXKAD=m
-CONFIG_CFG80211=y
-CONFIG_CFG80211_DEVELOPER_WARNINGS=y
-CONFIG_WIRELESS_EXT_SYSFS=y
-CONFIG_LIB80211=m
-CONFIG_CFG80211_ALLOW_RECONNECT=y
-CONFIG_MAC80211=m
-CONFIG_MAC80211_MESH=y
-CONFIG_WIMAX=m
-CONFIG_RFKILL=y
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_CONNECTOR=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_CRYPTOLOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=2
-CONFIG_SUNXI_DBGREG=m
-CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_ATA=y
-CONFIG_SATA_AHCI_PLATFORM=y
-CONFIG_SW_SATA_AHCI_PLATFORM=y
-CONFIG_NETDEVICES=y
-CONFIG_BONDING=m
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
-# CONFIG_NET_VENDOR_FARADAY is not set
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-CONFIG_SUNXI_EMAC=y
-CONFIG_PHYLIB=y
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOE=m
-CONFIG_PPPOLAC=m
-CONFIG_PPPOPNS=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_USB_IPHETH=m
-CONFIG_ATH_COMMON=m
-CONFIG_ATH9K=m
-CONFIG_RTL8192CU=m
-CONFIG_RTL8192CU_SW=m
-CONFIG_RTL8188EU=m
-CONFIG_RTXX7X_SW=m
-CONFIG_INPUT_POLLDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_JOYDEV=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_KEYRESET=y
-CONFIG_KEYBOARD_HV2605_KEYBOARD=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_GT801=m
-CONFIG_TOUCHSCREEN_GT811=m
-CONFIG_TOUCHSCREEN_GT818=m
-CONFIG_TOUCHSCREEN_FT5X_TS=m
-CONFIG_TOUCHSCREEN_ZT8031=m
-CONFIG_GSENSOR=y
-CONFIG_SENSORS_BMA250=m
-CONFIG_MEMSIC_ECOMPASS=m
-CONFIG_SENSORS_MXC622X=m
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_NONSTANDARD=y
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=8
-CONFIG_SERIAL_8250_RUNTIME_UARTS=8
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_SPI=y
-CONFIG_SPI_DEBUG=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_SUNXI=m
-CONFIG_POWER_SUPPLY=y
-CONFIG_AW_AXP=y
-# CONFIG_HWMON is not set
-CONFIG_REGULATOR=y
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_VIDEO_DEV=y
-CONFIG_MEDIA_TUNER_CUSTOMISE=y
-# CONFIG_MEDIA_TUNER_SIMPLE is not set
-# CONFIG_MEDIA_TUNER_TDA8290 is not set
-# CONFIG_MEDIA_TUNER_TDA827X is not set
-# CONFIG_MEDIA_TUNER_TDA18271 is not set
-# CONFIG_MEDIA_TUNER_TDA9887 is not set
-# CONFIG_MEDIA_TUNER_TEA5767 is not set
-# CONFIG_MEDIA_TUNER_MT20XX is not set
-# CONFIG_MEDIA_TUNER_MT2060 is not set
-# CONFIG_MEDIA_TUNER_MT2266 is not set
-# CONFIG_MEDIA_TUNER_MT2131 is not set
-# CONFIG_MEDIA_TUNER_QT1010 is not set
-# CONFIG_MEDIA_TUNER_MXL5005S is not set
-# CONFIG_MEDIA_TUNER_MXL5007T is not set
-# CONFIG_MEDIA_TUNER_MC44S803 is not set
-# CONFIG_MEDIA_TUNER_MAX2165 is not set
-# CONFIG_MEDIA_TUNER_TDA18218 is not set
-# CONFIG_MEDIA_TUNER_TDA18212 is not set
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_USB_ET61X251=m
-CONFIG_USB_SN9C102=m
-CONFIG_USB_PWC=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_IMX074=m
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_RJ54N1=m
-CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_SOC_CAMERA_OV2640=m
-CONFIG_SOC_CAMERA_OV5642=m
-CONFIG_SOC_CAMERA_OV6650=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_SOC_CAMERA_OV9640=m
-CONFIG_SOC_CAMERA_OV9740=m
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-# CONFIG_VIDEO_CSI_SUN4I is not set
-CONFIG_RADIO_SI470X=y
-CONFIG_USB_SI470X=m
-CONFIG_I2C_SI470X=m
-CONFIG_USB_MR800=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_KEENE=m
-CONFIG_RADIO_TEA5764=m
-CONFIG_RADIO_SAA7706H=m
-CONFIG_RADIO_TEF6862=m
-CONFIG_RADIO_WL1273=m
-CONFIG_AUDIO_ENGINE=y
-CONFIG_PA_CONTROL=y
-CONFIG_DRM=m
-CONFIG_DRM_MALI=m
-CONFIG_DRM_UDL=m
-CONFIG_MALI=m
-CONFIG_MALI400_DEBUG=y
-CONFIG_MALI400_GPU_UTILIZATION=y
-CONFIG_FB=y
-CONFIG_FB_SUNXI=y
-CONFIG_FB_SUNXI_LCD=y
-CONFIG_FB_SUNXI_HDMI=y
-CONFIG_HDMI_CEC=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-# CONFIG_LOGO_LINUX_CLUT224 is not set
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_VERBOSE_PRINTK=y
-CONFIG_SND_ALOOP=m
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_SOC=y
-CONFIG_SND_SUNXI_SOC_SPDIF=y
-CONFIG_HIDRAW=y
-CONFIG_UHID=y
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
-CONFIG_HID_KYE=y
-CONFIG_HID_LOGITECH_DJ=y
-CONFIG_LOGITECH_FF=y
-# CONFIG_LOGIWHEELS_FF is not set
-CONFIG_USB=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_STORAGE_REALTEK=y
-CONFIG_USB_STORAGE_DATAFAB=y
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_USBAT=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_ALAUDA=y
-CONFIG_USB_STORAGE_ONETOUCH=y
-CONFIG_USB_STORAGE_KARMA=y
-CONFIG_USB_STORAGE_CYPRESS_ATACB=y
-CONFIG_USB_STORAGE_ENE_UB6250=y
-CONFIG_USB_SERIAL=y
-CONFIG_USB_SERIAL_CONSOLE=y
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_GADGET=y
-CONFIG_USB_FILE_STORAGE=m
-CONFIG_USB_FILE_STORAGE_TEST=y
-CONFIG_MMC=y
-# CONFIG_MMC_BLOCK_BOUNCE is not set
-CONFIG_MMC_USHC=y
-CONFIG_MMC_SUNXI_POWER_CONTROL=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_SUNXI=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-CONFIG_LEDS_TRIGGER_CPU=y
-CONFIG_LEDS_TRIGGER_GPIO=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_SUN4I=y
-CONFIG_STAGING=y
-CONFIG_ANDROID=y
-CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_LOGGER=y
-CONFIG_ANDROID_RAM_CONSOLE=y
-CONFIG_ANDROID_LOW_MEMORY_KILLER=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_REISERFS_FS=y
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-CONFIG_QFMT_V2=y
-CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=y
-CONFIG_CUSE=y
-CONFIG_FSCACHE=y
-CONFIG_FSCACHE_STATS=y
-CONFIG_CACHEFILES=y
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
-CONFIG_NTFS_FS=y
-CONFIG_NTFS_RW=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_HFS_FS=y
-CONFIG_HFSPLUS_FS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-CONFIG_NFS_V4_1=y
-CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="y"
-CONFIG_ROOT_NFS=y
-CONFIG_NFS_USE_LEGACY_DNS=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_FAULT_INJECTION=y
-CONFIG_CIFS=y
-CONFIG_CIFS_DFS_UPCALL=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_936=y
-CONFIG_NLS_CODEPAGE_950=y
-CONFIG_NLS_CODEPAGE_932=y
-CONFIG_NLS_CODEPAGE_949=y
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_PRINTK_TIME=y
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-CONFIG_FRAME_WARN=2048
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_STRIP_ASM_SYMS=y
-CONFIG_DEBUG_FS=y
-CONFIG_DEBUG_SECTION_MISMATCH=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_SHIRQ=y
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_LIST=y
-CONFIG_BOOT_PRINTK_DELAY=y
-CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
-# CONFIG_FTRACE is not set
-CONFIG_DYNAMIC_DEBUG=y
-CONFIG_STRICT_DEVMEM=y
-CONFIG_DEBUG_LL=y
-CONFIG_SECURITYFS=y
-# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_SEQIV=y
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_ZLIB=y
-CONFIG_CRYPTO_LZO=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
-CONFIG_LIBCRC32C=y
--- a/board/cubietech/cubieboard/mkcubiecard.sh
+++ b/board/cubietech/cubieboard/mkcubiecard.sh
@@ -14,7 +14,6 @@

 IMAGES_DIR=$1
 SPL_IMG=$IMAGES_DIR/sunxi-spl.bin
-SPL_UBOOT=$IMAGES_DIR/u-boot-sunxi-with-spl.bin
 UBOOT_IMG=$IMAGES_DIR/u-boot.bin
 UIMAGE=$IMAGES_DIR/uImage
 BIN_BOARD_FILE=$IMAGES_DIR/script.bin
@@ -28,12 +27,12 @@ if [ $# -ne 2 ]; then
 	exit 1;
 fi

-if [ `id -u` -ne 0 ]; then
+if [ $EUID -ne 0 ]; then
 	echo "This script must be run as root" 1>&2
 	exit 1
 fi

-if [ ! -f $SPL_IMG  -a ! -f $SPL_UBOOT ] ||
+if [ ! -f $SPL_IMG ] ||
   [ ! -f $UBOOT_IMG ] ||
   [ ! -f $UIMAGE ] ||
   [ ! -f $BIN_BOARD_FILE ] ||
@@ -114,11 +113,7 @@ umount $D2
 rm -fr $P1
 rm -fr $P2

-if [ -e $SPL_UBOOT ]; then
-	dd if=$SPL_UBOOT of=$DRIVE bs=1024 seek=8
-else
-	# write SPL
-	dd if=$SPL_IMG of=$DRIVE bs=1024 seek=8
-	# write mele u-boot
-	dd if=$UBOOT_IMG of=$DRIVE bs=1024 seek=32
-fi
+# write SPL
+dd if=$SPL_IMG of=$DRIVE bs=1024 seek=8
+# write mele u-boot
+dd if=$UBOOT_IMG of=$DRIVE bs=1024 seek=32
--- a/board/cubietech/cubieboard/readme.txt
+++ b/board/cubietech/cubieboard/readme.txt
@@ -1,4 +1,4 @@
-cubieboard and cubieboard2
+cubieboard

 -----
 Intro
@@ -13,10 +13,8 @@ For more information, please see http://linux-sunxi.org/FirstSteps
 How to build it
 ---------------

-You need to use the cubieboard_defconfig or cubieboard2_defconfig, to do so:
+You need to use the cubieboard_defconfig, to do so:
 * make cubieboard_defconfig
-or
- * make cubieboard2_defconfig

 And to compile:
 * make
@@ -33,7 +31,6 @@ After building, you should obtain this tree:
    +-- script.bin
    +-- sunxi-spl.bin
    +-- u-boot.bin
-    +-- u-boot-sunxi-with-spl.bin (optional)
    `-- uImage

 --------------------------
--- a/board/freescale/mpc8315erdb/linux-3.10.config
+++ b/board/freescale/mpc8315erdb/linux-3.10.config
@@ -1,18 +1,20 @@
+CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_BLK_DEV_INITRD=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_EXPERT=y
 # CONFIG_KALLSYMS is not set
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
-CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PPC_CHRP is not set
 # CONFIG_PPC_PMAC is not set
 CONFIG_PPC_83xx=y
 CONFIG_MPC831x_RDB=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_SPARSE_IRQ=y
 CONFIG_PCI=y
 CONFIG_NET=y
 CONFIG_PACKET=y
@@ -29,6 +31,7 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_CFI=y
 CONFIG_MTD_CFI_AMDSTD=y
@@ -49,8 +52,10 @@ CONFIG_MD_LINEAR=y
 CONFIG_MD_RAID0=y
 CONFIG_MD_RAID1=y
 CONFIG_NETDEVICES=y
-CONFIG_GIANFAR=y
+CONFIG_NET_ETHERNET=y
+CONFIG_NET_PCI=y
 CONFIG_E100=y
+CONFIG_GIANFAR=y
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
@@ -68,6 +73,7 @@ CONFIG_WATCHDOG=y
 CONFIG_VIDEO_OUTPUT_CONTROL=m
 # CONFIG_USB_HID is not set
 CONFIG_USB=y
+CONFIG_USB_DEVICEFS=y
 CONFIG_USB_MON=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_FSL=y
@@ -76,6 +82,7 @@ CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
 CONFIG_USB_UHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_NET2280=y
 CONFIG_USB_ETH=m
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_INTF_DEV_UIE_EMUL=y
@@ -83,12 +90,18 @@ CONFIG_RTC_DRV_DS1307=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+CONFIG_INOTIFY=y
 CONFIG_PROC_KCORE=y
 CONFIG_TMPFS=y
 CONFIG_JFFS2_FS=y
 CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
 CONFIG_NFS_V4=y
 CONFIG_ROOT_NFS=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
--- a/board/freescale/mpc8315erdb/readme.txt
+++ b/board/freescale/mpc8315erdb/readme.txt
@@ -6,7 +6,7 @@ It won't work for NOR and will brick that bootloader!
 Also don't go playing around with different U-boot versions or flash targets
 unless you've got the necessary hardware and/or know-how to unbrick your kit.

-2014.01 is known good for NAND.
+2013.04 is known good for NAND.
 ******************** WARNING ********************

 You'll need to program the files created by buildroot into the flash.
--- a/board/freescale/p1010rdb/linux-3.10.config
+++ b/board/freescale/p1010rdb/linux-3.10.config
@@ -1,12 +1,13 @@
 CONFIG_PPC_85xx=y
 CONFIG_PHYS_64BIT=y
+CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_AUDIT=y
 CONFIG_IRQ_DOMAIN_DEBUG=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
-CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
@@ -44,13 +45,16 @@ CONFIG_NET_IPIP=y
 CONFIG_IP_MROUTE=y
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
+CONFIG_ARPD=y
 CONFIG_INET_ESP=y
 # CONFIG_INET_XFRM_MODE_BEET is not set
+CONFIG_INET_LRO=y
 CONFIG_IPV6=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 CONFIG_FTL=y
 CONFIG_MTD_CFI=y
@@ -80,6 +84,7 @@ CONFIG_DUMMY=y
 CONFIG_GIANFAR=y
 CONFIG_VITESSE_PHY=y
 CONFIG_FIXED_PHY=y
+CONFIG_SERIO_LIBPS2=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_NR_UARTS=2
@@ -87,13 +92,16 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=2
 CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_DETECT_IRQ=y
 CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_QE=m
 CONFIG_NVRAM=y
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_CPM=m
 CONFIG_I2C_MPC=y
 CONFIG_SPI=y
 CONFIG_SPI_FSL_SPI=y
 CONFIG_SPI_FSL_ESPI=y
+CONFIG_GPIO_MPC8XXX=y
 # CONFIG_HWMON is not set
 CONFIG_USB=y
 CONFIG_USB_MON=y
@@ -110,7 +118,9 @@ CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_CMOS=y
 CONFIG_DMADEVICES=y
 CONFIG_FSL_DMA=y
+# CONFIG_NET_DMA is not set
 CONFIG_EXT4_FS=y
+CONFIG_EXT4_USE_FOR_EXT23=y
 CONFIG_MSDOS_FS=m
 CONFIG_VFAT_FS=y
 CONFIG_PROC_KCORE=y
@@ -122,11 +132,12 @@ CONFIG_NFS_V4=y
 CONFIG_ROOT_NFS=y
 CONFIG_NFSD=y
 CONFIG_CRC_T10DIF=y
-CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_FS=y
 CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEBUG_INFO=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_AES=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_CRYPTO_DEV_FSL_CAAM=y
--- a/board/freescale/p1010rdb/readme.txt
+++ b/board/freescale/p1010rdb/readme.txt
@@ -6,21 +6,7 @@ It won't work for NAND or SPI and will brick those bootloaders!
 Also don't go playing around with different U-boot versions or flash targets
 unless you've got the necessary hardware and/or know-how to unbrick your kit.

-2014.01 is known good for NOR on the P1010RDB-PA kit.
-
-Freescale released a revised version of the kit with a faster processor and
-some other hardware changes named P1010RDB-PB. U-Boot needs to be configured
-differently for this kit hence this default config WILL NOT WORK.
-This is ONLY related to U-Boot, otherwise the configuration is the same,
-you can perfectly use the generated kernel and rootfs.
-
-IF you want to build an U-Boot for the new kit just change
-BR2_TARGET_UBOOT_BOARDNAME from P1010RDB-PA_NOR to P1010RDB-PB_NOR.
-!!!!! THIS IS COMPLETELY UNTESTED BY BR DEVS SO YOU ARE ON YOUR OWN !!!!!
-If it works we'd like to know so drop an email to the mailing list. Thanks.
-
-If your kit doesn't mention PA nor PB in their shipping inventory then it's
-the old version (PA).
+2013.04 is known good for NOR.
 ******************** WARNING ********************

 You'll need to program the files created by buildroot into the flash.
--- a/board/olimex/imx233_olinuxino/linux-01-mmc-mxs-mmc-add-cd-inverted-property.patch
+++ b/board/olimex/imx233_olinuxino/linux-01-mmc-mxs-mmc-add-cd-inverted-property.patch
@@ -0,0 +1,47 @@
+From 4c0c9be05004d1eb674b7586216b3d93cc04531c Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Wed, 10 Apr 2013 11:13:43 +0200
+Subject: [PATCH 1/3] mmc: mxs-mmc: add cd-inverted property
+
+The card-detect GPIO is inverted on some boards. Handle such case.
+
+Acked-by: Shawn Guo <shawn.guo@linaro.org>
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+Signed-off-by: Chris Ball <cjb@laptop.org>
+---
+ drivers/mmc/host/mxs-mmc.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
+index 4efe302..0cdf1f6 100644
+--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
+@@ -72,6 +72,7 @@ struct mxs_mmc_host {
+ 	int				sdio_irq_en;
+ 	int				wp_gpio;
+ 	bool				wp_inverted;
+	bool				cd_inverted;
+ };
+
+ static int mxs_mmc_get_ro(struct mmc_host *mmc)
+@@ -96,7 +97,7 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc)
+ 	struct mxs_ssp *ssp = &host->ssp;
+
+ 	return !(readl(ssp->base + HW_SSP_STATUS(ssp)) &
+-		 BM_SSP_STATUS_CARD_DETECT);
+		 BM_SSP_STATUS_CARD_DETECT)) ^ host->cd_inverted;
+ }
+
+ static void mxs_mmc_reset(struct mxs_mmc_host *host)
+@@ -691,6 +692,8 @@ static int mxs_mmc_probe(struct platform_device *pdev)
+ 	if (flags & OF_GPIO_ACTIVE_LOW)
+ 		host->wp_inverted = 1;
+
+	host->cd_inverted = of_property_read_bool(np, "cd-inverted");
+
+ 	mmc->f_min = 400000;
+ 	mmc->f_max = 288000000;
+ 	mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
+--
+1.8.1.5
+
--- a/board/olimex/imx233_olinuxino/linux-02-mmc-mxs-mmc-add-non-removable-property.patch
+++ b/board/olimex/imx233_olinuxino/linux-02-mmc-mxs-mmc-add-non-removable-property.patch
@@ -0,0 +1,53 @@
+From 5086e5f41fd107539911edf62f2d202753ed1980 Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Wed, 10 Apr 2013 11:13:44 +0200
+Subject: [PATCH 2/3] mmc: mxs-mmc: add non-removable property
+
+Some boards have non removable cards like eMMC. Handle such case.
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+Acked-by: Shawn Guo <shawn.guo@linaro.org>
+Signed-off-by: Chris Ball <cjb@laptop.org>
+---
+ drivers/mmc/host/mxs-mmc.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
+index 0cdf1f6..c231881 100644
+--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
+@@ -73,6 +73,7 @@ struct mxs_mmc_host {
+ 	int				wp_gpio;
+ 	bool				wp_inverted;
+ 	bool				cd_inverted;
+	bool				non_removable;
+ };
+
+ static int mxs_mmc_get_ro(struct mmc_host *mmc)
+@@ -96,8 +97,9 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc)
+ 	struct mxs_mmc_host *host = mmc_priv(mmc);
+ 	struct mxs_ssp *ssp = &host->ssp;
+
+-	return !(readl(ssp->base + HW_SSP_STATUS(ssp)) &
+-		 BM_SSP_STATUS_CARD_DETECT)) ^ host->cd_inverted;
+	return host->non_removable ||
+		!(readl(ssp->base + HW_SSP_STATUS(ssp)) &
+		  BM_SSP_STATUS_CARD_DETECT) ^ host->cd_inverted;
+ }
+
+ static void mxs_mmc_reset(struct mxs_mmc_host *host)
+@@ -687,8 +689,10 @@ static int mxs_mmc_probe(struct platform_device *pdev)
+ 		mmc->caps |= MMC_CAP_4_BIT_DATA;
+ 	else if (bus_width == 8)
+ 		mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA;
+	host->non_removable = of_property_read_bool(np, "non-removable");
+	if (host->non_removable)
+		mmc->caps |= MMC_CAP_NONREMOVABLE;
+ 	host->wp_gpio = of_get_named_gpio_flags(np, "wp-gpios", 0, &flags);
+-
+ 	if (flags & OF_GPIO_ACTIVE_LOW)
+ 		host->wp_inverted = 1;
+
+--
+1.8.1.5
+
--- a/board/olimex/imx233_olinuxino/linux-03-mmc-mxs-mmc-add-broken-cd-property.patch
+++ b/board/olimex/imx233_olinuxino/linux-03-mmc-mxs-mmc-add-broken-cd-property.patch
@@ -0,0 +1,50 @@
+From 1d53196a0d604fcf636203fac21e944b6a9cf275 Mon Sep 17 00:00:00 2001
+From: Hector Palacios <hector.palacios@digi.com>
+Date: Wed, 10 Apr 2013 11:13:45 +0200
+Subject: [PATCH 3/3] mmc: mxs-mmc: add broken-cd property
+
+According to bindings documentation for mmc, the property 'broken-cd'
+can be used to indicate card-detection is not available and polling
+must be used instead. This patch retrieves this property
+and sets a custom flag. On the get_cd() hook, it returns 1 if
+the flag is set, to always assume the card is present.
+
+Signed-off-by: Hector Palacios <hector.palacios@digi.com>
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+Signed-off-by: Chris Ball <cjb@laptop.org>
+---
+ drivers/mmc/host/mxs-mmc.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
+index c231881..146a53b 100644
+--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
+@@ -73,6 +73,7 @@ struct mxs_mmc_host {
+ 	int				wp_gpio;
+ 	bool				wp_inverted;
+ 	bool				cd_inverted;
+	bool				broken_cd;
+ 	bool				non_removable;
+ };
+
+@@ -97,7 +98,7 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc)
+ 	struct mxs_mmc_host *host = mmc_priv(mmc);
+ 	struct mxs_ssp *ssp = &host->ssp;
+
+-	return host->non_removable ||
+	return host->non_removable || host->broken_cd ||
+ 		!(readl(ssp->base + HW_SSP_STATUS(ssp)) &
+ 		  BM_SSP_STATUS_CARD_DETECT) ^ host->cd_inverted;
+ }
+@@ -689,6 +690,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
+ 		mmc->caps |= MMC_CAP_4_BIT_DATA;
+ 	else if (bus_width == 8)
+ 		mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA;
+	host->broken_cd = of_property_read_bool(np, "broken-cd");
+ 	host->non_removable = of_property_read_bool(np, "non-removable");
+ 	if (host->non_removable)
+ 		mmc->caps |= MMC_CAP_NONREMOVABLE;
+--
+1.8.1.5
+
--- a/board/olimex/imx233_olinuxino/linux-04-ARM-dts-imx23-olinuxino-mark-sdcard-cd-as-broken.patch
+++ b/board/olimex/imx233_olinuxino/linux-04-ARM-dts-imx23-olinuxino-mark-sdcard-cd-as-broken.patch
@@ -0,0 +1,28 @@
+From 1897fda94190498573f9d1b72bc6b7b58c720957 Mon Sep 17 00:00:00 2001
+From: Alexandre Pereira da Silva <aletes.xgr@gmail.com>
+Date: Sat, 6 Apr 2013 10:42:10 -0300
+Subject: [PATCH 1/1] ARM: dts: imx23-olinuxino: mark sdcard cd as broken
+
+The imx23-olinuxino sdcard doesn't have card detect.
+
+Signed-off-by: Alexandre Pereira da Silva <aletes.xgr@gmail.com>
+Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
+---
+ arch/arm/boot/dts/imx23-olinuxino.dts | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm/boot/dts/imx23-olinuxino.dts b/arch/arm/boot/dts/imx23-olinuxino.dts
+index e7484e4..d107c4a 100644
+--- a/arch/arm/boot/dts/imx23-olinuxino.dts
+++ b/arch/arm/boot/dts/imx23-olinuxino.dts
+@@ -29,6 +29,7 @@
+ 				pinctrl-names = "default";
+ 				pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>;
+ 				bus-width = <4>;
+				broken-cd;
+ 				status = "okay";
+ 			};
+
+--
+1.8.1.5
+
--- a/board/olimex/imx233_olinuxino/linux-3.12.config
+++ b/board/olimex/imx233_olinuxino/linux-3.12.config
@@ -1,3 +1,4 @@
+CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
@@ -11,7 +12,6 @@ CONFIG_IKCONFIG_PROC=y
 # CONFIG_IPC_NS is not set
 # CONFIG_PID_NS is not set
 # CONFIG_NET_NS is not set
-CONFIG_RELAY=y
 CONFIG_PERF_EVENTS=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_MODULES=y
@@ -22,14 +22,15 @@ CONFIG_MODVERSIONS=y
 CONFIG_BLK_DEV_INTEGRITY=y
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
-# CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_MXS=y
-# CONFIG_ARM_THUMB is not set
+CONFIG_MACH_MXS_DT=y
+CONFIG_ARM_THUMB=y
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_AEABI=y
-CONFIG_ARM_APPENDED_DTB=y
-CONFIG_ARM_ATAG_DTB_COMPAT=y
+CONFIG_ATAGS=y
 CONFIG_CMDLINE="console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait"
+CONFIG_CMDLINE_FROM_BOOTLOADER=y
+CONFIG_AUTO_ZRELADDR=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
@@ -43,14 +44,17 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_LRO is not set
 # CONFIG_INET_DIAG is not set
 # CONFIG_IPV6 is not set
-CONFIG_CFG80211=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_MAC80211=y
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_FLEXCAN=m
+# CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_DATAFLASH=y
 CONFIG_MTD_M25P80=y
@@ -61,30 +65,23 @@ CONFIG_MTD_NAND_GPMI_NAND=y
 CONFIG_MTD_UBI=y
 # CONFIG_BLK_DEV is not set
 CONFIG_EEPROM_AT24=y
-CONFIG_EEPROM_93CX6=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_NETDEVICES=y
-# CONFIG_ETHERNET is not set
+CONFIG_ENC28J60=y
 CONFIG_USB_USBNET=y
 CONFIG_USB_NET_SMSC95XX=y
-CONFIG_RTL8187=m
-CONFIG_ATH_CARDS=m
-CONFIG_ATH9K_HTC=m
-CONFIG_RT2X00=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-CONFIG_RTL_CARDS=m
-CONFIG_RTL8192CU=m
-# CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_ZD1211RW=m
+CONFIG_SMSC_PHY=y
+CONFIG_ICPLUS_PHY=y
+CONFIG_REALTEK_PHY=y
+CONFIG_MICREL_PHY=y
+# CONFIG_WLAN is not set
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_EVDEV=m
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_TSC2007=m
 # CONFIG_SERIO is not set
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
@@ -101,11 +98,9 @@ CONFIG_I2C_MXS=y
 CONFIG_SPI=y
 CONFIG_SPI_GPIO=m
 CONFIG_SPI_MXS=y
-CONFIG_PTP_1588_CLOCK=y
+CONFIG_DEBUG_GPIO=y
 CONFIG_GPIO_SYSFS=y
 # CONFIG_HWMON is not set
-CONFIG_WATCHDOG=y
-CONFIG_STMP3XXX_RTC_WATCHDOG=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_FB=y
@@ -115,63 +110,79 @@ CONFIG_LCD_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_PWM=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FONTS=y
 CONFIG_LOGO=y
 CONFIG_SOUND=y
 CONFIG_SND=y
-CONFIG_SND_HRTIMER=y
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_VERBOSE_PROCFS is not set
-# CONFIG_SND_DRIVERS is not set
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_SPI is not set
-# CONFIG_SND_USB is not set
 CONFIG_SND_SOC=y
-CONFIG_SND_MXS_SOC_BUILTIN=y
+CONFIG_SND_MXS_SOC=y
+CONFIG_SND_SOC_MXS_SGTL5000=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_STORAGE=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_PHY=y
+CONFIG_USB_STORAGE=y
 CONFIG_USB_MXS_PHY=y
 CONFIG_MMC=y
-CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_MXS=y
+CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_ONESHOT=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_BACKLIGHT=y
 CONFIG_LEDS_TRIGGER_GPIO=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_DS1307=m
 CONFIG_RTC_DRV_STMP=y
 CONFIG_DMADEVICES=y
 CONFIG_MXS_DMA=y
 CONFIG_STAGING=y
 CONFIG_MXS_LRADC=y
-CONFIG_IIO=y
 CONFIG_IIO_SYSFS_TRIGGER=y
+CONFIG_COMMON_CLK_DEBUG=y
+CONFIG_IIO=y
 CONFIG_PWM=y
 CONFIG_PWM_MXS=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT3_FS=y
 CONFIG_EXT4_FS=y
+# CONFIG_DNOTIFY is not set
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+CONFIG_CACHEFILES=m
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
-# CONFIG_MISC_FILESYSTEMS is not set
-# CONFIG_NETWORK_FILESYSTEMS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RUBIN=y
+CONFIG_UBIFS_FS=y
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_ROOT_NFS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_850=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_15=y
 CONFIG_PRINTK_TIME=y
 CONFIG_FRAME_WARN=2048
+CONFIG_MAGIC_SYSRQ=y
 CONFIG_UNUSED_SYMBOLS=y
-CONFIG_DEBUG_FS=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_TIMER_STATS=y
+CONFIG_PROVE_LOCKING=y
+CONFIG_DEBUG_INFO=y
+CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_STRICT_DEVMEM=y
 CONFIG_DEBUG_USER=y
-CONFIG_KEYS=y
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRYPTO_DEV_DCP=y
-CONFIG_CRC_CCITT=y
-CONFIG_CRC_ITU_T=y
+# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_ITU_T=m
 CONFIG_CRC7=m
-CONFIG_FONTS=y
--- a/board/olimex/imx233_olinuxino/mxs-bootlets/mxs-bootlets-01-olinuxino.patch
+++ b/board/olimex/imx233_olinuxino/mxs-bootlets/mxs-bootlets-01-olinuxino.patch
@@ -65,9 +65,9 @@ diff -Nura imx-bootlets-src-10.12.01/linux_prep/cmdlines/imx23_olinuxino_dev.txt
 --- imx-bootlets-src-10.12.01/linux_prep/cmdlines/imx23_olinuxino_dev.txt	1969-12-31 21:00:00.000000000 -0300
 +++ imx-bootlets-src-10.12.01-olinuxino/linux_prep/cmdlines/imx23_olinuxino_dev.txt	2013-05-17 15:07:49.663496106 -0300
@@ -0,0 +1,3 @@
-+console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait
-+console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait
-+console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait
+noinitrd console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait ssp1=mmc
+noinitrd console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait ssp1=mmc
+noinitrd console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait ssp1=mmc
 diff -Nura imx-bootlets-src-10.12.01/linux_prep/core/setup.c imx-bootlets-src-10.12.01-olinuxino/linux_prep/core/setup.c
 --- imx-bootlets-src-10.12.01/linux_prep/core/setup.c	2010-11-04 04:35:38.000000000 -0300
 +++ imx-bootlets-src-10.12.01-olinuxino/linux_prep/core/setup.c	2013-05-17 15:08:39.246114205 -0300
--- a/board/olimex/imx233_olinuxino/readme.txt
+++ b/board/olimex/imx233_olinuxino/readme.txt
@@ -1,7 +1,5 @@
-This configuration is intended as a base image.
-It includes kernel and firmware support for the common USB WiFi hardware.
-Packages for WiFi support are up to the user, you'll probably want
-one or more of: hostapd, iw, wireless_tools and/or wpa_supplicant.
+This configuration is intended as a base image, it doesn't have support
+for things like WiFi, either in the kernel or packages.

 It also pulls up the console on the serial port, not on TV output.

--- a/board/qemu/arm-nuri/readme.txt
+++ b/board/qemu/arm-nuri/readme.txt
@@ -7,4 +7,4 @@ graphical window is the framebuffer.

 Startup time is slow because of the SMP CPU emulation so be patient.

-Tested with QEMU 1.6.1
+Tested with QEMU 1.5.2
--- a/board/qemu/arm-versatile/linux-3.10.config
+++ b/board/qemu/arm-versatile/linux-3.10.config
--- a/board/qemu/arm-versatile/readme.txt
+++ b/board/qemu/arm-versatile/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.

-Tested with QEMU 1.6.1
+Tested with QEMU 1.5.2
--- a/board/qemu/arm-vexpress/readme.txt
+++ b/board/qemu/arm-vexpress/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.

-Tested with QEMU 1.6.1
+Tested with QEMU 1.5.2
--- a/board/qemu/microblazebe-mmu/linux-3.10.config
+++ b/board/qemu/microblazebe-mmu/linux-3.10.config
--- a/board/qemu/microblazebe-mmu/readme.txt
+++ b/board/qemu/microblazebe-mmu/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:

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

-Tested with QEMU 1.6.1
+Tested with QEMU 1.5.2
--- a/board/qemu/microblazeel-mmu/linux-3.10.config
+++ b/board/qemu/microblazeel-mmu/linux-3.10.config
--- a/board/qemu/microblazeel-mmu/readme.txt
+++ b/board/qemu/microblazeel-mmu/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:

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

-Tested with QEMU 1.6.1
+Tested with QEMU 1.5.2
--- a/board/qemu/mips-malta/linux-3.10.config
+++ b/board/qemu/mips-malta/linux-3.10.config
--- a/board/qemu/mips-malta/readme.txt
+++ b/board/qemu/mips-malta/readme.txt
@@ -6,4 +6,4 @@ The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer. No keyboard support has been
 enabled.

-Tested with QEMU 1.6.1
+Tested with QEMU 1.5.2
--- a/board/qemu/mips64-malta/linux-3.10.config
+++ b/board/qemu/mips64-malta/linux-3.10.config
@@ -1,16 +1,23 @@
 CONFIG_MIPS_MALTA=y
 CONFIG_CPU_MIPS64_R1=y
 CONFIG_64BIT=y
+CONFIG_64BIT_PHYS_ADDR=y
 CONFIG_MIPS_MT_SMP=y
-CONFIG_NR_CPUS=2
-CONFIG_HZ_100=y
-CONFIG_SYSVIPC=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
+CONFIG_HZ_100=y
+CONFIG_EXPERIMENTAL=y
+CONFIG_SYSVIPC=y
 CONFIG_LOG_BUF_SHIFT=15
-CONFIG_NAMESPACES=y
+CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_RELAY=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_PID_NS=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_EMBEDDED=y
+# CONFIG_SYSCTL_SYSCALL is not set
 # CONFIG_COMPAT_BRK is not set
 CONFIG_SLAB=y
 CONFIG_MODULES=y
@@ -19,9 +26,7 @@ CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_PCI=y
-CONFIG_MIPS32_COMPAT=y
-CONFIG_MIPS32_O32=y
-CONFIG_MIPS32_N32=y
+CONFIG_PM=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
@@ -35,25 +40,39 @@ CONFIG_IP_PNP=y
 # CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_MISC_DEVICES is not set
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDECD=y
 CONFIG_IDE_GENERIC=y
 CONFIG_BLK_DEV_GENERIC=y
 CONFIG_BLK_DEV_PIIX=y
 CONFIG_NETDEVICES=y
+CONFIG_NET_ETHERNET=y
+CONFIG_NET_PCI=y
 CONFIG_PCNET32=y
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
 # CONFIG_WLAN is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_SERIO_I8042 is not set
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
 # CONFIG_HWMON is not set
+# CONFIG_MFD_SUPPORT is not set
 CONFIG_FB=y
 CONFIG_FB_CIRRUS=y
 # CONFIG_VGA_CONSOLE is not set
+# CONFIG_HID_SUPPORT is not set
 # CONFIG_USB_SUPPORT is not set
-CONFIG_EXT4_FS=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y
+CONFIG_QUOTA=y
 CONFIG_PROC_KCORE=y
 CONFIG_TMPFS=y
 CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
 CONFIG_ROOT_NFS=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
--- a/board/qemu/mips64-malta/readme.txt
+++ b/board/qemu/mips64-malta/readme.txt
@@ -3,6 +3,9 @@ Run the emulation with:
 qemu-system-mips64 -M malta -kernel output/images/vmlinux -serial stdio -hda output/images/rootfs.ext2 -append "root=/dev/hda"

 The login prompt will appear in the terminal that started Qemu. The
-graphical window is the framebuffer.
+graphical window is the framebuffer. No keyboard support has been
+enabled.

-Tested with QEMU 1.6.1
+This configuration is known to be flaky.
+
+Tested with QEMU 1.5.2
--- a/board/qemu/mips64el-malta/linux-3.12.config
+++ b/board/qemu/mips64el-malta/linux-3.12.config
@@ -1,60 +0,0 @@
-CONFIG_MIPS_MALTA=y
-CONFIG_CPU_LITTLE_ENDIAN=y
-CONFIG_CPU_MIPS64_R1=y
-CONFIG_64BIT=y
-CONFIG_MIPS_MT_SMP=y
-CONFIG_NR_CPUS=2
-CONFIG_HZ_100=y
-CONFIG_SYSVIPC=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_LOG_BUF_SHIFT=15
-CONFIG_NAMESPACES=y
-CONFIG_RELAY=y
-CONFIG_EMBEDDED=y
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SRCVERSION_ALL=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_PCI=y
-CONFIG_MIPS32_COMPAT=y
-CONFIG_MIPS32_O32=y
-CONFIG_MIPS32_N32=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_PNP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
-# CONFIG_WIRELESS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDECD=y
-CONFIG_IDE_GENERIC=y
-CONFIG_BLK_DEV_GENERIC=y
-CONFIG_BLK_DEV_PIIX=y
-CONFIG_NETDEVICES=y
-CONFIG_PCNET32=y
-# CONFIG_WLAN is not set
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-# CONFIG_HWMON is not set
-CONFIG_FB=y
-CONFIG_FB_CIRRUS=y
-# CONFIG_VGA_CONSOLE is not set
-# CONFIG_USB_SUPPORT is not set
-CONFIG_EXT4_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_TMPFS=y
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
--- a/board/qemu/mips64el-malta/readme.txt
+++ b/board/qemu/mips64el-malta/readme.txt
@@ -1,8 +0,0 @@
-Run the emulation with:
-
- qemu-system-mips64el -M malta -kernel output/images/vmlinux -serial stdio -hda output/images/rootfs.ext2 -append "root=/dev/hda"
-
-The login prompt will appear in the terminal that started Qemu. The
-graphical window is the framebuffer.
-
-Tested with QEMU 1.6.1
--- a/board/qemu/mipsel-malta/linux-3.10.config
+++ b/board/qemu/mipsel-malta/linux-3.10.config
--- a/board/qemu/mipsel-malta/readme.txt
+++ b/board/qemu/mipsel-malta/readme.txt
@@ -6,4 +6,4 @@ The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer. No keyboard support has been
 enabled.

-Tested with QEMU 1.6.1
+Tested with QEMU 1.5.2
--- a/board/qemu/powerpc-g3beige/linux-3.10.config
+++ b/board/qemu/powerpc-g3beige/linux-3.10.config
--- a/board/qemu/powerpc-g3beige/readme.txt
+++ b/board/qemu/powerpc-g3beige/readme.txt
@@ -1,8 +1,8 @@
 Run the emulation with:

-  qemu-system-ppc -M g3beige -kernel output/images/vmlinux -hda output/images/rootfs.ext2 -append "console=ttyS0 root=/dev/hda" -serial stdio -net nic,model=rtl8139 -net user
+  qemu-system-ppc -M g3beige -kernel output/images/vmlinux -hda output/images/rootfs.ext2 -append "console=ttyS0 root=/dev/hdc" -serial stdio -net nic,model=rtl8139 -net user

 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.

-Tested with QEMU 1.6.1
+Tested with QEMU 1.5.2
--- a/board/qemu/powerpc-mpc8544ds/readme.txt
+++ b/board/qemu/powerpc-mpc8544ds/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:

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

-Tested with QEMU 1.6.1
+Tested with QEMU 1.5.2
--- a/board/qemu/powerpc-virtex-ml507/readme.txt
+++ b/board/qemu/powerpc-virtex-ml507/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:

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

-Tested with QEMU 1.6.1
+Tested with QEMU 1.5.2
--- a/board/qemu/sh4-r2d/readme.txt
+++ b/board/qemu/sh4-r2d/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu.
 The graphical window is the framebuffer.

-Tested with QEMU 1.6.1
+Tested with QEMU 1.5.2
--- a/board/qemu/sparc-ss10/readme.txt
+++ b/board/qemu/sparc-ss10/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu.
 The graphical window is the framebuffer.

-Tested with QEMU 1.6.1
+Tested with QEMU 1.5.2
--- a/board/qemu/x86/linux-3.10.config
+++ b/board/qemu/x86/linux-3.10.config
--- a/board/qemu/x86/readme.txt
+++ b/board/qemu/x86/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:

 The login prompt will appear in the graphical window.

-Tested with QEMU 1.6.1
+Tested with QEMU 1.5.2
--- a/board/qemu/x86_64/linux-3.10.config
+++ b/board/qemu/x86_64/linux-3.10.config
--- a/board/qemu/x86_64/readme.txt
+++ b/board/qemu/x86_64/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:

 The login prompt will appear in the graphical window.

-Tested with QEMU 1.6.1
+Tested with QEMU 1.5.2
--- a/board/raspberrypi/readme.txt
+++ b/board/raspberrypi/readme.txt
@@ -4,124 +4,124 @@ Intro
 =====

 To be able to use your RaspberryPi board with the images generated by
-Buildroot, you have to choose whether you will use:
-
-    * Volatile rootfs in RAM (the rootfs is an initramfs) or
-    * Persistent rootfs on the SDCard
+Buildroot, you have a prior choice to make, will you use:
+    - Volatile rootfs in RAM (The rootfs is an initramfs) or
+    - Persistent rootfs on the SDCard

 Also, a good source of information is http://elinux.org/R-Pi_Hub

-How to build it
+Volatile rootfs
 ===============

-Configure Buildroot
-------------------
+How to build it
+---------------

-The raspberrypi_defconfig configuration is a minimal configuration with
-all that is required to bring the Raspberry Pi. You should base your
-work on this defconfig:
+You need to use the rpi_defconfig, to do so:
+ * make rpi_defconfig

-  $ make raspberrypi_defconfig
+Then, you need to select the kind of images you want:
+ * make menuconfig
+ * Select "Filesystem images"
+ * Select "initial RAM filesystem linked into linux kernel"

-If you want to use a persistent rootfs, skip to "Build the rootfs", below.
-
-For a volatile rootfs, you have to slightly adjust the configuration:
-
-  $ make menuconfig
-    * Select "Filesystem images"
-    * Select "initial RAM filesystem linked into linux kernel"
-
-You may also deselect "tar the root filesystem".
-
-Build the rootfs
----------------
-
-Note: you will need to have access to the network, since Buildroot will
-download the packages' sources.
-
-You may now build your rootfs with:
-
-  $ make
-
-(This may take a while; consider getting yourself a coffee ;-) )
-
-Result of the build
-------------------
+What is generated
+-----------------

 After building, you should obtain this tree:

    output/images/
    +-- rootfs.tar
    +-- rpi-firmware
-    |   +-- bootcode.bin
-    |   +-- config.txt
-    |   +-- fixup_cd.dat
-    |   +-- fixup.dat
-    |   +-- start_cd.elf
-    |   `-- start.elf
+    |   +-- bootcode.bin
+    |   +-- config.txt
+    |   +-- fixup_cd.dat
+    |   +-- fixup.dat
+    |   +-- start_cd.elf
+    |   `-- start.elf
    `-- zImage

-Note for Volatile: rootfs.tar will only be there if you kept
-"tar the root filesystem" option selected in "Filesystem images".
+Note : rootfs.tar will only be there if you kept "tar the root filesystem"
+option selected in "Filesystem images".

-Prepare you SDCard
-==================
+Where should the binaries be copied on the SDCard
+-------------------------------------------------

-For more information, visit
-http://elinux.org/RPi_Advanced_Setup#Advanced_SD_card_setup
+Your SDCard must have its first partition using fat32 and marked bootable.

-In summary, your SDCard must have first partition in fat32 and marked bootable.
+At the root of the partition, the RaspberryPi must find the following files:

-Create the required partitions:
-  - for a persistent rootfs, 10MiB is enough memory for the boot fat32
-    partition, and a second partition is required for the root filesystem
-  - for a volatile rootfs, 50MiB is required for the boot fat32 partition
+ * bootcode.bin
+ * config.txt
+ * fixup_cd.dat
+ * fixup.dat
+ * start_cd.elf
+ * start.elf
+ * zImage
+
+So you should copy the entire content of output/images/rpi-firmware along with
+zImage.

 Note: You can create any number of partitions you desire, the only requirement
-is that the first partition must be using fat32 and be bootable.
+is that the first partition must be using fat32 and bootable.

-Mount the partitions (adjust 'sdX' to match your SDcard device):
+Persistent rootfs
+=================

-  $ sudo mount /dev/sdX1 /mnt/mountpointboot
-  $ sudo mount /dev/sdX2 /mnt/mountpointroot    (only for persistent rootfs)
+How to build it
+---------------

-Install the binaries to the SDCard
----------------------------------
+You only need to use the rpi_defconfig, to do so:
+ * make rpi_defconfig

-At the root of the boot partition, the RaspberryPi must find the following
-files:
+What is generated
+-----------------

-    * bootcode.bin
-    * config.txt
-    * fixup.dat
-    * start.elf
-    * zImage
+After building, you should obtain this tree:

-For example:
+    output/images/
+    +-- rootfs.tar
+    +-- rpi-firmware
+    |   +-- bootcode.bin
+    |   +-- config.txt
+    |   +-- fixup_cd.dat
+    |   +-- fixup.dat
+    |   +-- start_cd.elf
+    |   `-- start.elf
+    `-- zImage

- $ cp output/images/rpi-firmware/* /mnt/mountpointboot
- $ cp output/images/zImage /mnt/mountpointboot
+Where should the binaries be copied on the SDCard
+-------------------------------------------------

-Note: The kernel image file name is defined in config.txt like this:
-kernel=zImage
+Your SDCard must have its first partition using fat32 and marked bootable.
+It should also have another partition which will contain your rootfs, it should
+be partitioned as ext4.

-If you use a volatile rootfs, Skip to "Finish", below. For a persistent
-rootfs, there are further steps to do.
+Boot partition
+~~~~~~~~~~~~~~

-Extract (as root!) the contents of the rootfs.tar archive into the second
-partition you created above:
+The first partition will contain everything used to boot the RaspberryPi.
+You must copy theses files at the root of partition:

-  $ sudo tar xf rootfs.tar -C /mnt/mountpointroot
+ * bootcode.bin
+ * config.txt
+ * fixup_cd.dat
+ * fixup.dat
+ * start_cd.elf
+ * start.elf
+ * zImage

-Finish
-======
+So you should copy the entire content of output/images/rpi-firmware along with
+zImage.

-Unmount all the partitions:
+Rootfs partition
+~~~~~~~~~~~~~~~~

-  $ sudo umount /mnt/mountpointboot
-  $ sudo umount /mnt/mountpointroot     (only for persistent rootfs)
+The second partition will contain your rootfs.
+Simply extract (as root!) the contents of the rootfs.tar archive
+into this partition.

-And eject your SDcard from your computer SDcard reader.
+For example: (Assuming mountpoint is a directory and exist)
+
+ $ sudo mount /dev/sdXY /mnt/mountpoint
+ $ sudo tar xf rootfs.tar -C /mnt/mountpoint

-Insert the SDcard into your Raspberry Pi, and power it up. Your new system
-should come up, now.
--- a/board/wandboard/readme.txt
+++ b/board/wandboard/readme.txt
@@ -1,37 +0,0 @@
-Minimal board support for the Wandboard
-
-Wandboard's homepage is here: http://www.wandboard.org/
-
-This config is only tested with the dual core wandboard.
-
-Installing:
-
-You need a micro SD card and a slot/adapter for your development machine.
-
-Partition the SD card leaving at least 1 MB in front of the first partition.
-
-Partition layout (example):
-
-Disk /dev/sdi: 3965 MB, 3965190144 bytes
-255 heads, 63 sectors/track, 482 cylinders
-Units = cylinders of 16065 * 512 = 8225280 bytes
-Sector size (logical/physical): 512 bytes / 512 bytes
-I/O size (minimum/optimal): 512 bytes / 512 bytes
-Disk identifier: 0x77b47445
-
-   Device Boot      Start         End      Blocks   Id  System
-/dev/sdi1               2         482     3863632+  83  Linux
-
-Copy u-boot and its environment to the SD card:
-sudo dd if=output/images/u-boot.imx bs=512 seek=2 of=/dev/sd<x>
-sudo dd if=output/images/uboot-env.bin bs=512 seek=768 of=/dev/sd<x>
-
-Copy the root filesystem:
-sudo dd if=output/images/rootfs.ext2 of=/dev/sd<x>1
-
-Alternative commands to copy root filesystem:
-sudo mkfs.ext4 /dev/sd<x>1
-sudo mount /dev/sd<x>1 /mnt
-sudo tar xf output/images/rootfs.tar -C /mnt
-sudo umount /mnt
-
--- a/board/wandboard/uboot-env.txt
+++ b/board/wandboard/uboot-env.txt
@@ -1,20 +0,0 @@
-baudrate=115200
-bootcmd=mmc dev ${mmcdev}; if mmc rescan; then if run loadbootscript; then run bootscript; else if run loaduimage; then run mmcboot; else run netboot; fi; fi; else run netboot; fi
-bootdelay=3
-bootscript=echo Running bootscript from mmc ...; source
-console=ttymxc0
-ethact=FEC
-ethaddr=00:1f:7b:b2:05:ee
-ethprime=FEC
-loadaddr=0x12000000
-loadbootscript=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};
-loaduimage=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}
-mmcargs=setenv bootargs console=${console},${baudrate} root=${mmcroot}
-mmcboot=echo Booting from mmc ...; run mmcargs;  bootm; 
-mmcdev=0
-mmcpart=1
-mmcroot=/dev/mmcblk0p1 rootwait rw
-netargs=setenv bootargs console=${console},${baudrate} root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp
-netboot=echo Booting from net ...; run netargs; if test ${ip_dyn} = yes; then setenv get_cmd dhcp; else setenv get_cmd tftp; fi; ${get_cmd} ${uimage}; if test ${boot_fdt} = yes || test ${boot_fdt} = try; then if ${get_cmd} ${fdt_addr} ${fdt_file}; then bootm ${loadaddr} - ${fdt_addr}; else if test ${boot_fdt} = try; then bootm; else echo WARN: Cannot load the DT; fi; fi; else bootm; fi;
-script=boot/boot.scr
-uimage=boot/uImage
--- a/boot/Config.in
+++ b/boot/Config.in
@@ -13,3 +13,4 @@ source "boot/uboot/Config.in"
 source "boot/xloader/Config.in"

 endmenu
+
--- a/boot/at91bootstrap/Config.in
+++ b/boot/at91bootstrap/Config.in
@@ -45,3 +45,6 @@ config BR2_TARGET_AT91BOOTSTRAP_MEMORY
 	default	"nandflash"	if	BR2_TARGET_AT91BOOTSTRAP_NANDFLASH

 endif
+
+
+
--- a/boot/at91dataflashboot/Config.in
+++ b/boot/at91dataflashboot/Config.in
@@ -1,3 +1,3 @@
 config BR2_TARGET_AT91DATAFLASHBOOT
-	depends on BR2_arm926t
-	bool "AT91 DataFlashBoot"
+       depends on BR2_arm926t
+       bool "AT91 DataFlashBoot"
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -12,7 +12,7 @@ choice
 	  Select the specific Barebox version you want to use

 config BR2_TARGET_BAREBOX_LATEST_VERSION
-	bool "2014.02.0"
+	bool "2013.07.0"

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

 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2014.02.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
-	default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
+	default "2013.07.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
+	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT

 config BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR
 	string "custom patch dir"
--- a/boot/boot-wrapper-aarch64/Config.in
+++ b/boot/boot-wrapper-aarch64/Config.in
@@ -1,7 +1,3 @@
-comment "boot-wrapper-aarch64 needs a Linux kernel to be built"
-	depends on BR2_aarch64
-	depends on !BR2_LINUX_KERNEL
-
 config BR2_TARGET_BOOT_WRAPPER_AARCH64
 	bool "boot-wrapper-aarch64"
 	depends on BR2_aarch64
--- a/boot/common.mk
+++ b/boot/common.mk
@@ -1 +1 @@
-include $(sort $(wildcard boot/*/*.mk))
+include boot/*/*.mk
--- a/boot/grub/Config.in
+++ b/boot/grub/Config.in
@@ -1,200 +1,146 @@
 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"
+	depends on BR2_TARGET_GRUB
 	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.
+	  A splashimage is a 14-color indexed .xpm picture which
+	  is displayed as background for the grub menu.

 config BR2_TARGET_GRUB_DISKLESS
 	bool "diskless support"
+	depends on BR2_TARGET_GRUB
 	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"
+	depends on BR2_TARGET_GRUB
 	help
 	  enable 3Com595 driver

 config BR2_TARGET_GRUB_3c90x
 	bool "3Com90x driver"
+	depends on BR2_TARGET_GRUB
 	help
 	  enable 3Com90x driver

 config BR2_TARGET_GRUB_davicom
 	bool "Davicom driver"
+	depends on BR2_TARGET_GRUB
 	help
 	  enable Davicom driver

 config BR2_TARGET_GRUB_e1000
 	bool "Etherexpress Pro/1000 driver"
+	depends on BR2_TARGET_GRUB
 	help
 	  enable Etherexpress Pro/1000 driver

 config BR2_TARGET_GRUB_eepro100
 	bool "Etherexpress Pro/100 driver"
+	depends on BR2_TARGET_GRUB
 	help
 	  enable Etherexpress Pro/100 driver

 config BR2_TARGET_GRUB_epic100
 	bool "SMC 83c170 EPIC/100 driver"
+	depends on BR2_TARGET_GRUB
 	help
 	  enable SMC 83c170 EPIC/100 driver

 config BR2_TARGET_GRUB_forcedeth
 	bool "Nvidia Geforce driver"
+	depends on BR2_TARGET_GRUB
 	help
 	  enable Nvidia Geforce driver

 config BR2_TARGET_GRUB_natsemi
 	bool "NatSemi DP8381x driver"
+	depends on BR2_TARGET_GRUB
 	help
 	  enable NatSemi DP8381x driver

 config BR2_TARGET_GRUB_ns83820
 	bool "NS83820 driver"
+	depends on BR2_TARGET_GRUB
 	help
 	  enable NS83820 driver

 config BR2_TARGET_GRUB_ns8390
 	bool "NE2000 PCI driver"
+	depends on BR2_TARGET_GRUB
 	help
 	  enable NE2000 PCI driver

 config BR2_TARGET_GRUB_pcnet32
 	bool "AMD Lance/PCI PCNet/32 driver"
+	depends on BR2_TARGET_GRUB
 	help
 	  enable AMD Lance/PCI PCNet/32 driver

 config BR2_TARGET_GRUB_pnic
 	bool "Bochs Pseudo Nic driver"
+	depends on BR2_TARGET_GRUB
 	help
 	  enable Bochs Pseudo Nic driver

 config BR2_TARGET_GRUB_rtl8139
 	bool "Realtek 8139 driver"
+	depends on BR2_TARGET_GRUB
 	help
 	  enable Realtek 8139 driver

 config BR2_TARGET_GRUB_r8169
 	bool "Realtek 8169 driver"
+	depends on BR2_TARGET_GRUB
 	help
 	  enable Realtek 8169 driver

 config BR2_TARGET_GRUB_sis900
 	bool "SIS 900 and SIS 7016 driver"
+	depends on BR2_TARGET_GRUB
 	help
 	  enable SIS 900 and SIS 7016 driver

 config BR2_TARGET_GRUB_tg3
 	bool "Broadcom Tigon3 driver"
+	depends on BR2_TARGET_GRUB
 	help
 	  enable Broadcom Tigon3 driver

 config BR2_TARGET_GRUB_tulip
 	bool "Tulip driver"
+	depends on BR2_TARGET_GRUB
 	help
 	  enable Tulip driver

 config BR2_TARGET_GRUB_tlan
 	bool "TI ThunderLAN driver"
+	depends on BR2_TARGET_GRUB
 	help
 	  enable TI ThunderLAN driver

 config BR2_TARGET_GRUB_undi
 	bool "PXE UNDI driver"
+	depends on BR2_TARGET_GRUB
 	help
 	  enable PXE UNDI driver

 config BR2_TARGET_GRUB_via_rhine
 	bool "Rhine-I/II driver"
+	depends on BR2_TARGET_GRUB
 	help
 	  enable Rhine-I/II driver

 config BR2_TARGET_GRUB_w89c840
 	bool "Winbond W89c840 driver"
+	depends on BR2_TARGET_GRUB
 	help
 	  enable Winbond W89c840 driver
-
-endmenu
-
-endif # BR2_TARGET_GRUB
--- a/boot/grub/grub.200-fix_mbr_handling.patch
+++ b/boot/grub/grub.200-fix_mbr_handling.patch
@@ -1,10 +1,8 @@
-Index: b/stage2/disk_io.c
-===================================================================
--- a/stage2/disk_io.c
-+++ b/stage2/disk_io.c
-@@ -365,7 +365,7 @@
+--- grub-0.97.oorig/stage2/disk_io.c	2004-05-23 18:35:24.000000000 +0200
+++ grub-0.97/stage2/disk_io.c	2006-03-12 14:11:51.000000000 +0100
+@@ -365,7 +365,7 @@ rawwrite (int drive, int sector, char *b
 int
- devwrite (unsigned int sector, int sector_count, char *buf)
+ devwrite (int sector, int sector_count, char *buf)
 {
 -#if defined(GRUB_UTIL) && defined(__linux__)
 +#if defined(GRUB_UTIL) && defined(__linux__) && !defined(SUPPORT_LOOPDEV)
--- a/boot/grub/grub.300-honor_UCLIBC_HAS_LFS.patch
+++ b/boot/grub/grub.300-honor_UCLIBC_HAS_LFS.patch
@@ -1,7 +1,6 @@
-Index: b/grub/asmstub.c
-===================================================================
--- a/grub/asmstub.c
-+++ b/grub/asmstub.c
+diff -rup grub-0.97.orig/grub/asmstub.c grub-0.97/grub/asmstub.c
+--- grub-0.97.orig/grub/asmstub.c	2006-11-29 20:36:20.000000000 +0100
+++ grub-0.97/grub/asmstub.c	2006-11-29 21:26:16.000000000 +0100
@@ -18,10 +18,13 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
@@ -16,10 +15,9 @@ Index: b/grub/asmstub.c
 
 /* Simulator entry point. */
 int grub_stage2 (void);
-Index: b/lib/device.c
-===================================================================
--- a/lib/device.c
-+++ b/lib/device.c
+diff -rup grub-0.97.orig/lib/device.c grub-0.97/lib/device.c
+--- grub-0.97.orig/lib/device.c	2006-11-29 20:36:20.000000000 +0100
+++ grub-0.97/lib/device.c	2006-11-29 21:25:19.000000000 +0100
@@ -18,10 +18,13 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
--- a/boot/grub/grub.400-nic_update2.patch
+++ b/boot/grub/grub.400-nic_update2.patch
--- a/boot/grub/grub.mk
+++ b/boot/grub/grub.mk
@@ -6,24 +6,18 @@

 GRUB_VERSION = 0.97
 GRUB_SOURCE = grub_$(GRUB_VERSION).orig.tar.gz
-GRUB_PATCH  = grub_$(GRUB_VERSION)-67.diff.gz
-GRUB_SITE   = http://snapshot.debian.org/archive/debian/20130129T225227Z/pool/main/g/grub/
+GRUB_PATCH  = grub_$(GRUB_VERSION)-35.diff.gz
+GRUB_SITE   = http://snapshot.debian.org/archive/debian/20080329T000000Z/pool/main/g/grub/

 GRUB_LICENSE = GPLv2+
 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_CFLAGS=-DSUPPORT_LOOPDEV
+ifeq ($(BR2_LARGEFILE),)
+GRUB_CFLAGS+=-U_FILE_OFFSET_BITS
+endif

+GRUB_CONFIG-$(BR2_TARGET_GRUB_SPLASH) += --enable-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
@@ -47,24 +41,9 @@ 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 \
+	(cd $(@D) ; for f in `cat debian/patches/00list | grep -v ^#` ; do \
 		cat debian/patches/$$f | patch -g0 -p1 ; \
 	done)
 endef
@@ -72,38 +51,38 @@ endef
 GRUB_POST_PATCH_HOOKS += GRUB_DEBIAN_PATCHES

 GRUB_CONF_ENV = \
-	$(HOST_CONFIGURE_OPTS) \
-	CFLAGS="$(HOST_CFLAGS) $(GRUB_CFLAGS) -m32"
+	CFLAGS="$(TARGET_CFLAGS) $(GRUB_CFLAGS)"

 GRUB_CONF_OPT = \
 	--disable-auto-linux-mem-opt \
 	$(GRUB_CONFIG-y)

+define GRUB_INSTALL_STAGING_CMDS
+	install -m 0755 -D $(@D)/grub/grub $(STAGING_DIR)/sbin/grub
+endef
+
 ifeq ($(BR2_TARGET_GRUB_SPLASH),y)
 define GRUB_INSTALL_SPLASH
 	cp boot/grub/splash.xpm.gz $(TARGET_DIR)/boot/grub/
 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 -m 0755 -D $(@D)/grub/grub $(HOST_DIR)/sbin/grub
+	install -m 0755 -D $(@D)/grub/grub $(TARGET_DIR)/sbin/grub
 	mkdir -p $(TARGET_DIR)/boot/grub
 	cp $(@D)/stage1/stage1 $(TARGET_DIR)/boot/grub
-	for f in $(GRUB_STAGE_1_5_TO_INSTALL) ; do \
-		cp $(@D)/stage2/$${f}_stage1_5 $(TARGET_DIR)/boot/grub ; \
-	done
+	cp $(@D)/stage2/*1_5   $(TARGET_DIR)/boot/grub
 	cp $(@D)/stage2/stage2 $(TARGET_DIR)/boot/grub
-	cp boot/grub/menu.lst $(TARGET_DIR)/boot/grub
 	$(GRUB_INSTALL_SPLASH)
 endef

+define GRUB_UNINSTALL_STAGING_CMDS
+	rm -f $(STAGING_DIR)/sbin/grub
+endef
+
+define GRUB_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/sbin/grub
+	rm -rf $(TARGET_DIR)/boot/grub
+endef
+
 $(eval $(autotools-package))
--- a/boot/grub/menu.lst
+++ b/boot/grub/menu.lst
@@ -1,16 +1,7 @@
-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
-
+default=0
+timeout=5
+splashimage=(hd0,0)/boot/grub/splash.xpm.gz
+hiddenmenu
 title Buildroot
 	root (hd0,0)
-	kernel /boot/bzImage rw root=/dev/sda1
+	kernel /boot/bzImage rw root=/dev/hda1 vga=791 
--- a/boot/grub/splash.xpm.gz
+++ b/boot/grub/splash.xpm.gz
--- a/boot/mxs-bootlets/Config.in
+++ b/boot/mxs-bootlets/Config.in
@@ -43,16 +43,16 @@ choice
 	  Select which bootstream to generate

 config BR2_TARGET_MXS_BOOTLETS_BAREBOX
-	depends on BR2_TARGET_BAREBOX
-	bool "Barebox Bootloader"
+       depends on BR2_TARGET_BAREBOX
+       bool "Barebox Bootloader"

 config BR2_TARGET_MXS_BOOTLETS_LINUX
-	depends on BR2_LINUX_KERNEL
-	bool "Linux Kernel"
+       depends on BR2_LINUX_KERNEL
+       bool "Linux Kernel"

 config BR2_TARGET_MXS_BOOTLETS_UBOOT
-	depends on BR2_TARGET_UBOOT
-	bool "U-boot bootloader"
+       depends on BR2_TARGET_UBOOT
+       bool "U-boot bootloader"

 endchoice

@@ -82,9 +82,9 @@ config BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD
 endchoice

 config BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD_NAME
-	string "Custom board name"
-	depends on BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD
-	help
-	  Name of the board to build the bootlets for
+       string "Custom board name"
+       depends on BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD
+       help
+         Name of the board to build the bootlets for

 endif
--- a/boot/syslinux/Config.in
+++ b/boot/syslinux/Config.in
@@ -7,14 +7,12 @@ config BR2_TARGET_SYSLINUX

 	  http://syslinux.org

-if BR2_TARGET_SYSLINUX
-
 config BR2_TARGET_SYSLINUX_ISOLINUX
 	bool "Install isolinux"
+	depends on BR2_TARGET_SYSLINUX
 	default y

 config BR2_TARGET_SYSLINUX_PXELINUX
 	bool "Install pxelinux"
+	depends on BR2_TARGET_SYSLINUX
 	default y
-
-endif
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################

-SYSLINUX_VERSION = 4.07
+SYSLINUX_VERSION = 4.06
 SYSLINUX_SOURCE  = syslinux-$(SYSLINUX_VERSION).tar.bz2
 SYSLINUX_SITE    = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/4.xx/

@@ -41,5 +41,9 @@ define HOST_SYSLINUX_INSTALL_CMDS
 	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) INSTALLROOT=$(HOST_DIR) install
 endef

+define HOST_SYSLINUX_CLEAN_CMDS
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) clean
+endef
+
 $(eval $(generic-package))
 $(eval $(host-generic-package))
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -18,10 +18,10 @@ choice
 	  Select the specific U-Boot version you want to use

 config BR2_TARGET_UBOOT_LATEST_VERSION
-	bool "2014.01"
+	bool "2013.07"

 config BR2_TARGET_UBOOT_CUSTOM_VERSION
-	bool "Custom version"
+       bool "Custom version"
 	help
 	  This option allows to use a specific official versions

@@ -31,44 +31,25 @@ config BR2_TARGET_UBOOT_CUSTOM_TARBALL
 config BR2_TARGET_UBOOT_CUSTOM_GIT
 	bool "Custom Git repository"

-config BR2_TARGET_UBOOT_CUSTOM_HG
-	bool "Custom Mercurial repository"
-
 endchoice

 config BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE
 	string "U-Boot version"
 	depends on BR2_TARGET_UBOOT_CUSTOM_VERSION

+if BR2_TARGET_UBOOT_CUSTOM_TARBALL
+
 config BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION
 	string "URL of custom U-Boot tarball"
-	depends on BR2_TARGET_UBOOT_CUSTOM_TARBALL
-
-if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG
-
-config BR2_TARGET_UBOOT_CUSTOM_REPO_URL
-	string "URL of custom repository"
-	default BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL \
-		if BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL != ""  # legacy
-
-config BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION
-	string "Custom repository version"
-	default BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION \
-		if BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION != ""  # legacy
-	help
-	  Revision to use in the typical format used by Git/Mercurial
-	  E.G. a sha id, a tag, branch, ..

 endif

 config BR2_TARGET_UBOOT_VERSION
 	string
-	default "2014.01"	if BR2_TARGET_UBOOT_LATEST_VERSION
-	default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \
-		if BR2_TARGET_UBOOT_CUSTOM_VERSION
+	default "2013.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
-	default BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION \
-		if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG
+	default $BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION if BR2_TARGET_UBOOT_CUSTOM_GIT

 config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR
 	string "custom patch dir"
@@ -79,6 +60,16 @@ config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR

 	  Most users may leave this empty

+if BR2_TARGET_UBOOT_CUSTOM_GIT
+
+config BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL
+	string "URL of custom Git repository"
+
+config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION
+	string "Custom Git version"
+
+endif
+
 choice
 	prompt "U-Boot binary format"
 	default BR2_TARGET_UBOOT_FORMAT_BIN
@@ -96,9 +87,6 @@ config BR2_TARGET_UBOOT_FORMAT_BIN
 config BR2_TARGET_UBOOT_FORMAT_IMG
 	bool "u-boot.img"

-config BR2_TARGET_UBOOT_FORMAT_IMX
-	bool "u-boot.imx"
-
 config BR2_TARGET_UBOOT_FORMAT_NAND_BIN
 	bool "u-boot-nand.bin"

@@ -251,20 +239,6 @@ config BR2_TARGET_UBOOT_ENVIMAGE_SIZE
 	  Size of envronment, can be prefixed with 0x for hexadecimal
 	  values.

-config BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT
-	bool "Environment has two copies"
-	help
-	  Some platforms define in their U-Boot configuration that the
-	  U-Boot environment should be duplicated in two locations (for
-	  extra safety). Check your U-Boot configuration for the
-	  CONFIG_ENV_ADDR_REDUND and CONFIG_ENV_SIZE_REDUND settings to
-	  see if this is the case for your platform.
-
-	  If it is the case, then you should enable this option to
-	  ensure that the U-Boot environment image generated by
-	  Buildroot is compatible with the "redundant environment"
-	  mechanism of U-Boot.
-
 endif # BR2_TARGET_UBOOT_ENVIMAGE

 endif # BR2_TARGET_UBOOT
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -8,7 +8,7 @@ UBOOT_VERSION    = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION))
 UBOOT_BOARD_NAME = $(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME))

 UBOOT_LICENSE = GPLv2+
-UBOOT_LICENSE_FILES = Licenses/gpl-2.0.txt
+UBOOT_LICENSE_FILES = COPYING

 UBOOT_INSTALL_IMAGES = YES

@@ -18,11 +18,8 @@ UBOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION))
 UBOOT_SITE    = $(patsubst %/,%,$(dir $(UBOOT_TARBALL)))
 UBOOT_SOURCE  = $(notdir $(UBOOT_TARBALL))
 else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT),y)
-UBOOT_SITE        = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL))
+UBOOT_SITE        = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL))
 UBOOT_SITE_METHOD = git
-else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_HG),y)
-UBOOT_SITE        = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL))
-UBOOT_SITE_METHOD = hg
 else
 # Handle stable official U-Boot versions
 UBOOT_SITE    = ftp://ftp.denx.de/pub/u-boot
@@ -43,8 +40,6 @@ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND_BIN),y)
 UBOOT_BIN          = u-boot-nand.bin
 else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y)
 UBOOT_BIN          = u-boot.img
-else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMX),y)
-UBOOT_BIN          = u-boot.imx
 else ifeq ($(BR2_TARGET_UBOOT_FORMAT_SB),y)
 UBOOT_BIN          = u-boot.sb
 UBOOT_MAKE_TARGET  = $(UBOOT_BIN)
@@ -120,7 +115,6 @@ define UBOOT_INSTALL_IMAGES_CMDS
 		cp -dpf $(@D)/$(BR2_TARGET_UBOOT_SPL_NAME) $(BINARIES_DIR)/)
 	$(if $(BR2_TARGET_UBOOT_ENVIMAGE),
 		$(HOST_DIR)/usr/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \
-		$(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \
 		-o $(BINARIES_DIR)/uboot-env.bin $(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE))
 endef

--- a/configs/arm_foundationv8_defconfig
+++ b/configs/arm_foundationv8_defconfig
@@ -8,8 +8,8 @@ BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS="vexpress-foundation-v8"
 BR2_TARGET_BOOT_WRAPPER_AARCH64_BOOTARGS="root=/dev/vda consolelog=9 console=ttyAMA0 rw"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.linaro.org/kernel/linaro-aarch64.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="7181edd0539e195f78adedbb6c3878f9f1e0c4bb"
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://git.linaro.org/kernel/linaro-aarch64.git"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="7181edd0539e195f78adedbb6c3878f9f1e0c4bb"
 BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
 BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
 BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="Image"
--- a/configs/armadeus_apf27_defconfig
+++ b/configs/armadeus_apf27_defconfig
@@ -4,7 +4,7 @@ BR2_arm926t=y

 # Lock down headers to avoid breaking with new defaults
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.13.2"
+BR2_DEFAULT_KERNEL_VERSION="3.8.4"

 # System
 BR2_TARGET_GENERIC_HOSTNAME="apf27"
@@ -20,13 +20,9 @@ BR2_TARGET_ROOTFS_UBI=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf27/linux-3.13.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf27/linux-3.8.config"
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xA0008000"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx27-apf27dev"
-
-# U-boot
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="apf27"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx27-apf27"
--- a/configs/armadeus_apf28_defconfig
+++ b/configs/armadeus_apf28_defconfig
@@ -4,7 +4,7 @@ BR2_arm926t=y

 # Lock down headers to avoid breaking with new defaults
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12.7"
+BR2_DEFAULT_KERNEL_VERSION="3.8.1"

 # System
 BR2_TARGET_GENERIC_HOSTNAME="apf28"
@@ -12,19 +12,18 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"

-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.7"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf28/linux-3.12.config"
-BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x40008000"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-apf28dev"
-
 # Filesystem
 BR2_TARGET_ROOTFS_UBIFS=y
 BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000
 BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=4227
 BR2_TARGET_ROOTFS_UBI=y
 BR2_TARGET_ROOTFS_UBI_SUBSIZE=0
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.1"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf28/linux-3.8.config"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-apf28dev"
--- a/configs/armadeus_apf51_defconfig
+++ b/configs/armadeus_apf51_defconfig
@@ -1,27 +0,0 @@
-# Architecture
-BR2_arm=y
-BR2_cortex_a8=y
-
-# Lock down headers to avoid breaking with new defaults
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12.6"
-
-# System
-BR2_TARGET_GENERIC_HOSTNAME="apf51"
-BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
-BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2"
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.6"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf51/linux-3.12.config"
-BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x90008000"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx51-apf51dev"
-
-# Filesystem
-BR2_TARGET_ROOTFS_UBIFS=y
-BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=135301
-BR2_TARGET_ROOTFS_UBI=y
--- a/configs/at91sam9260dfc_defconfig
+++ b/configs/at91sam9260dfc_defconfig
@@ -16,4 +16,4 @@ BR2_TARGET_UBOOT_BOARDNAME="at91sam9260ek_dataflash_cs0"

 # Kernel
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_DEFCONFIG="at91sam9260_9g20"
+BR2_LINUX_KERNEL_DEFCONFIG="at91sam9260"
--- a/configs/at91sam9261ek_defconfig
+++ b/configs/at91sam9261ek_defconfig
@@ -16,4 +16,4 @@ BR2_TARGET_UBOOT_BOARDNAME="at91sam9261ek_dataflash_cs0"

 # Kernel
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_DEFCONFIG="at91sam9261_9g10"
+BR2_LINUX_KERNEL_DEFCONFIG="at91sam9261"
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -3,8 +3,7 @@ BR2_avr32=y

 # Lock down kernel headers version, to match the kernel version used
 # below.
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.9.11"
+BR2_KERNEL_HEADERS_3_9=y

 # Filesystems
 BR2_TARGET_ROOTFS_JFFS2=y
--- a/configs/atstk100x_defconfig
+++ b/configs/atstk100x_defconfig
@@ -1,10 +1,6 @@
 # Architecture
 BR2_avr32=y

-# Lock to same version as kernel
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.9.11"
-
 # U-Boot
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="atstk1002"
@@ -14,7 +10,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2010.09"
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.11"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.35"
 BR2_LINUX_KERNEL_USE_DEFCONFIG=y
 BR2_LINUX_KERNEL_DEFCONFIG="atstk1002"

--- a/configs/beaglebone_defconfig
+++ b/configs/beaglebone_defconfig
@@ -16,13 +16,13 @@ BR2_TARGET_ROOTFS_EXT2=y

 # lock down headers to avoid breaking with new defaults
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12.10"
+BR2_DEFAULT_KERNEL_VERSION="3.8.12"

 # bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="am335x_evm"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.04"
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="MLO"
@@ -30,10 +30,9 @@ BR2_TARGET_UBOOT_SPL_NAME="MLO"
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="7f280334068b7c875ade51f8f3921ab311f0c824"
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="935f6c2f82056d538b528272e2bdbb5c08d69a58"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/beaglebone/linux-3.12.config"
-BR2_LINUX_KERNEL_ZIMAGE=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/beaglebone/linux-3.8.config"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-bone am335x-boneblack"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-bone"
--- a/configs/calao_snowball_defconfig
+++ b/configs/calao_snowball_defconfig
@@ -16,8 +16,8 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="snowball"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/igloocommunity/igloo-kernel"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="stable-linux-ux500-3.4"
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="https://github.com/igloocommunity/igloo-kernel"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="stable-linux-ux500-3.4"
 BR2_LINUX_KERNEL_PATCH="board/calao/snowball/"
 BR2_LINUX_KERNEL_DEFCONFIG="u8500"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
--- a/configs/calao_usb_a9260_defconfig
+++ b/configs/calao_usb_a9260_defconfig
@@ -10,8 +10,6 @@ BR2_TARGET_AT91BOOTSTRAP_NANDFLASH=y
 BR2_TARGET_BAREBOX=y
 BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="usb_a9260"
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.10"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/calao/usb-a9260/linux-3.7.4.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
--- a/configs/calao_usb_a9263_defconfig
+++ b/configs/calao_usb_a9263_defconfig
@@ -9,8 +9,6 @@ BR2_TARGET_AT91BOOTSTRAP_NANDFLASH=y
 BR2_TARGET_BAREBOX=y
 BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="usb_a9263"
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.10"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/calao/usb-a9263/linux-3.4.4.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
--- a/configs/calao_usb_a9g20_lpw_defconfig
+++ b/configs/calao_usb_a9g20_lpw_defconfig
@@ -10,8 +10,6 @@ BR2_TARGET_BAREBOX=y
 BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR="board/calao/usb-a9g20-lpw/"
 BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="usb_a9g20"
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.10"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/calao/usb-a9g20-lpw/linux-3.4.4.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
--- a/configs/cubieboard2_defconfig
+++ b/configs/cubieboard2_defconfig
@@ -1,40 +0,0 @@
-# Architecture
-BR2_arm=y
-BR2_cortex_a7=y
-
-# System configuration
-BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2"
-BR2_TARGET_GENERIC_ISSUE="Welcome to use Cubieboard!"
-BR2_TARGET_GENERIC_GETTY=y
-BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard/post-build.sh"
-
-# Additional tools
-BR2_PACKAGE_HOST_SUNXI_TOOLS=y
-BR2_PACKAGE_HOST_UBOOT_TOOLS=y
-BR2_PACKAGE_SUNXI_TOOLS=y
-BR2_PACKAGE_SUNXI_BOARDS=y
-BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE="a20/cubieboard2.fex"
-
-# Kernel headers
-BR2_KERNEL_HEADERS_3_4=y
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux-sunxi/linux-sunxi.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="5dda5145c877335e17bd9ca48954841acc0f785a"
-BR2_LINUX_KERNEL_VERSION="sunxi-3.4"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/cubietech/cubieboard/linux-cubieboard2.config"
-
-# Bootloaders
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="cubieboard2"
-BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_VERSION="sunxi"
-BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux-sunxi/u-boot-sunxi.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="b4bca5e0651b460a4511582f07a935cb48f74948"
-BR2_TARGET_UBOOT_FORMAT_BIN=y
-BR2_TARGET_UBOOT_SPL=y
-BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
--- a/configs/cubieboard_defconfig
+++ b/configs/cubieboard_defconfig
@@ -22,8 +22,8 @@ BR2_KERNEL_HEADERS_3_4=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux-sunxi/linux-sunxi.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="274a66a7bfcbaabb88d63e4eba161965383cc416"
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="https://github.com/linux-sunxi/linux-sunxi.git"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="274a66a7bfcbaabb88d63e4eba161965383cc416"
 BR2_LINUX_KERNEL_VERSION="sunxi-3.4"
 BR2_LINUX_KERNEL_DEFCONFIG="sun4i"

@@ -32,8 +32,8 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="cubieboard"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_VERSION="sunxi"
-BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux-sunxi/u-boot-sunxi.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="1a8ac55429f7f8cc9f100c1cf2dc0195cf81e76f"
+BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="https://github.com/linux-sunxi/u-boot-sunxi.git"
+BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="1a8ac55429f7f8cc9f100c1cf2dc0195cf81e76f"
 BR2_TARGET_UBOOT_FORMAT_BIN=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
--- a/configs/ea3250_defconfig
+++ b/configs/ea3250_defconfig
@@ -27,8 +27,8 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="ea3250"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_VERSION="master"
-BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.lpclinux.com/uboot-2009.03-lpc32xx"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="master"
+BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="git://git.lpclinux.com/uboot-2009.03-lpc32xx"
+BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="master"
 BR2_TARGET_UBOOT_FORMAT_BIN=y
 BR2_TARGET_LPC32XXCDL=y
 BR2_TARGET_LPC32XXCDL_BOARDNAME="ea3250"
@@ -39,8 +39,8 @@ BR2_TARGET_LPC32XXCDL_BOARDNAME="ea3250"
 #
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.lpclinux.com/linux-2.6.34-lpc32xx"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="master"
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://git.lpclinux.com/linux-2.6.34-lpc32xx"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="master"
 BR2_LINUX_KERNEL_VERSION="master"
 BR2_LINUX_KERNEL_PATCH=""
 BR2_LINUX_KERNEL_USE_DEFCONFIG=y
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Peter Korsgaard	8ab57bf933	Makefile: release: create tarball from current branch, not master To support stable bugfix releases. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2013-09-17 13:42:07 +02:00
Peter Korsgaard	ad2600ce21	Update for 2013.08.1 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2013-09-17 13:21:15 +02:00
Thomas Petazzoni	63344acefa	Makefile: make $(BUILD_DIR)/.root rule idempotent The $(BUILD_DIR)/.root rule is executed as part of the 'dirs' target. The 'dirs' target is re-executed at every execution of 'make external-deps', and make external-deps explicitly tells make to ignore targets that have already been made (through the -B option). This means that the $(BUILD_DIR)/.root rule has to be idempotant, which was not the case this the introduction of the lib32/lib64 symbolic link. Running 'make external-deps' three times in a row was sufficient to trigger an error due to symbolic links being incorrectly created. This patch fixes that. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2013-09-15 23:34:25 +02:00
Axel Lin	bd315a19ef	Config.in: Fixup after BR2_ELF2FLT got renamed to BR2_PACKAGE_HOST_ELF2FLT The BR2_ELF2FLT option has been renamed to BR2_PACKAGE_HOST_ELF2FLT, thus use the new name to fix dependency. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2013-09-11 12:23:37 +02:00
Martin Creutziger	f9edec63c5	ti-gfx.mk: correct typo There is a simple typo in package/ti-gfx/ti-gfx.mk, which the following patch corrects. Signed-off-by: Martin Creutziger <buildroot@martin.creutziger.net> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2013-09-11 12:23:21 +02:00
Samuel Martin	790beb354f	legacy: marked BR2_PACKAGE_GCC_TARGET and BR2_HAVE_DEVFILES as removed These 2 symbols were removed when the gcc has been converted to the Buildroot package infrastructures. Signed-off-by: Samuel Martin <s.martin49@gmail.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2013-09-11 12:22:59 +02:00