From 939a0ce111bbb3d604154ccebde9e3a85393aae8 Mon Sep 17 00:00:00 2001
From: Floris Bos <bos@je-eigen-domein.nl>
Date: Wed, 2 Jan 2013 14:28:02 +0100
Subject: [PATCH] Update README.md to list build requirements. Let buildroot
 build uboot-tools for the host system

---
 README.md                 | 7 +++++++
 buildroot-2012.05/.config | 4 ++--
 rebuild-berryboot.sh      | 4 +---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 436ab8bfb..769184dc9 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,13 @@ buildroot-2012.05 - build system to create a minimal Linux operating system to r
 buildroot-2012.05/package/berrybootgui2/init - script that gets executed on boot, starts BerrybootGUI  
 ```
 
+==
+Build requirements
+==
+
+Berryboot uses Buildroot to build a minimal Linux operating system to run under.
+Buildroot requires that the following packages are installed: http://www.buildroot.org/downloads/manual/manual.html#requirement
+
 ===
 To build for Raspberry Pi
 ===
diff --git a/buildroot-2012.05/.config b/buildroot-2012.05/.config
index 64bf2fa55..810f5906c 100644
--- a/buildroot-2012.05/.config
+++ b/buildroot-2012.05/.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2012.05-g32dc4de-dirty Configuration
+# Buildroot 2012.05-gd25a618-dirty Configuration
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_arm=y
@@ -1057,7 +1057,7 @@ BR2_PACKAGE_CRYPTSETUP=y
 # BR2_PACKAGE_HOST_LPC3250LOADER is not set
 # BR2_PACKAGE_HOST_OPENOCD is not set
 # BR2_PACKAGE_HOST_SAM_BA is not set
-# BR2_PACKAGE_HOST_UBOOT_TOOLS is not set
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 
 #
 # Filesystem images
diff --git a/rebuild-berryboot.sh b/rebuild-berryboot.sh
index 5d088cea3..10b77057a 100755
--- a/rebuild-berryboot.sh
+++ b/rebuild-berryboot.sh
@@ -2,8 +2,6 @@
 
 set -e
 
-command -v mkimage >/dev/null || { echo "mkimage not found. Install u-boot-tools." ; exit 1; }
-
 if [ ! -e output/LICENSE.berryboot ]; then
 	cp -f LICENSE.berryboot output
 fi
@@ -23,7 +21,7 @@ cp output/images/shared.tgz ../output
 #cp output/images/zImage ../output/kernel_berryboot.img
 cp output/images/zImage ../output/kernel_rpi_aufs.img
 #cp output/images/rootfs.cpio.gz ../output/berryboot.img
-mkimage -A arm -T ramdisk -C none -n "uInitrd" -d output/images/rootfs.cpio.gz ../output/berryboot.img
+output/host/usr/bin/mkimage -A arm -T ramdisk -C none -n "uInitrd" -d output/images/rootfs.cpio.gz ../output/berryboot.img
 
 cd ..
 if [ ! -e output/start.elf ]; then