[oe-commits] Tom Rini : u-boot: Move the config target into do_configure

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 5b0d2716839c3d6a1c4b0a6eb5e4ebc313354828
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=5b0d2716839c3d6a1c4b0a6eb5e4ebc313354828

Author: Tom Rini <tom_rini at mentor.com>
Date:   Fri Aug 20 09:58:55 2010 -0700

u-boot: Move the config target into do_configure

Signed-off-by: Tom Rini <tom_rini at mentor.com>

---

 recipes/u-boot/u-boot-utils-native_1.2.0.bb |    3 +--
 recipes/u-boot/u-boot-utils_1.2.0.bb        |    3 +--
 recipes/u-boot/u-boot.inc                   |    5 ++++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/recipes/u-boot/u-boot-utils-native_1.2.0.bb b/recipes/u-boot/u-boot-utils-native_1.2.0.bb
index adc7ce3..771f31b 100644
--- a/recipes/u-boot/u-boot-utils-native_1.2.0.bb
+++ b/recipes/u-boot/u-boot-utils-native_1.2.0.bb
@@ -12,11 +12,10 @@ S = "${WORKDIR}/u-boot-${PV}"
 inherit native
 
 do_configure() {
-	:
+	oe_runmake Sandpoint8240_config
 }
 
 do_compile () {
-	oe_runmake Sandpoint8240_config
 	oe_runmake tools
 }
 
diff --git a/recipes/u-boot/u-boot-utils_1.2.0.bb b/recipes/u-boot/u-boot-utils_1.2.0.bb
index 7cf77b8..013de89 100644
--- a/recipes/u-boot/u-boot-utils_1.2.0.bb
+++ b/recipes/u-boot/u-boot-utils_1.2.0.bb
@@ -18,11 +18,10 @@ TARGET_LDFLAGS = ""
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-${PV}"
 
 do_configure() {
-        :
+        oe_runmake Sandpoint8240_config
 }
 
 do_compile () {
-        oe_runmake Sandpoint8240_config
         oe_runmake tools
 }
 
diff --git a/recipes/u-boot/u-boot.inc b/recipes/u-boot/u-boot.inc
index 323eaef..661bf36 100644
--- a/recipes/u-boot/u-boot.inc
+++ b/recipes/u-boot/u-boot.inc
@@ -17,11 +17,14 @@ UBOOT_BINARY ?= "u-boot.bin"
 UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.bin"
 UBOOT_SYMLINK ?= "u-boot-${MACHINE}.bin"
 
+do_configure () {
+	oe_runmake ${UBOOT_MACHINE}
+}
+
 do_compile () {
 	unset LDFLAGS
 	unset CFLAGS
 	unset CPPFLAGS
-	oe_runmake ${UBOOT_MACHINE}
 	oe_runmake all
 	oe_runmake tools env
 }