Rename uboot-utils to u-boot-utils-native. u-boot-utils now makes

target u-boot utility fw_setenv for one distro.

10 files changed, 69 insertions, 30 deletions

diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index aaa503edb9..ddd9b61791 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -1891,7 +1891,7 @@ PREFERRED_VERSION_u-boot-omap2430sdp ?= "1.1.4"
 PREFERRED_VERSION_u2nl ?= "1.3"
 PREFERRED_VERSION_uae4all ?= "0.7.1"
 PREFERRED_VERSION_ubahnnav ?= "0.4.1"
-PREFERRED_VERSION_uboot-utils ?= "1.2.0"
+PREFERRED_VERSION_u-boot-utils-native ?= "1.2.0"
 PREFERRED_VERSION_udev ?= "092"
 PREFERRED_VERSION_udev-hostap-cs-vcc-workaround ?= "1.0"
 PREFERRED_VERSION_udhcp ?= "0.9.8"
diff --git a/packages/linux/em-x270_2.6.23.bb b/packages/linux/em-x270_2.6.23.bb
index a9d6ee7905..fcef7280d0 100644
--- a/packages/linux/em-x270_2.6.23.bb
+++ b/packages/linux/em-x270_2.6.23.bb
@@ -3,8 +3,8 @@ require linux.inc
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Compulab EM-X270 system"
 LICENSE = "GPL"
-DEPENDS = "uboot-utils"
-PR = "r0"
+DEPENDS = "u-boot-utils-native"
+PR = "r1"
 
 KERNEL_IMAGETYPE = "uImage"
 
diff --git a/packages/linux/linux-bd-neon-2.6_2.6.22.bb b/packages/linux/linux-bd-neon-2.6_2.6.22.bb
index 6d2472935f..46fa4295b6 100644
--- a/packages/linux/linux-bd-neon-2.6_2.6.22.bb
+++ b/packages/linux/linux-bd-neon-2.6_2.6.22.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "2.6 Linux Kernel for Boundary Devices NEON Board"
 SECTION = "kernel"
 HOMEPAGE = "N/A"
 LICENSE = "GPL"
-DEPENDS += "uboot-utils"
+DEPENDS += "u-boot-utils-native"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \
            http://www.boundarydevices.com/boundary-2.6.22-2007-07-22.patch.bz2;patch=1 \
diff --git a/packages/linux/linux-gumstix_2.6.15.bb b/packages/linux/linux-gumstix_2.6.15.bb
index 9a9a4d4df3..3e0302fe5f 100644
--- a/packages/linux/linux-gumstix_2.6.15.bb
+++ b/packages/linux/linux-gumstix_2.6.15.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "Linux Kernel for the Gumstix"
 SECTION = "kernel"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
-DEPENDS = "uboot-utils"
+DEPENDS = "u-boot-utils-native"
 
 COMPATIBLE_MACHINE = "gumstix"
 
diff --git a/packages/linux/linux-omap.inc b/packages/linux/linux-omap.inc
index 83f134b878..52b0d27a6d 100644
--- a/packages/linux/linux-omap.inc
+++ b/packages/linux/linux-omap.inc
@@ -3,7 +3,7 @@ DESCRIPTION = "Linux kernel for OMAP processors"
 LICENSE = "GPL"
 #DEPENDS = ${@['u-boot','u-boot-omap2430sdp'][bb.data.getVar('MACHINE',d,1) == 'omap2430sdp']}
 
-DEPENDS = uboot-utils
+DEPENDS = "u-boot-utils-native"
 
 inherit kernel
 
diff --git a/packages/linux/linux-turbostation_2.6.20.2.bb b/packages/linux/linux-turbostation_2.6.20.2.bb
index 84701e4a6a..91080752fc 100644
--- a/packages/linux/linux-turbostation_2.6.20.2.bb
+++ b/packages/linux/linux-turbostation_2.6.20.2.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Linux Kernel for the QNAP TurboStation platform"
 SECTION = "kernel"
 LICENSE = "GPL"
-DEPENDS = "uboot-utils"
-PR = "r1"
+DEPENDS = "u-boot-utils-native"
+PR = "r2"
 
 COMPATIBLE_MACHINE = "turbostation"
 
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 33d93f2921..dc071f16ce 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -295,7 +295,7 @@ RRECOMMENDS_task-base-usbhost = "\
     kernel-module-usb-storage "
 
 RDEPENDS_task-base-uboot = "\
-    uboot-utils"
+    u-boot-utils-native"
 
 RDEPENDS_task-base-redboot = "\
     fis"
diff --git a/packages/uboot/u-boot-1.2.0/env-Makefile.patch b/packages/uboot/u-boot-1.2.0/env-Makefile.patch
index ad3a6b39a3..f6e9cb39ae 100644
--- a/packages/uboot/u-boot-1.2.0/env-Makefile.patch
+++ b/packages/uboot/u-boot-1.2.0/env-Makefile.patch
@@ -1,24 +1,19 @@
---- u-boot-1.1.2.orig/tools/env/Makefile	2003-06-27 14:32:48.000000000 -0700
-+++ u-boot-1.1.2/tools/env/Makefile	2006-11-08 12:33:43.000000000 -0800
-@@ -27,7 +27,7 @@
- all:	fw_printenv
+--- u-boot-1.2.0/tools/env/Makefile.orig	2007-12-12 12:52:51.508745236 -0800
++++ u-boot-1.2.0/tools/env/Makefile	2007-12-12 12:54:09.997218038 -0800
+@@ -31,7 +31,7 @@
+ all:	$(obj)fw_printenv
  
- fw_printenv:	$(SOURCES) $(HEADERS)
--	$(CROSS_COMPILE)gcc -Wall -DUSE_HOSTCC $(SOURCES) -o fw_printenv
-+	$(CROSS_COMPILE)gcc $(TARGET_CFLAGS) -idirafter ../../include -Wall -DUSE_HOSTCC $(SOURCES) -o fw_printenv
+ $(obj)fw_printenv:	$(SRCS) $(HEADERS)
+-	$(CROSS_COMPILE)gcc $(CPPFLAGS) $(SRCS) -o $(obj)fw_printenv
++	$(CROSS_COMPILE)gcc $(TARGET_CFLAGS) -idirafter ../../include -DUSE_HOSTCC $(SRCS) -o $(obj)fw_printenv
  
  clean:
- 	rm -f fw_printenv crc32.c
-@@ -37,9 +37,9 @@
+ 	rm -f $(obj)fw_printenv $(obj)crc32.c
+@@ -43,6 +43,6 @@
  
- #########################################################################
- 
--.depend:	Makefile $(SOURCES)
--		$(CC) -M $(HOST_CFLAGS) $(CPPFLAGS) -DUSE_HOSTCC $(SOURCES) > $@
-+#.depend:	Makefile $(SOURCES)
-+#		$(CC) -M $(HOST_CFLAGS) $(TARGET_CPPFLAGS) -DUSE_HOSTCC $(SOURCES) > $@
+ include $(TOPDIR)/rules.mk
  
--sinclude .depend
-+#sinclude .depend
+-sinclude $(obj).depend
++#sinclude $(obj).depend
  
  #########################################################################
diff --git a/packages/uboot/uboot-utils_1.2.0.bb b/packages/uboot/u-boot-utils-native_1.2.0.bb
index fe9b3aca26..02f9748ae3 100644
--- a/packages/uboot/uboot-utils_1.2.0.bb
+++ b/packages/uboot/u-boot-utils-native_1.2.0.bb
@@ -1,13 +1,16 @@
-DESCRIPTION = "U-boot bootloader OS env. access tools for PPC"
+DESCRIPTION = "U-boot bootloader mkimage utility"
 SECTION = "bootloaders"
 PRIORITY = "optional"
 LICENSE = "GPL"
-PR = "r6"
+ALLOW_EMPTY = "1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2"
 
 S = "${WORKDIR}/u-boot-${PV}"
 
+inherit native
+
 do_configure() {
 	:
 }
diff --git a/packages/uboot/u-boot-utils_1.2.0.bb b/packages/uboot/u-boot-utils_1.2.0.bb
new file mode 100644
index 0000000000..e86fc60311
--- /dev/null
+++ b/packages/uboot/u-boot-utils_1.2.0.bb
@@ -0,0 +1,41 @@
+DESCRIPTION = "U-boot bootloader OS env. access tools"
+SECTION = "bootloaders"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS_openprotium = "mtd-utils"
+PR = "r7"
+
+SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2"
+SRC_URI_append_openprotium = " \
+        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}"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-${PV}"
+
+EXTRA_OEMAKE_openprotium = "CROSS_COMPILE=${TARGET_PREFIX}"
+
+do_configure() {
+        :
+}
+
+do_compile () {
+        oe_runmake Sandpoint8240_config
+        oe_runmake tools
+}
+
+do_install () {
+        :
+}
+
+do_install_openprotium () {
+        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
+}
+