[oe-commits] Leon Woestenberg : linux-libc-headers-nios2-2.6.28: Add hardware. mk to workaround script.

[git version control]

Module: openembedded.git
Branch: nios2
Commit: be324b76b2ee0514fde61830a651a3d5036b575e
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=be324b76b2ee0514fde61830a651a3d5036b575e

Author: Leon Woestenberg <leon at sidebranch.com>
Date:   Wed Nov 25 22:37:20 2009 +0100

linux-libc-headers-nios2-2.6.28: Add hardware.mk to workaround script.

The script that interprets system.ptf asks two additional questions that
cannot be automated. It used to accept 4 arguments rather than 2 to
automated this, no idea why these were ditched.

Signed-off-by: Leon Woestenberg <leon at sidebranch.com>

---

 conf/distro/include/sane-srcrevs.inc               |    3 ++-
 .../linux-libc-headers-nios2-2.6.28/hardware.mk    |    3 +++
 .../linux-libc-headers_nios2-2.6.28.bb             |    8 ++++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index cbe6799..95e43f5 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -160,7 +160,8 @@ SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-eten ?= "ab2d414f4f13816af0ec0401b608133ca946624a"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1089"
-SRCREV_pn-linux-libs-headers_nios2 = "3146b39c185f8a436d430132457e84fa1d8f8208"
+SRCREV_pn-linux-libs-headers = "d01303a1035a39e445007c7522d89ad985c4153c"
+SRCREV_pn-linux-libs-headers_nios2 = "d01303a1035a39e445007c7522d89ad985c4153c"
 SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
 SRCREV_pn-linux-openmoko-2.6.28 ?= "8aa6cdde17381dd8865d10ba15ee62c092ec2ba5"
 SRCREV_pn-linux-openmoko-2.6.31 ?= "4331f6c95fadc37ea89359d6afb915be838790f9"
diff --git a/recipes/linux-libc-headers/linux-libc-headers-nios2-2.6.28/defconfig b/recipes/linux-libc-headers/linux-libc-headers-nios2-2.6.28/defconfig
new file mode 100644
index 0000000..e69de29
diff --git a/recipes/linux-libc-headers/linux-libc-headers-nios2-2.6.28/hardware.mk b/recipes/linux-libc-headers/linux-libc-headers-nios2-2.6.28/hardware.mk
new file mode 100644
index 0000000..0cbb2c7
--- /dev/null
+++ b/recipes/linux-libc-headers/linux-libc-headers-nios2-2.6.28/hardware.mk
@@ -0,0 +1,3 @@
+SYSPTF = ../system.ptf
+CPU = cpu
+EXEMEM = cfi_flash
diff --git a/recipes/linux-libc-headers/linux-libc-headers_nios2-2.6.28.bb b/recipes/linux-libc-headers/linux-libc-headers_nios2-2.6.28.bb
index 97f6816..7e448b3 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_nios2-2.6.28.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_nios2-2.6.28.bb
@@ -9,7 +9,10 @@ SRCREV = "d01303a1035a39e445007c7522d89ad985c4153c"
 
 SRC_URI = "git://sopc.et.ntust.edu.tw/git/linux-2.6.git;branch=test-nios2;protocol=http \
            file://procinfo.h \
-           file://system.ptf"
+           file://system.ptf \
+           file://hardware.mk \
+           file://defconfig"
+
 S = "${WORKDIR}/git"
 
 #SRC_URI = "http://127.0.0.1/linux-nios2-2.6.28-git.tbz \
@@ -41,7 +44,8 @@ set_arch() {
 
 do_configure() {
 	set_arch
-	oe_runmake hwselect SYSPTF=../system.ptf CPU_SELECTION=1 MEM_SELECTION=2 ARCH=$ARCH
+	cp ../hardware.mk arch/nios2
+#	oe_runmake hwselect SYSPTF=../system.ptf CPU_SELECTION=1 MEM_SELECTION=2 ARCH=$ARCH
 	oe_runmake allnoconfig ARCH=$ARCH
 }