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

werner at sita.openmoko.org werner at sita.openmoko.org
Fri Feb 15 15:14:00 CET 2008


Author: werner
Date: 2008-02-15 15:13:49 +0100 (Fri, 15 Feb 2008)
New Revision: 4070

Modified:
   trunk/src/target/u-boot/patches/boot-menu.patch
   trunk/src/target/u-boot/patches/gta02-bootmenu.patch
   trunk/src/target/u-boot/patches/gta02-nor.patch
   trunk/src/target/u-boot/patches/neo1973-gsmver.patch
   trunk/src/target/u-boot/patches/series
   trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
   trunk/src/target/u-boot/patches/uboot-gta02.patch
   trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch
Log:
Merge neo1973-gsmver.patch into uboot-20061030-neo1973.patch, where
the rest of the neo1973 commands are.

uboot-20061030-neo1973.patch: merged neo1973-gsmver.patch

neo1973-gsmver.patch, series: removed neo1973-gsmver.patch

uboot-s3c2410_udc.patch, boot-menu.patch:
- board/neo1973/gta01/Makefile: updated for neo1973-gsmver.patch move

uboot-gta02.patch, gta02-nor.patch:
- board/neo1973/gta02/Makefile: updated for neo1973-gsmver.patch move

Non-trivial commits to neo1973-gsmver.patch:

------------------------------------------------------------------------
r3184 | laforge | 2007-10-16 05:38:08 -0300 (Tue, 16 Oct 2007) | 2 lines

don't try to find double-quotes in GSM version, not all gsm firmware versions have those

------------------------------------------------------------------------
r2929 | laforge | 2007-09-05 14:42:17 -0300 (Wed, 05 Sep 2007) | 2 lines

add command to read out gsm firmware version using u-boot (jserv)

------------------------------------------------------------------------



Modified: trunk/src/target/u-boot/patches/boot-menu.patch
===================================================================
--- trunk/src/target/u-boot/patches/boot-menu.patch	2008-02-15 13:20:43 UTC (rev 4069)
+++ trunk/src/target/u-boot/patches/boot-menu.patch	2008-02-15 14:13:49 UTC (rev 4070)
@@ -261,12 +261,12 @@
 ===================================================================
 --- u-boot.orig/board/neo1973/gta01/Makefile
 +++ u-boot/board/neo1973/gta01/Makefile
-@@ -25,7 +25,7 @@
- 
+@@ -26,7 +26,7 @@
  LIB	= lib$(BOARD).a
  
--OBJS	:= gta01.o pcf50606.o ../common/cmd_neo1973.o ../common/jbt6k74.o ../common/udc.o
-+OBJS	:= gta01.o pcf50606.o ../common/cmd_neo1973.o ../common/jbt6k74.o ../common/udc.o ../common/bootmenu.o
+ OBJS	:= gta01.o pcf50606.o ../common/cmd_neo1973.o ../common/jbt6k74.o \
+-	   ../common/gsmver.o ../common/udc.o
++	   ../common/gsmver.o ../common/udc.o ../common/bootmenu.o
  SOBJS	:= ../common/lowlevel_init.o
  
  .PHONY:	all

Modified: trunk/src/target/u-boot/patches/gta02-bootmenu.patch
===================================================================
--- trunk/src/target/u-boot/patches/gta02-bootmenu.patch	2008-02-15 13:20:43 UTC (rev 4069)
+++ trunk/src/target/u-boot/patches/gta02-bootmenu.patch	2008-02-15 14:13:49 UTC (rev 4070)
@@ -60,4 +60,4 @@
 +	return !!(gpio->GPFDAT & (1 << 6));
  }
  
- /* The sum of all part_size[]s must equal to the NAND size, i.e., 0x8000000. */
+ /* The sum of all part_size[]s must equal to or greater than the NAND size,

Modified: trunk/src/target/u-boot/patches/gta02-nor.patch
===================================================================
--- trunk/src/target/u-boot/patches/gta02-nor.patch	2008-02-15 13:20:43 UTC (rev 4069)
+++ trunk/src/target/u-boot/patches/gta02-nor.patch	2008-02-15 14:13:49 UTC (rev 4070)
@@ -8,9 +8,9 @@
  
 -OBJS	:= gta02.o pcf50633.o nand.o ../common/cmd_neo1973.o \
 +OBJS	:= gta02.o pcf50633.o nand.o nor.o ../common/cmd_neo1973.o \
+ 	   ../common/gsmver.o \
  	   ../common/jbt6k74.o ../common/udc.o ../common/bootmenu.o
  SOBJS	:= ../common/lowlevel_init.o
- 
 Index: u-boot/board/neo1973/gta02/nor.c
 ===================================================================
 --- /dev/null
@@ -77,7 +77,7 @@
  #define	CFG_ENV_IS_IN_NAND	1
  #define CFG_ENV_SIZE		0x40000	/* 128k Total Size of Environment Sector */
  #define CFG_ENV_OFFSET_OOB	1	/* Location of ENV stored in block 0 OOB */
-@@ -274,9 +272,13 @@
+@@ -277,11 +275,15 @@
  #define CONFIG_DRIVER_PCF50633		1
  #define	CONFIG_RTC_PCF50633		1
  
@@ -92,6 +92,8 @@
 +#define CFG_MAX_FLASH_SECT 1
 +
  #define DFU_NUM_ALTERNATES	7
+ 
+ #endif	/* __CONFIG_H */
 Index: u-boot/drivers/mtd/nand/nand_bbt.c
 ===================================================================
 --- u-boot.orig/drivers/mtd/nand/nand_bbt.c

Modified: trunk/src/target/u-boot/patches/neo1973-gsmver.patch
===================================================================
--- trunk/src/target/u-boot/patches/neo1973-gsmver.patch	2008-02-15 13:20:43 UTC (rev 4069)
+++ trunk/src/target/u-boot/patches/neo1973-gsmver.patch	2008-02-15 14:13:49 UTC (rev 4070)
@@ -116,28 +116,3 @@
 +
 +	return 0;
 +}
-Index: u-boot/board/neo1973/gta01/Makefile
-===================================================================
---- u-boot.orig/board/neo1973/gta01/Makefile
-+++ u-boot/board/neo1973/gta01/Makefile
-@@ -25,7 +25,7 @@
- 
- LIB	= lib$(BOARD).a
- 
--OBJS	:= gta01.o pcf50606.o ../common/cmd_neo1973.o ../common/jbt6k74.o ../common/udc.o ../common/bootmenu.o
-+OBJS	:= gta01.o pcf50606.o ../common/cmd_neo1973.o ../common/gsmver.o ../common/jbt6k74.o ../common/udc.o ../common/bootmenu.o
- SOBJS	:= ../common/lowlevel_init.o
- 
- .PHONY:	all
-Index: u-boot/board/neo1973/gta02/Makefile
-===================================================================
---- u-boot.orig/board/neo1973/gta02/Makefile
-+++ u-boot/board/neo1973/gta02/Makefile
-@@ -26,6 +26,7 @@
- LIB	= lib$(BOARD).a
- 
- OBJS	:= gta02.o pcf50633.o nand.o nor.o ../common/cmd_neo1973.o \
-+	   ../common/gsmver.o \
- 	   ../common/jbt6k74.o ../common/udc.o ../common/bootmenu.o
- SOBJS	:= ../common/lowlevel_init.o
- 

Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series	2008-02-15 13:20:43 UTC (rev 4069)
+++ trunk/src/target/u-boot/patches/series	2008-02-15 14:13:49 UTC (rev 4070)
@@ -75,12 +75,12 @@
 gta02-nor.patch
 
 # need to find out how upstream feels about this one
+glamo-mmc.patch
 eabi-toolchain.patch
 
 # for review, merge soon
 unbusy-i2c.patch 
 usbtty-irq-racecondition-fix.patch
-neo1973-gsmver.patch
 uboot-nand_write_yaffs.patch
 uboot-neo1973_defaultconsole_usbtty.patch
 

Modified: trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch	2008-02-15 13:20:43 UTC (rev 4069)
+++ trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch	2008-02-15 14:13:49 UTC (rev 4070)
@@ -326,7 +326,7 @@
 ===================================================================
 --- /dev/null
 +++ u-boot/board/neo1973/common/cmd_neo1973.c
-@@ -0,0 +1,124 @@
+@@ -0,0 +1,126 @@
 +/*
 + * (C) Copyright 2006 by OpenMoko, Inc.
 + * Author: Harald Welte <laforge at openmoko.org>
@@ -414,8 +414,10 @@
 +			goto out_help;
 +		if (!strcmp(argv[2], "on"))
 +			neo1973_gsm(1);
-+		else
++		else if (!strcmp(argv[2], "off"))
 +			neo1973_gsm(0);
++		else if (!strcmp(argv[2], "version"))
++			neo1973_gsmver();
 +	} else if (!strcmp(argv[1], "gps")) {
 +		if (argc < 3)
 +			goto out_help;
@@ -447,7 +449,7 @@
 +	"neo1973 backlight (on|off) - switch backlight on or off\n"
 +	"neo1973 led num (on|off) - switch LED number 'num' on or off\n"
 +	"neo1973 vibrator (on|off) - switch vibrator on or off\n"
-+	"neo1973 gsm (on|off) - switch GSM Modem on or off\n"
++	"neo1973 gsm (on|off|version) - switch GSM Modem on/off or print firmware version\n"
 +	"neo1973 gps (on|off) - switch GPS system on or off\n"
 +);
 +#endif	/* CONFIG_CMD_BDI */
@@ -1091,7 +1093,7 @@
 ===================================================================
 --- /dev/null
 +++ u-boot/board/neo1973/gta01/Makefile
-@@ -0,0 +1,47 @@
+@@ -0,0 +1,48 @@
 +#
 +# (C) Copyright 2000, 2001, 2002
 +# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
@@ -1119,7 +1121,8 @@
 +
 +LIB	= lib$(BOARD).a
 +
-+OBJS	:= gta01.o pcf50606.o ../common/cmd_neo1973.o ../common/jbt6k74.o
++OBJS	:= gta01.o pcf50606.o ../common/cmd_neo1973.o ../common/jbt6k74.o \
++	   ../common/gsmver.o
 +SOBJS	:= ../common/lowlevel_init.o
 +
 +$(LIB):	$(OBJS) $(SOBJS)
@@ -2420,3 +2423,88 @@
 +#endif /* CONFIG_RTC_PCF50606 && CONFIG_CMD_DATE */
 +
 +#endif /* CONFIG DRIVER_PCF50606 */
+Index: u-boot/board/neo1973/common/gsmver.c
+===================================================================
+--- /dev/null
++++ u-boot/board/neo1973/common/gsmver.c
+@@ -0,0 +1,80 @@
++/*
++ * (C) Copyright 2007 OpenMoko, Inc.
++ * Written by Jim Huang <jserv at openmoko.org>
++ *
++ * See file CREDITS for list of people who contributed to this
++ * project.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++/*
++ * Boot support
++ */
++#include <common.h>
++#include <devices.h>
++
++#define GSM_UART_DEVICE  "s3ser0"
++
++int neo1973_gsmver()
++{
++	int i;
++	device_t *dev = NULL;
++	int string_end_count = 0;
++
++	/* Scan for selected output/input device */
++	for (i = 1; i <= ListNumItems (devlist); i++) {
++		device_t *tmp = ListGetPtrToItem (devlist, i);
++		if (!strcmp(tmp->name, GSM_UART_DEVICE)) {
++			dev = tmp;
++			break;
++		}
++	}
++	if (!dev)
++		return -1;
++
++#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_v4)
++	neo1973_gta01_serial0_gsm(1);
++#endif
++
++	/* Query GSM firmware information by AT command */
++	dev->puts("AT+CGMR\r\n");
++	puts("GSM firmware version: ");
++
++	/* read from serial and display version information */
++	while (1) {
++		if (dev->tstc()) {
++			i = dev->getc();
++			putc(i);
++			/* FIXME: should we just dump straightforward
++			 * version string such as "moko1" or "moko4"?
++			 */
++			if (i == '\n' || i == '\r')
++				continue;
++		}
++	}
++	putc('\n');
++
++#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_v4)
++	neo1973_gta01_serial0_gsm(0);
++#endif
++
++	return 0;
++}

Modified: trunk/src/target/u-boot/patches/uboot-gta02.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-gta02.patch	2008-02-15 13:20:43 UTC (rev 4069)
+++ trunk/src/target/u-boot/patches/uboot-gta02.patch	2008-02-15 14:13:49 UTC (rev 4070)
@@ -23,7 +23,7 @@
 ===================================================================
 --- /dev/null
 +++ u-boot/board/neo1973/gta02/Makefile
-@@ -0,0 +1,65 @@
+@@ -0,0 +1,66 @@
 +#
 +# (C) Copyright 2000, 2001, 2002
 +# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
@@ -52,6 +52,7 @@
 +LIB	= lib$(BOARD).a
 +
 +OBJS	:= gta02.o pcf50633.o nand.o ../common/cmd_neo1973.o \
++	   ../common/gsmver.o \
 +	   ../common/jbt6k74.o ../common/udc.o ../common/bootmenu.o
 +SOBJS	:= ../common/lowlevel_init.o
 +

Modified: trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch	2008-02-15 13:20:43 UTC (rev 4069)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch	2008-02-15 14:13:49 UTC (rev 4070)
@@ -908,7 +908,7 @@
 ===================================================================
 --- u-boot.orig/board/neo1973/common/cmd_neo1973.c
 +++ u-boot/board/neo1973/common/cmd_neo1973.c
-@@ -94,6 +94,18 @@
+@@ -96,6 +96,18 @@
  			neo1973_gps(1);
  		else
  			neo1973_gps(0);
@@ -927,9 +927,9 @@
  	} else {
  out_help:
  		printf("Usage:\n%s\n", cmdtp->usage);
-@@ -120,5 +132,6 @@
+@@ -122,5 +134,6 @@
  	"neo1973 vibrator (on|off) - switch vibrator on or off\n"
- 	"neo1973 gsm (on|off) - switch GSM Modem on or off\n"
+ 	"neo1973 gsm (on|off|version) - switch GSM Modem on/off or print firmware version\n"
  	"neo1973 gps (on|off) - switch GPS system on or off\n"
 +	"neo1973 udc pullup (on|off) - switch USB device controller pull-up on or off\n"
  );
@@ -938,12 +938,12 @@
 ===================================================================
 --- u-boot.orig/board/neo1973/gta01/Makefile
 +++ u-boot/board/neo1973/gta01/Makefile
-@@ -25,7 +25,7 @@
- 
+@@ -26,7 +26,7 @@
  LIB	= lib$(BOARD).a
  
--OBJS	:= gta01.o pcf50606.o ../common/cmd_neo1973.o ../common/jbt6k74.o
-+OBJS	:= gta01.o pcf50606.o ../common/cmd_neo1973.o ../common/jbt6k74.o ../common/udc.o
+ OBJS	:= gta01.o pcf50606.o ../common/cmd_neo1973.o ../common/jbt6k74.o \
+-	   ../common/gsmver.o
++	   ../common/gsmver.o ../common/udc.o
  SOBJS	:= ../common/lowlevel_init.o
  
  $(LIB):	$(OBJS) $(SOBJS)





More information about the commitlog mailing list