merge of '5b2edcba43123478f091eb514f24eff2c8635c68'

     and 'b744deb0b5dfbe71f24212b7326b921dbaa53b29'

2 files changed, 43 insertions, 15 deletions

diff --git a/packages/uboot-utils/files/turbostation/fw_env.config b/packages/uboot-utils/files/turbostation/fw_env.config
deleted file mode 100644
index 97ce8a87d4..0000000000
--- a/packages/uboot-utils/files/turbostation/fw_env.config
+++ /dev/null
@@ -1,15 +0,0 @@
-# Configuration file for fw_(printenv/saveenv) utility.
-# Up to two entries are valid, in this case the redundand
-# environment sector is assumed present.
-
-# MTD device name       Device offset   Env. size       Flash sector size
-
-# Primary U-Boot environment. You shouldn't need to touch this. If you touch this,
-# you should be *very* sure about what you're doing if you don't have a serial 
-# cable attached!
-# /dev/mtd4               0x00000          0x20000         0x20000
-
-# Secondary U-Boot environment. This is a *bit* more safe to modify, but can easily
-# render your turbostation unbootable! 
-
-/dev/mtd5		0x00000		0x20000		0x20000
\ No newline at end of file
diff --git a/packages/uboot/uboot-utils_1.1.2.bb b/packages/uboot/uboot-utils_1.1.2.bb
new file mode 100644
index 0000000000..8a5d7dce3c
--- /dev/null
+++ b/packages/uboot/uboot-utils_1.1.2.bb
@@ -0,0 +1,43 @@
+DESCRIPTION = "U-boot bootloader OS env. access tools for PPC"
+SECTION = "bootloaders"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "mtd-utils"
+PR = "r5"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/u-boot/u-boot-${PV}.tar.bz2 \
+	 file://fw_env.c.patch;patch=1 \
+	 file://tools-Makefile.patch;patch=1 \
+	 file://env-Makefile.patch;patch=1 \
+	 file://fw_env.config"
+
+S = "${WORKDIR}/u-boot-${PV}"
+EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
+TARGET_LDFLAGS = ""
+
+UBOOT_MACHINE ?= "${MACHINE}_config"
+
+inherit base
+
+do_configure() {
+	:
+}
+
+do_compile () {
+	oe_runmake Sandpoint8240_config
+	oe_runmake tools
+}
+
+# install mkimage for the kernel makefile
+do_stage() {
+	install -d ${STAGING_BINDIR_NATIVE}
+	install -m 755 ${S}/tools/mkimage ${STAGING_BINDIR_NATIVE}/
+}
+
+do_install () {
+	install -d	${D}/sbin
+	install -d	${D}${sysconfdir}
+	install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
+	install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_printenv
+	install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_setenv
+}