Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r1226 - trunk/src/host/devirginator ([EMAIL PROTECTED])
2. r1227 - trunk/src/host/devirginator ([EMAIL PROTECTED])
3. r1228 - trunk/src/host/devirginator ([EMAIL PROTECTED])
4. r1229 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
5. r1230 - trunk/oe/packages/linux ([EMAIL PROTECTED])
--- Begin Message ---
Author: werner
Date: 2007-03-02 22:55:50 +0100 (Fri, 02 Mar 2007)
New Revision: 1226
Modified:
trunk/src/host/devirginator/Makefile
trunk/src/host/devirginator/config.example
trunk/src/host/devirginator/setup.sh
Log:
setup.sh: renamed OPENOCD_CONFIG to OPENOCD_CFG
setup.sh, Makefile: renamed output file from devirg-... to devirginate-...
config.example: added OPENOCD and OPENOCD_CFG
Modified: trunk/src/host/devirginator/Makefile
===================================================================
--- trunk/src/host/devirginator/Makefile 2007-03-02 21:15:39 UTC (rev
1225)
+++ trunk/src/host/devirginator/Makefile 2007-03-02 21:55:50 UTC (rev
1226)
@@ -23,7 +23,7 @@
DIR=devirginator
SCRIPTS=crc32.pl envedit.pl openocdcmd.pl scriptify.pl devirginate
-TARBALL=devirg-$(TARBALL_VERSION).tar.gz
+TARBALL=devirginate-$(TARBALL_VERSION).tar.gz
.PHONY: tarball
Modified: trunk/src/host/devirginator/config.example
===================================================================
--- trunk/src/host/devirginator/config.example 2007-03-02 21:15:39 UTC (rev
1225)
+++ trunk/src/host/devirginator/config.example 2007-03-02 21:55:50 UTC (rev
1226)
@@ -87,4 +87,19 @@
# SPLASH=http://wiki.openmoko.org/images/c/c2/System_boot.png
+#### SUPPLEMENTARY DOWNLOADS #################################################
+
+# Some files may be useful when building a portable tarball. They are only
+# added to tmp/ when mentioned in the configuration. The "devirginate" script
+# does not access these files directly.
+
+# OPENOCD: OpenOCD executable.
+# Example:
+# OPENOCD=$OMDIR/openocd/src/openocd
+
+# OPENOCD_CFG: OpenOCD configuration. Note that this is probably site-specific.
+# Example:
+# OPENOCD_CFG=$OMDIR/openocd/openocd.cfg
+
+
### END #####################################################################
Modified: trunk/src/host/devirginator/setup.sh
===================================================================
--- trunk/src/host/devirginator/setup.sh 2007-03-02 21:15:39 UTC (rev
1225)
+++ trunk/src/host/devirginator/setup.sh 2007-03-02 21:55:50 UTC (rev
1226)
@@ -204,8 +204,8 @@
chmod +x "$OPENOCD"
fi
-if [ ! -z "$OPENOCD_CONFIG" ]; then
- download OPENOCD_CONFIG "$OPENOCD_CONFIG"
+if [ ! -z "$OPENOCD_CFG" ]; then
+ download OPENOCD_CFG "$OPENOCD_CFG"
fi
# Set default for TARBALL_VERSION
@@ -362,8 +362,8 @@
To install it on a new machine,
-- copy the file devirg-${TARBALL_VERSION}.tar.gz to the new machine
-- tar xfz devirg-${TARBALL_VERSION}.tar.gz
+- copy the file devirginate-${TARBALL_VERSION}.tar.gz to the new machine
+- tar xfz devirginate-${TARBALL_VERSION}.tar.gz
- cd devirginator-${TARBALL_VERSION}
To set up a device,
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2007-03-02 23:53:34 +0100 (Fri, 02 Mar 2007)
New Revision: 1227
Modified:
trunk/src/host/devirginator/Makefile
trunk/src/host/devirginator/openocd.in
trunk/src/host/devirginator/setup.sh
Log:
setup.sh, Makefile: use an explicit list of files to include, not just all that
happens to be in tmp/
Makefile, setup.sh: changed tarball directory from devirginator-... to
devirginate-...
Makefile: added tarball dependencies
setup.sh, openocd.in: replaced all absolute path names with relative ones
Modified: trunk/src/host/devirginator/Makefile
===================================================================
--- trunk/src/host/devirginator/Makefile 2007-03-02 21:55:50 UTC (rev
1226)
+++ trunk/src/host/devirginator/Makefile 2007-03-02 22:53:34 UTC (rev
1227)
@@ -23,7 +23,8 @@
DIR=devirginator
SCRIPTS=crc32.pl envedit.pl openocdcmd.pl scriptify.pl devirginate
-TARBALL=devirginate-$(TARBALL_VERSION).tar.gz
+TARDIR=devirginate-$(TARBALL_VERSION)
+TARBALL=$(TARDIR).tar.gz
.PHONY: tarball
@@ -51,12 +52,14 @@
tarball: $(TARBALL)
-$(TARBALL):
+$(TARBALL): $(SCRIPTS) $(TMP_FILES)
@[ ! -z "$(TARBALL_VERSION)" ] || \
{ echo "Please set TARBALL_VERSION"; exit 1; }
- cd .. && ln -sf $(DIR) $(DIR)-$(TARBALL_VERSION) && \
+ @[ ! -z "$(TMP_FILES)" ] || \
+ { echo "Please set TMP_FILES"; exit 1; }
+ cd .. && ln -sf $(DIR) $(TARDIR) && \
tar cfz $(DIR)/$(TARBALL) \
- $(SCRIPTS:%=$(DIR)-$(TARBALL_VERSION)/%) \
- $(DIR)-$(TARBALL_VERSION)/tmp/ || \
- { rm -f $(DIR)-$(TARBALL_VERSION); exit 1; }
- rm -f $(DIR)-$(TARBALL_VERSION)
+ $(SCRIPTS:%=$(TARDIR)/%) \
+ $(TMP_FILES:%=$(TARDIR)/%) || \
+ { rm -f $(TARDIR); exit 1; }
+ rm -f $(TARDIR)
Modified: trunk/src/host/devirginator/openocd.in
===================================================================
--- trunk/src/host/devirginator/openocd.in 2007-03-02 21:55:50 UTC (rev
1226)
+++ trunk/src/host/devirginator/openocd.in 2007-03-02 22:53:34 UTC (rev
1227)
@@ -34,9 +34,9 @@
# load u-boot, the initial command, the command script, and the smiley
load_binary $UBOOT 0x32000000
-load_binary $PWD/tmp/preboot_override 0x32100000
-load_binary $PWD/tmp/u-boot.out 0x32200000
-load_binary $PWD/tmp/smiley.gz 0x32300000
+load_binary tmp/preboot_override 0x32100000
+load_binary tmp/u-boot.out 0x32200000
+load_binary tmp/smiley.gz 0x32300000
# enable the initial command
mww 0x32000040 0x32100000
Modified: trunk/src/host/devirginator/setup.sh
===================================================================
--- trunk/src/host/devirginator/setup.sh 2007-03-02 21:55:50 UTC (rev
1226)
+++ trunk/src/host/devirginator/setup.sh 2007-03-02 22:53:34 UTC (rev
1227)
@@ -35,6 +35,7 @@
base="`basename \"$2\"`"
cp "$2" "tmp/$base"
eval $1=\"tmp/$base\"
+ add_file "tmp/$base"
fi
return
fi
@@ -57,12 +58,9 @@
base="`basename \"$n\"`"
cd tmp
wget -N "$n" || { rm -f $base; exit 1; }
- if $tarball; then
- eval $1=\"tmp/$base\"
- else
- eval $1=\"$PWD/$base\"
- fi
+ eval $1=\"tmp/$base\"
cd ..
+ add_file "tmp/$base"
}
@@ -74,6 +72,13 @@
}
+add_file()
+{
+ [ -f "$1" ] || { echo "$1: not found" 2>&1; exit 1; }
+ tmp_files="$1 $tmp_files"
+}
+
+
# --- Configuration defaults --------------------------------------------------
@@ -230,6 +235,7 @@
eval "echo $l"
done
} <openocd.in >tmp/script.ocd
+add_file tmp/script.ocd
# --- Stage 1: First u-boot command(s) ----------------------------------------
@@ -239,18 +245,20 @@
>tmp/preboot_override.scrub
setenv scrub true; autoscr 0x32200000!
EOF
+add_file tmp/preboot_override.scrub
-
sed 's/#.*//;/^ *$/d' <<EOF | tr '\n' ';' | tr '!' '\000' \
>tmp/preboot_override.noscrub
autoscr 0x32200000!
EOF
+add_file tmp/preboot_override.noscrub
# --- Stage 1: u-boot script --------------------------------------------------
perl ./scriptify.pl u-boot.in >tmp/u-boot.out
+add_file tmp/u-boot.out
# --- Stage 1: smiley splash screen -------------------------------------------
@@ -260,18 +268,21 @@
make smiley.gz
mv smiley.gz tmp/
rm -f smiley.png smiley.ppm
+add_file tmp/smiley.gz
# --- Stage 2: the default environment ----------------------------------------
cp environment.in tmp/environment
+add_file tmp/environment
# --- Stage 2: official splash screen -----------------------------------------
../splash/splashimg.pl "$SPLASH" | gzip -9 >tmp/splash.gz
+add_file tmp/splash.gz
# --- "devirginate" shell script ----------------------------------------------
@@ -327,7 +338,7 @@
ln -sf preboot_override.noscrub tmp/preboot_override
fi
./openocdcmd.pl $OPENOCD_HOST $OPENOCD_PORT \
- "script $PWD/tmp/script.ocd" exit
+ "script tmp/script.ocd" exit
fi
if \$stage2; then
@@ -354,7 +365,7 @@
if $tarball; then
- make tarball TARBALL_VERSION="$TARBALL_VERSION"
+ make tarball TARBALL_VERSION="$TARBALL_VERSION" TMP_FILES="$tmp_files"
cat <<EOF
-------------------------------------------------------------------------------
@@ -364,7 +375,7 @@
- copy the file devirginate-${TARBALL_VERSION}.tar.gz to the new machine
- tar xfz devirginate-${TARBALL_VERSION}.tar.gz
-- cd devirginator-${TARBALL_VERSION}
+- cd devirginate-${TARBALL_VERSION}
To set up a device,
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2007-03-03 00:19:16 +0100 (Sat, 03 Mar 2007)
New Revision: 1228
Added:
trunk/src/host/devirginator/config.phase0
Modified:
trunk/src/host/devirginator/Makefile
trunk/src/host/devirginator/setup.sh
Log:
setup.sh: always download the index file from the Web (the current logic would
only "cache" in case of problems anyway)
Makefile: commented out "devirginate" target causing double execution of
setup.sh
config.phase0: phase 0 sample configuration
Modified: trunk/src/host/devirginator/Makefile
===================================================================
--- trunk/src/host/devirginator/Makefile 2007-03-02 22:53:34 UTC (rev
1227)
+++ trunk/src/host/devirginator/Makefile 2007-03-02 23:19:16 UTC (rev
1228)
@@ -28,11 +28,11 @@
.PHONY: tarball
-devirginate: config environment.in openocd.in u-boot.in \
- setup.sh smiley.gz \
- crc32.pl envedit.pl openocdcmd.pl scriptify.pl
- mkdir -p tmp
- ./setup.sh
+#devirginate: config environment.in openocd.in u-boot.in \
+# setup.sh smiley.gz \
+# crc32.pl envedit.pl openocdcmd.pl scriptify.pl
+# mkdir -p tmp
+# ./setup.sh
smiley.ppm: smiley.fig
fig2dev -L ppm -m 2 $< >$@ || { rm -f $@; exit 1; }
Added: trunk/src/host/devirginator/config.phase0
===================================================================
--- trunk/src/host/devirginator/config.phase0 2007-03-02 22:53:34 UTC (rev
1227)
+++ trunk/src/host/devirginator/config.phase0 2007-03-02 23:19:16 UTC (rev
1228)
@@ -0,0 +1,22 @@
+#
+# config - devirginator configuration
+#
+# This is a shell script sourced by "setup.sh".
+#
+
+OPENOCD_HOST=localhost
+SNAPSHOT=20070301
+BOARD=bv3
+
+
+stuff=http://buildhost-old.openmoko.org/snapshots/gta01-20070301/tmp/deploy/images
+
+LOWLEVEL=$stuff/lowlevel_foo-gta01bv3-20070302200829.bin
+UBOOT=$stuff/u-boot-gta01bv3-20070302200829.bin
+UIMAGE=$stuff/uImage-2.6-200703022008-fic-gta01.bin
+ROOTFS=$stuff/openmoko-devel-image-fic-gta01-20070302115654.rootfs.jffs2
+
+DFU_UTIL=$stuff/dfu-util
+
+OPENOCD=$stuff/openocd
+OPENOCD_CFG=http://people.openmoko.org/werner/openocd-debugv2.cfg
Modified: trunk/src/host/devirginator/setup.sh
===================================================================
--- trunk/src/host/devirginator/setup.sh 2007-03-02 22:53:34 UTC (rev
1227)
+++ trunk/src/host/devirginator/setup.sh 2007-03-02 23:19:16 UTC (rev
1228)
@@ -40,10 +40,8 @@
return
fi
index=tmp/index-${SNAPSHOT}.html
- if [ ! -f $index ]; then
- wget -O tmp/index "`dirname \"$2\"`/"
- mv tmp/index $index
- fi
+ rm -f $index
+ wget -O $index "`dirname \"$2\"`/"
n="`basename \"$2\" | sed 's/*/[-a-zA-Z0-9_.]*/g'`"
sed '/^.*[^-a-zA-Z0-9_.]\('"$n"'\)[^-a-zA-Z0-9_.].*$/s//\1/p;d' \
<$index >tmp/files
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-03-03 01:45:23 +0100 (Sat, 03 Mar 2007)
New Revision: 1229
Modified:
trunk/src/target/u-boot/patches/lowlevel_foo.patch
Log:
board/neo1973/Makefile has arm-linux-objcopy hardcoded, use CROSS_COMPILE.
(Closes: 230)
Modified: trunk/src/target/u-boot/patches/lowlevel_foo.patch
===================================================================
--- trunk/src/target/u-boot/patches/lowlevel_foo.patch 2007-03-02 23:19:16 UTC
(rev 1228)
+++ trunk/src/target/u-boot/patches/lowlevel_foo.patch 2007-03-03 00:45:23 UTC
(rev 1229)
@@ -175,7 +175,7 @@
+ lowlevel_init.o lowlevel_foo.o -o lowlevel_foo
+
+lowevel_foo.bin: lowlevel_foo
-+ arm-linux-objcopy --gap-fill=0xff -O binary \
++ $(CROSS_COMPILE)objcopy --gap-fill=0xff -O binary \
+ lowlevel_foo lowlevel_foo.bin
+
+
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-03-03 01:49:29 +0100 (Sat, 03 Mar 2007)
New Revision: 1230
Modified:
trunk/oe/packages/linux/linux-gta01_2.6.20.1.bb
trunk/oe/packages/linux/linux-gta01_2.6.20.bb
Log:
Need to add ${STAGING_BINDIR} prefix to calls to the just-build uboot-mkimage.
(Closes: #224)
--Thi line, and those below, will be ignored--
M oe/packages/linux/linux-gta01_2.6.20.1.bb
M oe/packages/linux/linux-gta01_2.6.20.bb
Modified: trunk/oe/packages/linux/linux-gta01_2.6.20.1.bb
===================================================================
--- trunk/oe/packages/linux/linux-gta01_2.6.20.1.bb 2007-03-03 00:45:23 UTC
(rev 1229)
+++ trunk/oe/packages/linux/linux-gta01_2.6.20.1.bb 2007-03-03 00:49:29 UTC
(rev 1230)
@@ -92,7 +92,7 @@
arm-linux-objcopy -O binary -R .note -R .comment -S vmlinux linux.bin
rm -f linux.bin.gz
gzip -9 linux.bin
- uboot-mkimage -A arm -O linux -T kernel -C gzip -a 30008000 -e 30008000
-n "OpenMoko Kernel Image Neo1973(GTA01)" -d linux.bin.gz
${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
+ ${STAGING_BINDIR}/uboot-mkimage -A arm -O linux -T kernel -C gzip -a
30008000 -e 30008000 -n "OpenMoko Kernel Image Neo1973(GTA01)" -d linux.bin.gz
${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
rm -f linux.bin.gz
}
Modified: trunk/oe/packages/linux/linux-gta01_2.6.20.bb
===================================================================
--- trunk/oe/packages/linux/linux-gta01_2.6.20.bb 2007-03-03 00:45:23 UTC
(rev 1229)
+++ trunk/oe/packages/linux/linux-gta01_2.6.20.bb 2007-03-03 00:49:29 UTC
(rev 1230)
@@ -92,7 +92,7 @@
arm-linux-objcopy -O binary -R .note -R .comment -S vmlinux linux.bin
rm -f linux.bin.gz
gzip -9 linux.bin
- uboot-mkimage -A arm -O linux -T kernel -C gzip -a 30008000 -e 30008000
-n "OpenMoko Kernel Image Neo1973(GTA01)" -d linux.bin.gz
${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
+ ${STAGING_BINDIR}/uboot-mkimage -A arm -O linux -T kernel -C gzip -a
30008000 -e 30008000 -n "OpenMoko Kernel Image Neo1973(GTA01)" -d linux.bin.gz
${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
rm -f linux.bin.gz
}
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
