Merge branch 'thingos' into dev

board/bananapim1/cpinitramfs.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cp $IMG_DIR/rootfs.cpio.uboot $BOARD_DIR/uInitrd
+

board/common/mkimage.sh

@@ -11,19 +11,21 @@ function msg() {
     echo " * $1"
 }
 
-PART_START=${PART_START:-2048} # 2048 sectors = 1MB
+BOOT_START=${BOOT_START:-2048} # 2048 sectors = 1MB
 
 BOOT_SRC=$IMG_DIR/boot
 BOOT=$IMG_DIR/.boot
 BOOT_IMG=$IMG_DIR/boot.img
-BOOT_SIZE="20" # MB
+BOOT_SIZE="20" # MB - reserved up to 50 MB
 
+ROOT_START=$((50 * 2048)) # 50 MB
 ROOT_SRC=$IMG_DIR/rootfs.tar
 ROOT=$IMG_DIR/.root
 ROOT_IMG=$IMG_DIR/root.img
 ROOT_SIZE="200" # MB
 
-DISK_SIZE=$((BOOT_SIZE + ROOT_SIZE + 10))
+GUARD_SIZE="10" # MB
+DISK_SIZE=$((BOOT_SIZE + ROOT_SIZE + GUARD_SIZE))
 
 COMMON_DIR=$(cd $IMG_DIR/../../../board/common; pwd)
 OS_NAME=$(source $COMMON_DIR/overlay/etc/version && echo $os_short_name)
@@ -118,19 +120,18 @@ fi
 loop_dev=$(losetup -f --show $DISK_IMG)
 
 msg "partitioning disk"
-root_part_start=$(($PART_START + $BOOT_SIZE * 2048))
 set +e
 fdisk -u=sectors $loop_dev <<END
 o
 n
 p
 1
-${PART_START}
+${BOOT_START}
 +${BOOT_SIZE}M
 n
 p
 2
-${root_part_start}
+${ROOT_START}
 +${ROOT_SIZE}M
 
 t

board/common/overlay/etc/init.d/S00datapart

@@ -23,8 +23,7 @@ case "$1" in
         test -b $data_dev && exit 0
 
         msg_begin "Creating data partition"
-        root_end=$(partx -s -g -o END $root_dev)
-        data_start=$(($root_end + 1))
+        data_start=$((512 * 2048)) # up to 512MB reserved for boot + root
         echo -e "n
             p
             3

board/common/overlay/sbin/fwupdate

@@ -37,7 +37,6 @@ SYS_VERSION_FILE=/etc/version
 SYS_BOARD_FILE=/etc/board
 OS_CONF=/data/etc/os.conf
 
-BOOT_DEV=$(mount | grep /boot | cut -d ' ' -f 1)
 MIN_FREE_DISK=$((500*1024))  # 500 MB
 VER_FILE=version
 ROOT_INFO_FILE=root_info
@@ -61,6 +60,21 @@ DD_LOG_FILE=dd.log
 DD_PID_FILE=dd.pid
 
 
+#### disk & partition devices ####
+
+BOOT_DEV=$(mount | grep /boot | cut -d ' ' -f 1)
+ROOT_DEV=${BOOT_DEV:0:-1}2
+DISK_DEV=$(mount | grep /boot | cut -d ' ' -f 1)
+if [[ "$ROOT_DEV" =~ ^([/a-z0-9]+)(p[0-9])$ ]]; then  # e.g. /dev/mmcblk0p2
+    DISK_DEV=${BASH_REMATCH[1]}
+elif [[ "$ROOT_DEV" =~ ^([/a-z0-9]+)([0-9])$ ]]; then  # e.g. /dev/sdc2
+    DISK_DEV=${BASH_REMATCH[1]}
+else
+    echo "cannot identify disk device from $ROOT_DEV" 1>&2
+    exit 1
+fi
+
+
 #### versions ####
 
 function show_versions() {
@@ -69,7 +83,7 @@ function show_versions() {
     show_json=$1
   
     # the /usr/libexec/list-versions-* helpers return a table with the following format:
-    #     <version>|<prerelease>|<board>|<url>
+    #     <version>|<prerelease>|<board>|<url>|<date>
     versions=$(FW_USERNAME=$os_firmware_username FW_PASSWORD=$os_firmware_password \
                /usr/libexec/list-versions-$os_firmware_method $os_firmware_repo)
 
@@ -218,6 +232,34 @@ function do_extract() {
         cat $DECOMPRESS_LOG_FILE
         exit 1
     fi
+    
+    # verify available partition space
+    
+    fw_boot_info=$(fdisk --bytes -l -o device,start,end,size $FW_DIR/$FW_FILE_EXTR | grep "${FW_FILE_EXTR}1")
+    fw_boot_info=($fw_boot_info)
+    fw_boot_size=${fw_boot_info[3]}
+
+    fw_root_info=$(fdisk --bytes -l -o device,start,end,size $FW_DIR/$FW_FILE_EXTR | grep "${FW_FILE_EXTR}2")
+    fw_root_info=($fw_root_info)
+    fw_root_size=${fw_root_info[3]}
+    
+    disk_boot_info=$(fdisk --bytes -l -o device,start,end,size $DISK_DEV | grep $BOOT_DEV)
+    disk_boot_info=($disk_boot_info)
+    disk_boot_size=${disk_boot_info[3]}
+    
+    disk_root_info=$(fdisk --bytes -l -o device,start,end,size $DISK_DEV | grep $ROOT_DEV)
+    disk_root_info=($disk_root_info)
+    disk_root_size=${disk_root_info[3]}
+    
+    if [[ $disk_boot_size -lt $fw_boot_size ]]; then
+        echo "not enough space on boot partition ($fw_boot_size needed, $disk_boot_size available)" 1>&2
+        exit 1
+    fi
+
+    if [[ $disk_root_size -lt $fw_root_size ]]; then
+        echo "not enough space on root partition ($fw_root_size needed, $disk_root_size available)" 1>&2
+        exit 1
+    fi
 
     # TODO verify hash
 }

board/nanopineo/cpinitramfs.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cp $IMG_DIR/rootfs.cpio.uboot $BOARD_DIR/uInitrd
+

board/nanopineo/mkimage.sh

@@ -7,7 +7,7 @@ export BOARD=$(basename $BOARD_DIR)
 export IMG_DIR=$BOARD_DIR/../../output/$BOARD/images/
 export UBOOT_BIN=$BOARD_DIR/u-boot-with-spl.bin
 export UBOOT_SEEK=16
-export PART_START=40960
+export BOOT_START=40960
 source $COMMON_DIR/mkimage.sh
 
 

board/nanopineo2/cpinitramfs.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cp $IMG_DIR/rootfs.cpio.uboot $BOARD_DIR/uInitrd
+

board/nanopineo2/mkimage.sh

@@ -7,7 +7,7 @@ export BOARD=$(basename $BOARD_DIR)
 export IMG_DIR=$BOARD_DIR/../../output/$BOARD/images/
 export UBOOT_BIN=$BOARD_DIR/u-boot-with-spl.bin
 export UBOOT_SEEK=16
-export PART_START=40960
+export BOOT_START=40960
 source $COMMON_DIR/mkimage.sh
 
 

board/odroidc1/cpinitramfs.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cp $IMG_DIR/rootfs.cpio.uboot $BOARD_DIR/uInitrd
+

board/odroidc2/cpinitramfs.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cp $IMG_DIR/rootfs.cpio.uboot $BOARD_DIR/uInitrd
+

board/odroidxu4/cpinitramfs.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cp $IMG_DIR/rootfs.cpio.uboot $BOARD_DIR/uInitrd
+

board/orangepione/boot-fwupdater.cmd

@@ -1,7 +1,7 @@
 setenv bootargs earlyprintk console=tty1 root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1
 
 fatload mmc 0 $kernel_addr_r zImage
-fatload mmc 0 $ramdisk_addr_r rootfs.cpio.uboot
+fatload mmc 0 $ramdisk_addr_r uInitrd
 fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-one.dtb
 
 bootz $kernel_addr_r $ramdisk_addr_r $fdt_addr_r

board/orangepione/cpinitramfs.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cp $IMG_DIR/rootfs.cpio.uboot $BOARD_DIR/uInitrd
+

board/orangepione/mkimage.sh

@@ -7,7 +7,7 @@ export BOARD=$(basename $BOARD_DIR)
 export IMG_DIR=$BOARD_DIR/../../output/$BOARD/images/
 export UBOOT_BIN=$IMG_DIR/u-boot-sunxi-with-spl.bin
 export UBOOT_SEEK=16
-export PART_START=40960
+export BOOT_START=40960
 source $COMMON_DIR/mkimage.sh
 
 

board/pine64/cpinitramfs.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cp $IMG_DIR/rootfs.cpio.uboot $BOARD_DIR/uInitrd
+

board/pine64/mkimage.sh

@@ -7,7 +7,7 @@ export BOARD=$(basename $BOARD_DIR)
 export IMG_DIR=$BOARD_DIR/../../output/$BOARD/images/
 export UBOOT_BIN=$BOARD_DIR/u-boot-with-dtb.bin
 export UBOOT_SEEK=38192
-export PART_START=40960
+export BOOT_START=40960
 BOOT0=$BOARD_DIR/boot0.bin
 
 source $COMMON_DIR/mkimage.sh

board/raspberrypi/cpinitramfs.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cp $IMG_DIR/rootfs.cpio.gz $BOARD_DIR/fwupdater.gz
+

board/raspberrypi2/cpinitramfs.sh

@@ -0,0 +1 @@
+../raspberrypi/cpinitramfs.sh

board/raspberrypi3/cpinitramfs.sh

@@ -0,0 +1 @@
+../raspberrypi/cpinitramfs.sh

build.sh

@@ -1,10 +1,11 @@
 #!/bin/bash
 
 if [ -z "$1" ]; then
-    echo "Usage: $0 <board|all> [mkimage|mkrelease|clean-target|make-targets...]"
+    echo "Usage: $0 <{board}|all|boards> [mkimage|mkrelease|clean-target|initramfs|make-targets...]"
     echo "    mkimage - creates the OS image (.img)"
     echo "    mkrelease - creates the compressed OS image (.img.gz, .img.xz)"
     echo "    clean-target - removes the target dir, preserving the package build dirs"
+    echo "    initramfs - builds the initramfs image; extra arguments will be passed internally to BuildRoot"
     echo ""
     echo "    for other make targets, see the BuildRoot manual"
     exit 1
@@ -37,8 +38,17 @@ else
     osversion=$(source $basedir/board/common/overlay/etc/version && echo $os_version)
 fi
 
-# when the special "all" keyword is used for board,
-# all boards are processed, in turn
+# when the special "boards" keyword is used for board, simply list all known boards
+if [ "$board" == "boards" ]; then
+    boards=$(ls $basedir/configs/*_defconfig | grep -v initramfs | grep -oE '\w+_defconfig$' | cut -d '_' -f 1)
+    for b in $boards; do
+        echo $b
+    done
+
+    exit 0
+fi
+
+# when the special "all" keyword is used for board, all boards are processed, in turn
 if [ "$board" == "all" ]; then
     boards=$(ls $basedir/configs/*_defconfig | grep -v initramfs | grep -oE '\w+_defconfig$' | cut -d '_' -f 1)
     for b in $boards; do
@@ -119,6 +129,13 @@ elif [ "$target" == "clean-target" ]; then
 
     echo "target is clean"
 
+elif [[ "$target" == initramfs* ]]; then
+    extra_args=${target:10}
+    $0 ${board}_initramfs $extra_args
+    if [ -z "$extra_args" ] && [ -x $boarddir/cpinitramfs.sh ]; then
+        IMG_DIR=$basedir/output/${board}_initramfs/images/ BOARD_DIR=$boarddir $boarddir/cpinitramfs.sh
+    fi
+
 elif [ "$target" == "all" ]; then
     make O=$outputdir all
 

configs/bananapim1_defconfig

@@ -12,7 +12,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/bananapim1/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.70"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.136"
 BR2_LINUX_KERNEL_PATCH="board/bananapim1/linux-usb-host.patch.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/bananapim1/kernel.config"

configs/bananapim1_initramfs_defconfig

@@ -1,7 +1,6 @@
 BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_FPU_NEON_VFPV4=y
-BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-bananapim1-initramfs"
 BR2_OPTIMIZE_2=y
@@ -9,6 +8,8 @@ BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TARGET_OPTIMIZATION="-pipe"
 BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/bananapim1/overlay-initramfs"
 BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config"
+BR2_PACKAGE_UTIL_LINUX=y
+BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y
 BR2_TARGET_ROOTFS_CPIO=y
 BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
 # BR2_TARGET_ROOTFS_TAR is not set

configs/nanopineo2_initramfs_defconfig

@@ -6,6 +6,8 @@ BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TARGET_OPTIMIZATION="-pipe"
 BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/nanopineo2/overlay-initramfs"
 BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config"
+BR2_PACKAGE_UTIL_LINUX=y
+BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y
 BR2_TARGET_ROOTFS_CPIO=y
 BR2_TARGET_ROOTFS_CPIO_GZIP=y
 BR2_TARGET_ROOTFS_CPIO_UIMAGE=y

configs/nanopineo_initramfs_defconfig

@@ -8,6 +8,8 @@ BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TARGET_OPTIMIZATION="-pipe"
 BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/nanopineo/overlay-initramfs"
 BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config"
+BR2_PACKAGE_UTIL_LINUX=y
+BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y
 BR2_TARGET_ROOTFS_CPIO=y
 BR2_TARGET_ROOTFS_CPIO_GZIP=y
 BR2_TARGET_ROOTFS_CPIO_UIMAGE=y

configs/odroidc1_initramfs_defconfig

@@ -3,7 +3,6 @@ BR2_cortex_a5=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_FPU_NEON_VFPV4=y
-BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-odroidc1-initramfs"
 BR2_OPTIMIZE_2=y
@@ -19,6 +18,8 @@ BR2_TOOLCHAIN_EXTERNAL_CXX=y
 BR2_TARGET_OPTIMIZATION="-pipe"
 BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/odroidc1/overlay-initramfs"
 BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config"
+BR2_PACKAGE_UTIL_LINUX=y
+BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y
 BR2_TARGET_ROOTFS_CPIO=y
 BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
 # BR2_TARGET_ROOTFS_TAR is not set

configs/odroidc2_initramfs_defconfig

@@ -1,5 +1,4 @@
 BR2_aarch64=y
-BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-odroidc2-initramfs"
 BR2_OPTIMIZE_2=y
@@ -7,6 +6,8 @@ BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TARGET_OPTIMIZATION="-pipe"
 BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/odroidc2/overlay-initramfs"
 BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config"
+BR2_PACKAGE_UTIL_LINUX=y
+BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y
 BR2_TARGET_ROOTFS_CPIO=y
 BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
 # BR2_TARGET_ROOTFS_TAR is not set

configs/odroidxu4_initramfs_defconfig

@@ -1,7 +1,6 @@
 BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_FPU_NEON_VFPV4=y
-BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-odroidxu4-initramfs"
 BR2_OPTIMIZE_2=y
@@ -9,6 +8,8 @@ BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TARGET_OPTIMIZATION="-pipe"
 BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/odroidxu4/overlay-initramfs"
 BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config"
+BR2_PACKAGE_UTIL_LINUX=y
+BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y
 BR2_TARGET_ROOTFS_CPIO=y
 BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
 # BR2_TARGET_ROOTFS_TAR is not set

configs/orangepione_initramfs_defconfig

@@ -8,6 +8,8 @@ BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TARGET_OPTIMIZATION="-pipe"
 BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/orangepione/overlay-initramfs"
 BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config"
+BR2_PACKAGE_UTIL_LINUX=y
+BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y
 BR2_TARGET_ROOTFS_CPIO=y
 BR2_TARGET_ROOTFS_CPIO_GZIP=y
 BR2_TARGET_ROOTFS_CPIO_UIMAGE=y

configs/pine64_initramfs_defconfig

@@ -1,5 +1,4 @@
 BR2_aarch64=y
-BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-pine64-initramfs"
 BR2_OPTIMIZE_2=y
@@ -7,7 +6,8 @@ BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TARGET_OPTIMIZATION="-pipe"
 BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/pine64/overlay-initramfs"
 BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config"
+BR2_PACKAGE_UTIL_LINUX=y
+BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y
 BR2_TARGET_ROOTFS_CPIO=y
 BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
 # BR2_TARGET_ROOTFS_TAR is not set
-

configs/raspberrypi2_initramfs_defconfig

@@ -0,0 +1,21 @@
+BR2_arm=y
+BR2_arm1176jzf_s=y
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-raspberrypi-initramfs"
+BR2_OPTIMIZE_2=y
+BR2_STATIC_LIBS=y
+BR2_KERNEL_HEADERS_4_4=y
+# BR2_UCLIBC_INSTALL_UTILS is not set
+BR2_BINUTILS_VERSION_2_31_X=y
+BR2_GCC_VERSION_5_X=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_TARGET_OPTIMIZATION="-pipe"
+BR2_TARGET_GENERIC_HOSTNAME=""
+BR2_TARGET_GENERIC_ISSUE=""
+BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/raspberrypi/overlay-initramfs"
+BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config"
+BR2_PACKAGE_UTIL_LINUX=y
+BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y
+BR2_TARGET_ROOTFS_CPIO=y
+BR2_TARGET_ROOTFS_CPIO_GZIP=y
+# BR2_TARGET_ROOTFS_TAR is not set

configs/raspberrypi3_initramfs_defconfig

@@ -0,0 +1,21 @@
+BR2_arm=y
+BR2_arm1176jzf_s=y
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-raspberrypi-initramfs"
+BR2_OPTIMIZE_2=y
+BR2_STATIC_LIBS=y
+BR2_KERNEL_HEADERS_4_4=y
+# BR2_UCLIBC_INSTALL_UTILS is not set
+BR2_BINUTILS_VERSION_2_31_X=y
+BR2_GCC_VERSION_5_X=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_TARGET_OPTIMIZATION="-pipe"
+BR2_TARGET_GENERIC_HOSTNAME=""
+BR2_TARGET_GENERIC_ISSUE=""
+BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/raspberrypi/overlay-initramfs"
+BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config"
+BR2_PACKAGE_UTIL_LINUX=y
+BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y
+BR2_TARGET_ROOTFS_CPIO=y
+BR2_TARGET_ROOTFS_CPIO_GZIP=y
+# BR2_TARGET_ROOTFS_TAR is not set

configs/raspberrypi_initramfs_defconfig

@@ -1,20 +1,24 @@
 BR2_arm=y
 BR2_arm1176jzf_s=y
-BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-raspberrypi-initramfs"
 BR2_OPTIMIZE_2=y
-BR2_STATIC_LIBS=y
-BR2_KERNEL_HEADERS_4_4=y
-# BR2_UCLIBC_INSTALL_UTILS is not set
-BR2_BINUTILS_VERSION_2_26_X=y
-BR2_GCC_VERSION_5_X=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/raspberrypi/tools/archive/5caa7046982f0539cf5380f94da04b31129ed521.tar.gz"
+BR2_TOOLCHAIN_EXTERNAL_REL_BIN_PATH="arm-bcm2708/arm-linux-gnueabihf/bin"
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-linux-gnueabihf"
+BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
 BR2_TARGET_OPTIMIZATION="-pipe"
 BR2_TARGET_GENERIC_HOSTNAME=""
 BR2_TARGET_GENERIC_ISSUE=""
 BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/raspberrypi/overlay-initramfs"
 BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config"
+BR2_PACKAGE_UTIL_LINUX=y
+BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y
 BR2_TARGET_ROOTFS_CPIO=y
 BR2_TARGET_ROOTFS_CPIO_GZIP=y
 # BR2_TARGET_ROOTFS_TAR is not set