[oe-commits] org.oe.dev s3c2410 utils: merge from openmoko svn

[koen commit]

s3c2410 utils: merge from openmoko svn

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 804173890b0c2381f9e13e27fce36c3396184943
ViewMTN: http://monotone.openembedded.org/revision.psp?id=804173890b0c2381f9e13e27fce36c3396184943
Files:
1
packages/s3c2410-utils
packages/s3c2410-utils/files
packages/s3c2410-utils/files/s3c2410_boot_usb-20060807.tar.bz2
packages/s3c2410-utils/files/sjf2410-linux-20060807.tar.bz2
packages/s3c2410-utils/s3c2410-boot-usb-native_20060807.bb
packages/s3c2410-utils/s3c2410-boot-usb-native_svn.bb
packages/s3c2410-utils/sjf2410-linux-native_20060807.bb
packages/s3c2410-utils/sjf2410-linux-native_svn.bb
mtn:manual_merge
true
Diffs:

#
# mt diff -r069cb75cc86b7dc6009c903b63cddcb884858210 -r804173890b0c2381f9e13e27fce36c3396184943
#
# 
# 
# add_dir "packages/s3c2410-utils"
# 
# add_dir "packages/s3c2410-utils/files"
# 
# add_file "packages/s3c2410-utils/files/s3c2410_boot_usb-20060807.tar.bz2"
#  content [ad46a0087e672668eb707be4310dfba700d5496a]
# 
# add_file "packages/s3c2410-utils/files/sjf2410-linux-20060807.tar.bz2"
#  content [135a0b8ce1cb60fc71ca329ac03f0ada8bdac3de]
# 
# add_file "packages/s3c2410-utils/s3c2410-boot-usb-native_20060807.bb"
#  content [5ebfc38179c0399cbe2ffaa24dcfb8654a23966f]
# 
# add_file "packages/s3c2410-utils/s3c2410-boot-usb-native_svn.bb"
#  content [0bdc20dd566d6175fff6c13e3c54b17e8b1542b9]
# 
# add_file "packages/s3c2410-utils/sjf2410-linux-native_20060807.bb"
#  content [bbf07ca452360e35b720184efbf461e4194ddaaf]
# 
# add_file "packages/s3c2410-utils/sjf2410-linux-native_svn.bb"
#  content [0192010e196adbd635511826c0bc9b72a7e8eedf]
# 
#   set "packages/s3c2410-utils/files/s3c2410_boot_usb-20060807.tar.bz2"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/s3c2410-utils/files/sjf2410-linux-20060807.tar.bz2"
#  attr "mtn:manual_merge"
# value "true"
# 
============================================================
# packages/s3c2410-utils/files/s3c2410_boot_usb-20060807.tar.bz2 is binary
============================================================
# packages/s3c2410-utils/files/sjf2410-linux-20060807.tar.bz2 is binary
============================================================
--- packages/s3c2410-utils/s3c2410-boot-usb-native_20060807.bb	5ebfc38179c0399cbe2ffaa24dcfb8654a23966f
+++ packages/s3c2410-utils/s3c2410-boot-usb-native_20060807.bb	5ebfc38179c0399cbe2ffaa24dcfb8654a23966f
@@ -0,0 +1,31 @@
+DESCRIPTION = "Boots a S3C2410 device with a user supplied kernel zImage"
+DEPENDS = "libusb-native"
+SECTION = "devel"
+AUTHOR = "Harald Welte"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey at Vanille.de>"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "file://s3c2410_boot_usb-20060807.tar.bz2"
+S = "${WORKDIR}/s3c2410_boot_usb"
+
+inherit native
+
+do_compile() {
+	${CC} ${CFLAGS} ${LDFLAGS} -lusb -o s3c2410-boot-usb boot_usb.c
+}
+
+do_deploy() {
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0755 s3c2410-boot-usb ${DEPLOY_DIR_IMAGE}
+}
+
+do_stage() {
+	:
+}
+
+do_install() {
+	:
+}
+
+addtask deploy before do_build after do_compile
============================================================
--- packages/s3c2410-utils/s3c2410-boot-usb-native_svn.bb	0bdc20dd566d6175fff6c13e3c54b17e8b1542b9
+++ packages/s3c2410-utils/s3c2410-boot-usb-native_svn.bb	0bdc20dd566d6175fff6c13e3c54b17e8b1542b9
@@ -0,0 +1,31 @@
+DESCRIPTION = "Boots a S3C2410 device with a user supplied kernel zImage"
+DEPENDS = "libusb-native"
+SECTION = "devel"
+AUTHOR = "Harald Welte"
+LICENSE = "GPL"
+PV = "0.1.0+svn${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=s3c2410_boot_usb;proto=https"
+S = "${WORKDIR}/s3c2410_boot_usb"
+
+inherit native
+
+do_compile() {
+	${CC} ${CFLAGS} ${LDFLAGS} -lusb -o s3c2410-boot-usb boot_usb.c
+}
+
+do_deploy() {
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0755 s3c2410-boot-usb ${DEPLOY_DIR_IMAGE}
+}
+
+do_stage() {
+	:
+}
+
+do_install() {
+	:
+}
+
+addtask deploy before do_build after do_compile
============================================================
--- packages/s3c2410-utils/sjf2410-linux-native_20060807.bb	bbf07ca452360e35b720184efbf461e4194ddaaf
+++ packages/s3c2410-utils/sjf2410-linux-native_20060807.bb	bbf07ca452360e35b720184efbf461e4194ddaaf
@@ -0,0 +1,32 @@
+DESCRIPTION = "Jtag utility to interface w/ a S3C2410 device"
+SECTION = "devel"
+AUTHOR = "Harald Welte"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey at Vanille.de>"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "file://sjf2410-linux-20060807.tar.bz2"
+S = "${WORKDIR}/sjf2410-linux"
+
+inherit native
+
+CFLAGS += "-DLINUX_PPDEV"
+
+do_compile() {
+	oe_runmake
+}
+
+do_deploy() {
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0755 sjf2410 ${DEPLOY_DIR_IMAGE}/sjf2410
+}
+
+do_stage() {
+	:
+}
+
+do_install() {
+	:
+}
+
+addtask deploy before do_build after do_compile
============================================================
--- packages/s3c2410-utils/sjf2410-linux-native_svn.bb	0192010e196adbd635511826c0bc9b72a7e8eedf
+++ packages/s3c2410-utils/sjf2410-linux-native_svn.bb	0192010e196adbd635511826c0bc9b72a7e8eedf
@@ -0,0 +1,32 @@
+DESCRIPTION = "JTAG utility to interface w/ a S3C2410 device"
+SECTION = "devel"
+AUTHOR = "Harald Welte"
+LICENSE = "GPL"
+PV = "0.1+svn${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=sjf2410-linux;proto=https"
+S = "${WORKDIR}/sjf2410-linux"
+
+inherit native
+
+CFLAGS += "-DLINUX_PPDEV"
+
+do_compile() {
+	oe_runmake
+}
+
+do_deploy() {
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0755 sjf2410 ${DEPLOY_DIR_IMAGE}/sjf2410
+}
+
+do_stage() {
+	:
+}
+
+do_install() {
+	:
+}
+
+addtask deploy before do_build after do_compile