r2238 - trunk/src/target/u-boot/patches

[laforge at sita.openmoko.org]

Author: laforge
Date: 2007-06-13 08:27:12 +0200 (Wed, 13 Jun 2007)
New Revision: 2238

Modified:
   trunk/src/target/u-boot/patches/neo1973-chargefast.patch
   trunk/src/target/u-boot/patches/uboot-gta02.patch
Log:
fix syntax error


Modified: trunk/src/target/u-boot/patches/neo1973-chargefast.patch
===================================================================
--- trunk/src/target/u-boot/patches/neo1973-chargefast.patch	2007-06-13 06:15:17 UTC (rev 2237)
+++ trunk/src/target/u-boot/patches/neo1973-chargefast.patch	2007-06-13 06:27:12 UTC (rev 2238)
@@ -292,7 +292,7 @@
  		break;
 +	case UDC_CTRL_500mA_ENABLE:
 +#if defined(CONFIG_ARCH_GTA01_v3) || defined(CONFIG_ARCH_GTA01_v4) || \
-+    defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3) \
++    defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3) || \
 +    defined(CONFIG_ARCH_GTA01B_v4)
 +		pcf50606_charge_autofast(param);
 +#endif

Modified: trunk/src/target/u-boot/patches/uboot-gta02.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-gta02.patch	2007-06-13 06:15:17 UTC (rev 2237)
+++ trunk/src/target/u-boot/patches/uboot-gta02.patch	2007-06-13 06:27:12 UTC (rev 2238)
@@ -469,7 +469,7 @@
 ===================================================================
 --- /dev/null
 +++ u-boot/include/configs/neo1973_gta02.h
-@@ -0,0 +1,274 @@
+@@ -0,0 +1,276 @@
 +/*
 + * (C) Copyright 2007 OpenMoko, Inc.
 + * Author: Harald Welte <laforge at openmoko.org>
@@ -624,6 +624,8 @@
 +/* valid baudrates */
 +#define CFG_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 +
++#define CFG_BOOTMENU
++
 +/*-----------------------------------------------------------------------
 + * Stack sizes
 + *
@@ -1544,9 +1546,9 @@
  
  void udc_ctrl(enum usbd_event event, int param)
  {
-@@ -22,6 +23,11 @@
- #if defined(CONFIG_ARCH_GTA01_v3) || defined(CONFIG_ARCH_GTA01_v3) || \
-     defined(CONFIG_ARCH_GTA01B_v3) || defined(CONFIG_ARCH_GTA01B_v4)
+@@ -23,6 +24,11 @@
+     defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3) || \
+     defined(CONFIG_ARCH_GTA01B_v4)
  		pcf50606_charge_autofast(param);
 +#elif defined(CONFIG_ARCH_GTA02_v1)
 +		if (param)