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. r2037 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
2. r2038 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
3. r2039 - trunk/oe/packages/uboot ([EMAIL PROTECTED])
4. r2040 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
5. r2041 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
--- Begin Message ---
Author: laforge
Date: 2007-05-19 07:29:57 +0200 (Sat, 19 May 2007)
New Revision: 2037
Modified:
trunk/src/target/u-boot/patches/uboot-gta02.patch
trunk/src/target/u-boot/patches/uboot-hxd8.patch
trunk/src/target/u-boot/patches/uboot-smdk2440.patch
trunk/src/target/u-boot/patches/uboot-smdk2443.patch
Log:
make smdk2440, smdk2443, hxd8 and gta02 support work with new udfu handling
Modified: trunk/src/target/u-boot/patches/uboot-gta02.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-gta02.patch 2007-05-19 05:13:53 UTC
(rev 2036)
+++ trunk/src/target/u-boot/patches/uboot-gta02.patch 2007-05-19 05:29:57 UTC
(rev 2037)
@@ -4,7 +4,7 @@
===================================================================
--- u-boot.orig/Makefile
+++ u-boot/Makefile
-@@ -1988,6 +1988,10 @@
+@@ -2015,6 +2015,10 @@
sbc2410x_config: unconfig
@$(MKCONFIG) $(@:_config=) arm arm920t sbc2410x NULL s3c24x0
@@ -736,7 +736,7 @@
===================================================================
--- /dev/null
+++ u-boot/board/neo1973/gta02/split_by_variant.sh
-@@ -0,0 +1,31 @@
+@@ -0,0 +1,37 @@
+#!/bin/sh
+# ---------------------------------------------------------
+# Set the core module defines according to Core Module
@@ -745,20 +745,26 @@
+# Set up the GTA01 type define
+# ---------------------------------------------------------
+
++CFGINC=${obj}include/config.h
++CFGTMP=${obj}board/neo1973/gta02/config.tmp
++
+mkdir -p ${obj}include
+if [ "$1" == "" ]
+then
+ echo "$0:: No parameters - using GTA02Bv1 config"
-+ echo "#define CONFIG_ARCH_GTA02_v1" > ${obj}include/config.h
++ echo "#define CONFIG_ARCH_GTA02_v1" > $CFGINC
++ echo "CONFIG_USB_DFU_REVISION=0x0310" > $CFGTMP
+else
+ case "$1" in
+ gta02v1_config)
-+ echo "#define CONFIG_ARCH_GTA02_v1" > ${obj}include/config.h
++ echo "#define CONFIG_ARCH_GTA02_v1" > $CFGINC
++ echo "CONFIG_USB_DFU_REVISION=0x0310" > $CFGTMP
+ ;;
+
+ *)
+ echo "$0:: Unrecognised config - using GTA02v1 config"
-+ echo "#define CONFIG_ARCH_GTA02_v1" > ${obj}include/config.h
++ echo "#define CONFIG_ARCH_GTA02_v1" > $CFGINC
++ echo "CONFIG_USB_DFU_REVISION=0x0310" > $CFGTMP
+ ;;
+
+ esac
@@ -1175,3 +1181,40 @@
+
+ /* FIXME */
+};
+Index: u-boot/board/neo1973/gta02/config.mk
+===================================================================
+--- /dev/null
++++ u-boot/board/neo1973/gta02/config.mk
+@@ -0,0 +1,32 @@
++#
++# (C) Copyright 2002
++# Gary Jennejohn, DENX Software Engineering, <[EMAIL PROTECTED]>
++# David Mueller, ELSOFT AG, <[EMAIL PROTECTED]>
++#
++# FIC Neo1973 GTA01 board with S3C2410X (ARM920T) cpu
++#
++# see http://www.samsung.com/ for more information on SAMSUNG
++#
++
++# GTA01v3 has 1 bank of 64 MB SDRAM
++# GTA01v4 has 1 bank of 64 MB SDRAM
++#
++# 3000'0000 to 3400'0000
++# we load ourself to 33F8'0000
++#
++# GTA01Bv2 or later has 1 bank of 128 MB SDRAM
++#
++# 3000'0000 to 3800'0000
++# we load ourself to 37F8'0000
++#
++# Linux-Kernel is expected to be at 3000'8000, entry 3000'8000
++# optionally with a ramdisk at 3080'0000
++#
++# download area is 3200'0000 or 3300'0000
++
++CONFIG_USB_DFU_VENDOR=0x1457
++CONFIG_USB_DFU_PRODUCT=0x5119
++
++sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
++
++TEXT_BASE = 0x33F80000
Modified: trunk/src/target/u-boot/patches/uboot-hxd8.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-hxd8.patch 2007-05-19 05:13:53 UTC
(rev 2036)
+++ trunk/src/target/u-boot/patches/uboot-hxd8.patch 2007-05-19 05:29:57 UTC
(rev 2037)
@@ -4,7 +4,7 @@
===================================================================
--- u-boot.orig/Makefile
+++ u-boot/Makefile
-@@ -1999,6 +1999,9 @@
+@@ -2026,6 +2026,9 @@
qt2410_config : unconfig
@./mkconfig $(@:_config=) arm arm920t qt2410 NULL s3c24x0
@@ -826,7 +826,7 @@
===================================================================
--- /dev/null
+++ u-boot/board/hxd8/config.mk
-@@ -0,0 +1,22 @@
+@@ -0,0 +1,27 @@
+#
+# (C) Copyright 2002
+# Gary Jennejohn, DENX Software Engineering, <[EMAIL PROTECTED]>
@@ -837,6 +837,11 @@
+# see http://www.samsung.com/ for more information on SAMSUNG
+#
+
++CONFIG_USB_DFU_VENDOR=0x1457
++CONFIG_USB_DFU_PRODUCT=0x511a
++CONFIG_USB_DFU_REVISION=0x0100
++
++#
+# HXD81v011 or later has 1 bank of 128 MB SDRAM
+#
+# 3000'0000 to 3800'0000
Modified: trunk/src/target/u-boot/patches/uboot-smdk2440.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-smdk2440.patch 2007-05-19
05:13:53 UTC (rev 2036)
+++ trunk/src/target/u-boot/patches/uboot-smdk2440.patch 2007-05-19
05:29:57 UTC (rev 2037)
@@ -4,7 +4,7 @@
===================================================================
--- u-boot.orig/Makefile
+++ u-boot/Makefile
-@@ -2008,6 +2008,9 @@
+@@ -2035,6 +2035,9 @@
smdk2410_config : unconfig
@$(MKCONFIG) $(@:_config=) arm arm920t smdk2410 NULL s3c24x0
@@ -204,10 +204,10 @@
+#define CONFIG_USB_DEVICE 1
+#define CONFIG_USB_TTY 1
+#define CFG_CONSOLE_IS_IN_ENV 1
-+#define CONFIG_USBD_VENDORID 0x1457 /* Linux/NetChip */
-+#define CONFIG_USBD_PRODUCTID_GSERIAL 0x5120 /* gserial */
-+#define CONFIG_USBD_PRODUCTID_CDCACM 0x5119 /* CDC ACM */
-+#define CONFIG_USBD_MANUFACTURER "FiWin"
++#define CONFIG_USBD_VENDORID 0x1457 /* FIC */
++#define CONFIG_USBD_PRODUCTID_GSERIAL 0x5120 /* gserial */
++#define CONFIG_USBD_PRODUCTID_CDCACM 0x511b /* SMDK2440 CDC ACM */
++#define CONFIG_USBD_MANUFACTURER "OpenMoko, Inc."
+#define CONFIG_USBD_PRODUCT_NAME "S3C2440 Bootloader " U_BOOT_VERSION
+#define CONFIG_EXTRA_ENV_SETTINGS "usbtty=cdc_acm\0"
+#define CONFIG_USBD_DFU 1
@@ -443,19 +443,23 @@
===================================================================
--- /dev/null
+++ u-boot/board/smdk2440/config.mk
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,29 @@
+#
+# (C) Copyright 2002
+# Gary Jennejohn, DENX Software Engineering, <[EMAIL PROTECTED]>
+# David Mueller, ELSOFT AG, <[EMAIL PROTECTED]>
+#
-+# SAMSUNG SMDK2410 board with S3C2410X (ARM920T) cpu
++# SAMSUNG SMDK2440 board with S3C2440 (ARM920T) cpu
+#
+# see http://www.samsung.com/ for more information on SAMSUNG
+#
+
++CONFIG_USB_DFU_VENDOR=0x1457
++CONFIG_USB_DFU_PRODUCT=0x511b
++CONFIG_USB_DFU_REVISION=0x0100
++
+#
-+# SMDK2410 has 1 bank of 64 MB DRAM
++# SMDK2440 has 1 bank of 64 MB DRAM
+#
+# 3000'0000 to 3400'0000
+#
Modified: trunk/src/target/u-boot/patches/uboot-smdk2443.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-smdk2443.patch 2007-05-19
05:13:53 UTC (rev 2036)
+++ trunk/src/target/u-boot/patches/uboot-smdk2443.patch 2007-05-19
05:29:57 UTC (rev 2037)
@@ -2,7 +2,7 @@
===================================================================
--- u-boot.orig/Makefile
+++ u-boot/Makefile
-@@ -2014,6 +2014,9 @@
+@@ -2045,6 +2045,9 @@
smdk2440_config : unconfig
@$(MKCONFIG) $(@:_config=) arm arm920t smdk2440 NULL s3c24x0
@@ -852,19 +852,23 @@
===================================================================
--- /dev/null
+++ u-boot/board/smdk2443/config.mk
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,29 @@
+#
+# (C) Copyright 2002
+# Gary Jennejohn, DENX Software Engineering, <[EMAIL PROTECTED]>
+# David Mueller, ELSOFT AG, <[EMAIL PROTECTED]>
+#
-+# SAMSUNG SMDK2410 board with S3C2410X (ARM920T) cpu
++# SAMSUNG SMDK2443 board with S3C2443 (ARM920T) cpu
+#
+# see http://www.samsung.com/ for more information on SAMSUNG
+#
+
++CONFIG_USB_DFU_VENDOR=0x1457
++CONFIG_USB_DFU_PRODUCT=0x511c
++CONFIG_USB_DFU_REVISION=0x0100
++
+#
-+# SMDK2410 has 1 bank of 64 MB DRAM
++# SMDK2443 has 1 bank of 64 MB DRAM
+#
+# 3000'0000 to 3400'0000
+#
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-05-19 07:31:24 +0200 (Sat, 19 May 2007)
New Revision: 2038
Modified:
trunk/src/target/u-boot/patches/uboot-mokoversion.patch
Log:
update to moko9 to reflect udfu handling
Modified: trunk/src/target/u-boot/patches/uboot-mokoversion.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-mokoversion.patch 2007-05-19
05:29:57 UTC (rev 2037)
+++ trunk/src/target/u-boot/patches/uboot-mokoversion.patch 2007-05-19
05:31:24 UTC (rev 2038)
@@ -7,4 +7,4 @@
fi
fi
+
-+printf '%s' -moko8
++printf '%s' -moko9
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-05-19 07:32:29 +0200 (Sat, 19 May 2007)
New Revision: 2039
Modified:
trunk/oe/packages/uboot/uboot-gta01_svn.bb
Log:
prefer udfu to regular bin images
Modified: trunk/oe/packages/uboot/uboot-gta01_svn.bb
===================================================================
--- trunk/oe/packages/uboot/uboot-gta01_svn.bb 2007-05-19 05:31:24 UTC (rev
2038)
+++ trunk/oe/packages/uboot/uboot-gta01_svn.bb 2007-05-19 05:32:29 UTC (rev
2039)
@@ -4,7 +4,7 @@
SECTION = "bootloader"
PRIORITY = "optional"
PV = "1.2.0+svn${SRCDATE}"
-PR = "r7"
+PR = "r8"
PROVIDES = "virtual/bootloader"
S = "${WORKDIR}/git"
@@ -43,7 +43,12 @@
oe_runmake ${mach}_config
oe_runmake clean
oe_runmake all
- mv u-boot.bin u-boot_${mach}.bin
+ oe_runmake u-boot.udfu
+ if [ -f u-boot.udfu ]; then
+ mv u-boot.udfu u-boot_${mach}.bin
+ else
+ mv u-boot.bin u-boot_${mach}.bin
+ fi
if [ -f board/${mach}/lowlevel_foo.bin ]; then
mv board/${mach}/lowlevel_foo.bin
lowlevel_foo_${mach}.bin
fi
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-05-19 07:55:47 +0200 (Sat, 19 May 2007)
New Revision: 2040
Modified:
trunk/src/target/u-boot/patches/uboot-dfu.patch
Log:
get_board_rev() is not universally present, this patch fixes the dfu dependency
on it
Modified: trunk/src/target/u-boot/patches/uboot-dfu.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-dfu.patch 2007-05-19 05:32:29 UTC
(rev 2039)
+++ trunk/src/target/u-boot/patches/uboot-dfu.patch 2007-05-19 05:55:47 UTC
(rev 2040)
@@ -99,7 +99,7 @@
===================================================================
--- /dev/null
+++ u-boot/drivers/usbdfu.c
-@@ -0,0 +1,1066 @@
+@@ -0,0 +1,1069 @@
+/*
+ * (C) 2007 by OpenMoko, Inc.
+ * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -196,15 +196,18 @@
+
+static int dfu_trailer_matching(const struct uboot_dfu_trailer *trailer)
+{
-+ if (trailer->magic == UBOOT_DFU_TRAILER_MAGIC &&
-+ trailer->version == UBOOT_DFU_TRAILER_V1 &&
-+ trailer->vendor == CONFIG_USBD_VENDORID &&
-+ (trailer->product == CONFIG_USBD_PRODUCTID_CDCACM ||
-+ trailer->product == CONFIG_USBD_PRODUCTID_GSERIAL) &&
-+ trailer->revision == get_board_rev())
-+ return 1;
++ if (trailer->magic != UBOOT_DFU_TRAILER_MAGIC ||
++ trailer->version != UBOOT_DFU_TRAILER_V1 ||
++ trailer->vendor != CONFIG_USBD_VENDORID ||
++ (trailer->product != CONFIG_USBD_PRODUCTID_CDCACM &&
++ trailer->product != CONFIG_USBD_PRODUCTID_GSERIAL))
++ return 0;
++#ifdef CONFIG_REVISION_TAG
++ if (trailer->revision != get_board_rev())
++ return 0;
++#endif
+
-+ return 0;
++ return 1;
+}
+
+static struct part_info *get_partition_nand(int idx)
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-05-19 09:44:20 +0200 (Sat, 19 May 2007)
New Revision: 2041
Modified:
trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch
Log:
* fix STALL case, i.e. actually stall the USB bus if usb stack asks the
driver to send a stall packet. This also means that dfu-util will return a
proper error message in case DFU has some error (such as 'file not targeted
for
this device') and recovers properly after it.
* use our own debug macros to prevent reentrance (Closes: #420)
Modified: trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch 2007-05-19
05:55:47 UTC (rev 2040)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch 2007-05-19
07:44:20 UTC (rev 2041)
@@ -17,7 +17,7 @@
===================================================================
--- /dev/null
+++ u-boot/drivers/usbdcore_s3c2410.c
-@@ -0,0 +1,721 @@
+@@ -0,0 +1,730 @@
+/* S3C2410 USB Device Controller Driver for u-boot
+ *
+ * (C) Copyright 2007 by OpenMoko, Inc.
@@ -48,6 +48,15 @@
+
+#include <common.h>
+
++/* we can't use the regular debug macros since the console might be
++ * set to usbtty, which would cause deadlocks! */
++#ifdef DEBUG
++#undef debug
++#undef debugX
++#define debug(fmt,args...) serial_printf (fmt ,##args)
++#define debugX(level,fmt,args...) if (DEBUG>=level) serial_printf(fmt,##args)
++#endif
++
+DECLARE_GLOBAL_DATA_PTR;
+
+#include <asm/io.h>
@@ -233,7 +242,7 @@
+ /* Not a setup packet, stall next EP0
transaction */
+ debug("can't parse setup packet1\n");
+ set_ep0_ss();
-+ //set_ep0_de_out();
++ set_ep0_de_out();
+ ep0->state = EP0_IDLE;
+ return;
+ }
@@ -1170,7 +1179,7 @@
===================================================================
--- u-boot.orig/board/neo1973/common/cmd_neo1973.c
+++ u-boot/board/neo1973/common/cmd_neo1973.c
-@@ -93,6 +93,18 @@
+@@ -72,6 +72,18 @@
neo1973_vibrator(1);
else
neo1973_vibrator(0);
@@ -1189,7 +1198,7 @@
} else {
out_help:
printf("Usage:\n%s\n", cmdtp->usage);
-@@ -116,5 +128,6 @@
+@@ -95,5 +107,6 @@
"neo1973 charger off - disable charging\n"
"neo1973 backlight (on|off) - switch backlight on or off\n"
"neo1973 vibrator (on|off) - switch vibrator on or off\n"
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
