3 files changed, 75 insertions, 33 deletions
diff --git a/packages/uboot/u-boot_git.bb b/packages/uboot/u-boot_git.bb
new file mode 100644
index 0000000000..fa59bab085
--- /dev/null
+++ b/packages/uboot/u-boot_git.bb
@@ -0,0 +1,40 @@
+DESCRIPTION = "U-boot bootloader"
+PROVIDES = "virtual/bootloader"
+SECTION = "bootloader"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git "
+
+S = "${WORKDIR}/git"
+
+#EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CFLAGS="" CPPFLAGS="" LDFLAGS="""
+EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
+
+UBOOT_MACHINE ?= "${MACHINE}_config"
+UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+#inherit base
+
+do_compile () {
+	unset LDFLAGS
+	unset CFLAGS
+	unset CPPFLAGS
+	oe_runmake ${UBOOT_MACHINE}
+	oe_runmake all
+}
+
+do_stage() {
+	install -m 755 tools/mkimage ${STAGING_BINDIR_NATIVE}
+}
+
+do_deploy () {
+	install -d ${DEPLOY_DIR_IMAGE}
+	install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
+}
+do_deploy[dirs] = "${S}"
+addtask deploy before do_build after do_compile
diff --git a/packages/uboot/uboot-devkitidp-pxa255_cvs.bb b/packages/uboot/uboot-devkitidp-pxa255_cvs.bb
index a41d5d7082..4e50706087 100644
--- a/packages/uboot/uboot-devkitidp-pxa255_cvs.bb
+++ b/packages/uboot/uboot-devkitidp-pxa255_cvs.bb
@@ -1,4 +1,37 @@
-require uboot_cvs.bb
+BROKEN = "1"
+#not fetchable patch used
 
+DESCRIPTION = "U-boot bootloader"
+SECTION = "bootloader"
+PRIORITY = "optional"
+LICENSE = "GPL"
+SRCDATE = "20050818"
+PV = "0.0+cvs${SRCDATE}"
+PR = "r3"
+
+PROVIDES = "virtual/bootloader"
+
+S = "${WORKDIR}/u-boot"
+
+SRC_URI = "cvs://anonymous@u-boot.cvs.sourceforge.net/cvsroot/u-boot;module=u-boot \
+	   file://arm_flags.patch;patch=1 \
+	   ftp://ftp.accelent.com/pxa255_idp/uboot/u-boot-1.1.2-cvs20050818-r2-pxa255idp1.patch;patch=1"
+
+EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
+TARGET_LDFLAGS = ""
 UBOOT_MACHINE = "pxa255_idp_config"
-SRC_URI += "ftp://ftp.accelent.com/pxa255_idp/uboot/u-boot-1.1.2-cvs20050818-r2-pxa255idp1.patch;patch=1"
+
+inherit base
+
+do_compile () {
+	oe_runmake ${UBOOT_MACHINE}
+	oe_runmake all
+}
+
+do_deploy () {
+	install -d ${DEPLOY_DIR_IMAGE}
+	install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}-${DATETIME}.bin
+}
+do_deploy[dirs] = "${S}"
+addtask deploy before do_build after do_compile
+
diff --git a/packages/uboot/uboot_cvs.bb b/packages/uboot/uboot_cvs.bb
deleted file mode 100644
index 617babcf4a..0000000000
--- a/packages/uboot/uboot_cvs.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "U-boot bootloader"
-SECTION = "bootloader"
-PRIORITY = "optional"
-LICENSE = "GPL"
-PV = "0.0+cvs${SRCDATE}"
-PR = "r2"
-
-PROVIDES = "virtual/bootloader"
-
-S = "${WORKDIR}/u-boot"
-
-SRC_URI = "cvs://anonymous@u-boot.cvs.sourceforge.net/cvsroot/u-boot;module=u-boot \
-	   file://arm_flags.patch;patch=1"
-
-EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
-TARGET_LDFLAGS = ""
-UBOOT_MACHINE ?= "${MACHINE}"
-
-inherit base
-
-do_compile () {
-	oe_runmake ${UBOOT_MACHINE}
-	oe_runmake all
-}
-
-do_deploy () {
-	install -d ${DEPLOY_DIR_IMAGE}
-	install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}-${DATETIME}.bin
-}
-do_deploy[dirs] = "${S}"
-addtask deploy before do_build after do_compile