* Patch by Martin Krause, 09 Oct 2003:

  Fixes for TRAB board
  - /board/trab/rs485.c: correct baudrate
  - /board/trab/cmd_trab.c: bug fix for problem with timer overflow in
    udelay(); fix some timing problems with adc controller
  - /board/trab/trab_fkt.c: add new commands: gain, eeprom and power;
    modify commands: touch and buzzer

* Disable CONFIG_SUPPORT_VFAT when used with CONFIG_AUTO_UPDATE
  (quick & dirty workaround for rogue pointer problem in get_vfatname());
  Use direct function calls for auto_update instead of hush commands

CHANGELOG

@@ -2,6 +2,18 @@
 Changes for U-Boot 1.0.0:
 ======================================================================
 
+* Patch by Martin Krause, 09 Oct 2003:
+  Fixes for TRAB board
+  - /board/trab/rs485.c: correct baudrate
+  - /board/trab/cmd_trab.c: bug fix for problem with timer overflow in 
+    udelay(); fix some timing problems with adc controller
+  - /board/trab/trab_fkt.c: add new commands: gain, eeprom and power;
+    modify commands: touch and buzzer
+
+* Disable CONFIG_SUPPORT_VFAT when used with CONFIG_AUTO_UPDATE
+  (quick & dirty workaround for rogue pointer problem in get_vfatname());
+  Use direct function calls for auto_update instead of hush commands
+
 * Patch by Scott McNutt, 04 Oct 2003:
   - add support for Altera Nios-32 CPU
   - add support for Nios Cyclone Development Kit (DK-1C20)

board/trab/auto_update.c

@@ -183,9 +183,7 @@ struct flash_layout aufl_layout[AU_MAXFILES - 3] = { \
 #define FIDX_TO_LIDX(idx) ((idx) - 2)
 
 /* where to load files into memory */
-#define LOAD_ADDR ((unsigned char *)0x0C100100)
-/* where to build strings in memory - 256 bytes should be enough */
-#define STRING_ADDR ((char *)0x0C100000)
+#define LOAD_ADDR ((unsigned char *)0x0C100000)
 /* the app is the largest image */
 #define MAX_LOADSZ ausize[IDX_APP]
 
@@ -199,6 +197,9 @@ extern int i2c_write (uchar, uint, int , uchar* , int);
 extern int trab_vfd (ulong);
 extern int transfer_pic(unsigned char, unsigned char *, int, int);
 #endif
+extern int flash_sect_erase(ulong, ulong);
+extern int flash_sect_protect (int, ulong, ulong);
+extern int flash_write (uchar *, ulong, ulong);
 /* change char* to void* to shutup the compiler */
 extern int i2c_write_multiple (uchar, uint, int, void *, int);
 extern int i2c_read_multiple (uchar, uint, int, void *, int);
@@ -305,13 +306,12 @@ au_check_valid(int idx, long nbytes)
 #define POWER_OFF (1 << 1)
 
 int
-au_do_update(int idx, long sz, int repeat)
+au_do_update(int idx, long sz)
 {
 	image_header_t *hdr;
 	char *addr;
 	long start, end;
-	char *strbuf = STRING_ADDR;
-	int off;
+	int off, rc;
 	uint nbytes;
 
 	hdr = (image_header_t *)LOAD_ADDR;
@@ -342,20 +342,14 @@ au_do_update(int idx, long sz, int repeat)
 		start = aufl_layout[1].start;
 		end = aufl_layout[1].end;
 #endif
-		debug ("protect off %lx %lx\n", start, end);
-		sprintf(strbuf, "protect off %lx %lx\n", start, end);
-		parse_string_outer(strbuf, FLAG_PARSE_SEMICOLON);
+		flash_sect_protect(0, start, end);
 	}
 
 	/*
-	 * erase the address range. Multiple erases seem to cause
-	 * problems.
+	 * erase the address range.
 	 */
-	if (repeat == 0) {
-		debug ("erase %lx %lx\n", start, end);
-		sprintf(strbuf, "erase %lx %lx\n", start, end);
-		parse_string_outer(strbuf, FLAG_PARSE_SEMICOLON);
-	}
+	debug ("flash_sect_erase(%lx, %lx);\n", start, end);
+	flash_sect_erase(start, end);
 	wait_ms(100);
 	/* strip the header - except for the kernel and app */
 	if (idx == IDX_FIRMWARE || idx == IDX_DISK) {
@@ -374,9 +368,12 @@ au_do_update(int idx, long sz, int repeat)
 	}
 
 	/* copy the data from RAM to FLASH */
-	debug ("cp.b %p %lx %x\n", addr, start, nbytes);
-	sprintf(strbuf, "cp.b %p %lx %x\n", addr, start, nbytes);
-	parse_string_outer(strbuf, FLAG_PARSE_SEMICOLON);
+	debug ("flash_write(%p, %lx %x)\n", addr, start, nbytes);
+	rc = flash_write(addr, start, nbytes);
+	if (rc != 0) {
+		printf("Flashing failed due to error %d\n", rc);
+		return -1;
+	}
 
 	/* check the dcrc of the copy */
 	if (crc32 (0, (char *)(start + off), ntohl(hdr->ih_size)) != ntohl(hdr->ih_dcrc)) {
@@ -386,11 +383,8 @@ au_do_update(int idx, long sz, int repeat)
 
 	/* protect the address range */
 	/* this assumes that ONLY the firmware is protected! */
-	if (idx == IDX_FIRMWARE) {
-		debug ("protect on %lx %lx\n", start, end);
-		sprintf(strbuf, "protect on %lx %lx\n", start, end);
-		parse_string_outer(strbuf, FLAG_PARSE_SEMICOLON);
-	}
+	if (idx == IDX_FIRMWARE)
+		flash_sect_protect(1, start, end);
 	return 0;
 }
 
@@ -587,7 +581,7 @@ do_auto_update(void)
 		cnt = 0;
 		got_ctrlc = 0;
 		do {
-			res = au_do_update(i, sz, cnt);
+			res = au_do_update(i, sz);
 			/* let the user break out of the loop */
 			if (ctrlc() || had_ctrlc()) {
 				clear_ctrlc();

board/trab/cmd_trab.c

@@ -21,6 +21,8 @@
  * MA 02111-1307 USA
  */
 
+#undef DEBUG
+
 #include <common.h>
 #include <command.h>
 #include <s3c2400.h>
@@ -71,7 +73,7 @@
 #define I2C_EEPROM_DEV_ADDR     0x54
 
 /* EEPROM address map */
-#define EE_ADDR_TEST                    128
+#define EE_ADDR_TEST                    192
 #define EE_ADDR_MAX_CYCLES              256
 #define EE_ADDR_STATUS                  258
 #define EE_ADDR_PASS_CYCLES             259
@@ -148,7 +150,7 @@ u16 act_cycle;
 
 typedef struct test_function_s {
 	unsigned char *name;
-        int (*pf)(void);
+	int (*pf)(void);
 } test_function_t;
 
 /* max number of Burn In Functions */
@@ -160,245 +162,251 @@ test_function_t test_function[BIF_MAX];
 
 int do_burn_in (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
-        int i;
-        int cycle_status;
+	int i;
+	int cycle_status;
 
-        if (argc > 1) {
+	if (argc > 1) {
 		printf ("Usage:\n%s\n", cmdtp->usage);
 		return 1;
 	}
 
-        led_init ();
-        global_vars_init ();
-        test_function_table_init ();
-
-        if (global_vars_write_to_eeprom () != 0) {
-                printf ("%s: error writing global_vars to eeprom\n",
-                        __FUNCTION__);
-                return (1);
-        }
-
-        if (read_max_cycles () != 0) {
-                printf ("%s: error reading max_cycles from eeprom\n",
-                        __FUNCTION__);
-                return (1);
-        }
-
-        if (max_cycles == 0) {
-                printf ("%s: error, burn in max_cycles = 0\n", __FUNCTION__);
-                return (1);
-        }
-
-        status = 0;
-        for (act_cycle = 1; act_cycle <= max_cycles; act_cycle++) {
-
-                cycle_status = 0;
-                for (i = 0; i < BIF_MAX; i++) {
-
-                        /* call test function */
-                        if ((*test_function[i].pf)() != 0) {
-                                printf ("error in %s test\n",
-                                        test_function[i].name);
-
-                                /* is it the first error? */
-                                if (status == 0) {
-                                        status = 1;
-                                        first_error_cycle = act_cycle;
-
-                                        /* do not use error_num 0 */
-                                        first_error_num = i+1;
-                                        strncpy (first_error_name,
-                                                 test_function[i].name,
-                                                 sizeof (first_error_name));
-                                        led_set (0);
-                                }
-                                cycle_status = 1;
-                        }
-                }
-                /* were all tests of actual cycle OK? */
-                if (cycle_status == 0)
-                        pass_cycles++;
-
-                /* set status LED if no error is occoured since yet */
-                if (status == 0)
-                        led_set (1);
-
-                printf ("%s: cycle %d finished\n", __FUNCTION__, act_cycle);
-
-                /* pause between cycles */
-                sdelay (BURN_IN_CYCLE_DELAY);
-        }
-
-        if (global_vars_write_to_eeprom () != 0) {
-                led_set (0);
-                printf ("%s: error writing global_vars to eeprom\n",
-                        __FUNCTION__);
-                status = 1;
-        }
-
-        if (status == 0) {
-                led_blink ();   /* endless loop!! */
-                return (0);
-        } else {
-                led_set (0);
-                return (1);
-        }
+	led_init ();
+	global_vars_init ();
+	test_function_table_init ();
+
+	if (global_vars_write_to_eeprom () != 0) {
+		printf ("%s: error writing global_vars to eeprom\n",
+			__FUNCTION__);
+		return (1);
+	}
+
+	if (read_max_cycles () != 0) {
+		printf ("%s: error reading max_cycles from eeprom\n",
+			__FUNCTION__);
+		return (1);
+	}
+
+	if (max_cycles == 0) {
+		printf ("%s: error, burn in max_cycles = 0\n", __FUNCTION__);
+		return (1);
+	}
+
+	status = 0;
+	for (act_cycle = 1; act_cycle <= max_cycles; act_cycle++) {
+
+		cycle_status = 0;
+
+		/*
+		 * avoid timestamp overflow problem after about 68 minutes of
+		 * udelay() time.
+		 */
+		reset_timer_masked ();
+		for (i = 0; i < BIF_MAX; i++) {
+
+			/* call test function */
+			if ((*test_function[i].pf)() != 0) {
+				printf ("error in %s test\n",
+					test_function[i].name);
+
+				/* is it the first error? */
+				if (status == 0) {
+					status = 1;
+					first_error_cycle = act_cycle;
+
+					/* do not use error_num 0 */
+					first_error_num = i+1;
+					strncpy (first_error_name,
+						 test_function[i].name,
+						 sizeof (first_error_name));
+					led_set (0);
+				}
+				cycle_status = 1;
+			}
+		}
+		/* were all tests of actual cycle OK? */
+		if (cycle_status == 0)
+			pass_cycles++;
+
+		/* set status LED if no error is occoured since yet */
+		if (status == 0)
+			led_set (1);
+
+		printf ("%s: cycle %d finished\n", __FUNCTION__, act_cycle);
+
+		/* pause between cycles */
+		sdelay (BURN_IN_CYCLE_DELAY);
+	}
+
+	if (global_vars_write_to_eeprom () != 0) {
+		led_set (0);
+		printf ("%s: error writing global_vars to eeprom\n",
+			__FUNCTION__);
+		status = 1;
+	}
+
+	if (status == 0) {
+		led_blink ();   /* endless loop!! */
+		return (0);
+	} else {
+		led_set (0);
+		return (1);
+	}
 }
 
 U_BOOT_CMD(
- 	burn_in,	1,	1,	do_burn_in,
- 	"burn_in - start burn-in test application on TRAB\n",
- 	"\n"
- 	"    -  start burn-in test application\n"
-        "       The burn-in test could took a while to finish!\n"
-        "       The content of the onboard EEPROM is modified!\n"
+	burn_in,	1,	1,	do_burn_in,
+	"burn_in - start burn-in test application on TRAB\n",
+	"\n"
+	"    -  start burn-in test application\n"
+	"       The burn-in test could took a while to finish!\n"
+	"       The content of the onboard EEPROM is modified!\n"
 );
 
 
 int do_dip (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
-        int i, dip;
+	int i, dip;
 
-      	if (argc > 1) {
+	if (argc > 1) {
 		printf ("Usage:\n%s\n", cmdtp->usage);
 		return 1;
 	}
 
-        if ((dip = read_dip ()) == -1) {
-                return 1;
-        }
+	if ((dip = read_dip ()) == -1) {
+		return 1;
+	}
 
-        for (i = 0; i < 4; i++) {
-                if ((dip & (1 << i)) == 0)
-                        printf("0");
-                else
-                        printf("1");
-        }
-        printf("\n");
+	for (i = 0; i < 4; i++) {
+		if ((dip & (1 << i)) == 0)
+			printf("0");
+		else
+			printf("1");
+	}
+	printf("\n");
 
 	return 0;
 }
 
 U_BOOT_CMD(
- 	dip,	1,	1,	do_dip,
- 	"dip     - read dip switch on TRAB\n",
- 	"\n"
- 	"    - read state of dip switch (S1) on TRAB board\n"
-        "      read sequence: 1-2-3-4; ON=1; OFF=0; e.g.: \"0100\"\n"
+	dip,	1,	1,	do_dip,
+	"dip     - read dip switch on TRAB\n",
+	"\n"
+	"    - read state of dip switch (S1) on TRAB board\n"
+	"      read sequence: 1-2-3-4; ON=1; OFF=0; e.g.: \"0100\"\n"
 );
 
 
 int do_vcc5v (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
-        int vcc5v;
+	int vcc5v;
 
-        if (argc > 1) {
+	if (argc > 1) {
 		printf ("Usage:\n%s\n", cmdtp->usage);
 		return 1;
 	}
 
-        if ((vcc5v = read_vcc5v ()) == -1) {
-                return (1);
-        }
+	if ((vcc5v = read_vcc5v ()) == -1) {
+		return (1);
+	}
 
-        printf ("%d", (vcc5v / 1000));
-        printf (".%d", (vcc5v % 1000) / 100);
-        printf ("%d V\n", (vcc5v % 100) / 10) ;
+	printf ("%d", (vcc5v / 1000));
+	printf (".%d", (vcc5v % 1000) / 100);
+	printf ("%d V\n", (vcc5v % 100) / 10) ;
 
 	return 0;
 }
 
 U_BOOT_CMD(
- 	vcc5v,	1,	1,	do_vcc5v,
- 	"vcc5v   - read VCC5V on TRAB\n",
- 	"\n"
- 	"    - read actual value of voltage VCC5V\n"
+	vcc5v,	1,	1,	do_vcc5v,
+	"vcc5v   - read VCC5V on TRAB\n",
+	"\n"
+	"    - read actual value of voltage VCC5V\n"
 );
 
 
 int do_contact_temp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
-        int contact_temp;
+	int contact_temp;
 
-        if (argc > 1) {
+	if (argc > 1) {
 		printf ("Usage:\n%s\n", cmdtp->usage);
 		return 1;
 	}
 
-        spi_init ();
-        tsc2000_reg_init ();
+	spi_init ();
+	tsc2000_reg_init ();
 
-        contact_temp = tsc2000_contact_temp();
-        printf ("%d degree C * 100\n", contact_temp) ;
+	contact_temp = tsc2000_contact_temp();
+	printf ("%d degree C * 100\n", contact_temp) ;
 
 	return 0;
 }
 
 U_BOOT_CMD(
- 	c_temp,	1,	1,	do_contact_temp,
- 	"c_temp  - read contact temperature on TRAB\n",
- 	"\n"
- 	"    -  reads the onboard temperature (=contact temperature)\n"
+	c_temp,	1,	1,	do_contact_temp,
+	"c_temp  - read contact temperature on TRAB\n",
+	"\n"
+	"    -  reads the onboard temperature (=contact temperature)\n"
 );
 
 
 int do_burn_in_status (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
-        if (argc > 1) {
+	if (argc > 1) {
 		printf ("Usage:\n%s\n", cmdtp->usage);
 		return 1;
 	}
 
-        if (i2c_read_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_STATUS, 1,
-                                (unsigned char*) &status, 1)) {
-                return (1);
-        }
-        if (i2c_read_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_PASS_CYCLES, 1,
-                                (unsigned char*) &pass_cycles, 2)) {
-                return (1);
-        }
-        if (i2c_read_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_FIRST_ERROR_CYCLE,
-                                1, (unsigned char*) &first_error_cycle, 2)) {
-                return (1);
-        }
-        if (i2c_read_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_FIRST_ERROR_NUM,
-                                1, (unsigned char*) &first_error_num, 1)) {
-                return (1);
-        }
-        if (i2c_read_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_FIRST_ERROR_NAME,
-                               1, first_error_name,
-                               sizeof (first_error_name))) {
-                return (1);
-        }
-
-        if (read_max_cycles () != 0) {
-                return (1);
-        }
-
-        printf ("max_cycles = %d\n", max_cycles);
-        printf ("status = %d\n", status);
-        printf ("pass_cycles = %d\n", pass_cycles);
-        printf ("first_error_cycle = %d\n", first_error_cycle);
-        printf ("first_error_num = %d\n", first_error_num);
-        printf ("first_error_name = %.*s\n",(int) sizeof(first_error_name),
-                first_error_name);
+	if (i2c_read_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_STATUS, 1,
+				(unsigned char*) &status, 1)) {
+		return (1);
+	}
+	if (i2c_read_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_PASS_CYCLES, 1,
+				(unsigned char*) &pass_cycles, 2)) {
+		return (1);
+	}
+	if (i2c_read_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_FIRST_ERROR_CYCLE,
+				1, (unsigned char*) &first_error_cycle, 2)) {
+		return (1);
+	}
+	if (i2c_read_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_FIRST_ERROR_NUM,
+				1, (unsigned char*) &first_error_num, 1)) {
+		return (1);
+	}
+	if (i2c_read_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_FIRST_ERROR_NAME,
+			       1, first_error_name,
+			       sizeof (first_error_name))) {
+		return (1);
+	}
+
+	if (read_max_cycles () != 0) {
+		return (1);
+	}
+
+	printf ("max_cycles = %d\n", max_cycles);
+	printf ("status = %d\n", status);
+	printf ("pass_cycles = %d\n", pass_cycles);
+	printf ("first_error_cycle = %d\n", first_error_cycle);
+	printf ("first_error_num = %d\n", first_error_num);
+	printf ("first_error_name = %.*s\n",(int) sizeof(first_error_name),
+		first_error_name);
 
 	return 0;
 }
 
 U_BOOT_CMD(
- 	bis,	1,	1,	do_burn_in_status,
- 	"bis     - print burn in status on TRAB\n",
- 	"\n"
- 	"    -  prints the status variables of the last burn in test\n"
-        "       stored in the onboard EEPROM on TRAB board\n"
+	bis,	1,	1,	do_burn_in_status,
+	"bis     - print burn in status on TRAB\n",
+	"\n"
+	"    -  prints the status variables of the last burn in test\n"
+	"       stored in the onboard EEPROM on TRAB board\n"
 );
 
 static int read_dip (void)
 {
-        unsigned int result = 0;
-        int adc_val;
-        int i;
+	unsigned int result = 0;
+	int adc_val;
+	int i;
 
 	/***********************************************************
 	 DIP switch connection (according to wa4-cpu.sp.301.pdf, page 3):
@@ -413,11 +421,11 @@ static int read_dip (void)
 
 	for (i = 7; i > 3; i--) {
 
-                if ((adc_val = adc_read (i)) == -1) {
-                        printf ("%s: Channel %d could not be read\n",
-                                 __FUNCTION__, i);
-                        return (-1);
-                }
+		if ((adc_val = adc_read (i)) == -1) {
+			printf ("%s: Channel %d could not be read\n",
+				 __FUNCTION__, i);
+			return (-1);
+		}
 
 		/*
 		 * Input voltage (switch open) is 1.8 V.
@@ -425,397 +433,410 @@ static int read_dip (void)
 		 * Set trigger at halve that value.
 		 */
 		if (adc_val < 368)
-                        result |= (1 << (i-4));
-        }
-        return (result);
+			result |= (1 << (i-4));
+	}
+	return (result);
 }
 
 
 static int read_vcc5v (void)
 {
-        s32 result;
-
-        /* VCC5V is connected to channel 2 */
-
-        if ((result = adc_read (2)) == -1) {
-                printf ("%s: VCC5V could not be read\n", __FUNCTION__);
-                return (-1);
-        }
-        /*
-         * Calculate voltage value. Split in two parts because there is no
-         * floating point support.  VCC5V is connected over an resistor divider:
-         * VCC5V=ADCval*2,5V/1023*(10K+30K)/10K.
-         */
-        result = result * 10 * 1000 / 1023; /* result in mV */
-
-        return (result);
+	s32 result;
+
+	/* VCC5V is connected to channel 2 */
+
+	if ((result = adc_read (2)) == -1) {
+		printf ("%s: VCC5V could not be read\n", __FUNCTION__);
+		return (-1);
+	}
+	/*
+	 * Calculate voltage value. Split in two parts because there is no
+	 * floating point support.  VCC5V is connected over an resistor divider:
+	 * VCC5V=ADCval*2,5V/1023*(10K+30K)/10K.
+	 */
+	result = result * 10 * 1000 / 1023; /* result in mV */
+
+	return (result);
 }
 
 
 static int test_dip (void)
 {
-        static int first_run = 1;
-        static int first_dip;
-
-        if (first_run) {
-                if ((first_dip = read_dip ()) == -1) {
-                        return (1);
-                }
-                first_run = 0;
-                debug ("%s: first_dip=%d\n", __FUNCTION__, first_dip);
-        }
-        if (first_dip != read_dip ()) {
-                return (1);
-        } else {
-                return (0);
-        }
+	static int first_run = 1;
+	static int first_dip;
+
+	if (first_run) {
+		if ((first_dip = read_dip ()) == -1) {
+			return (1);
+		}
+		first_run = 0;
+		debug ("%s: first_dip=%d\n", __FUNCTION__, first_dip);
+	}
+	if (first_dip != read_dip ()) {
+		return (1);
+	} else {
+		return (0);
+	}
 }
 
 
 static int test_vcc5v (void)
 {
-        int vcc5v;
+	int vcc5v;
 
-        if ((vcc5v = read_vcc5v ()) == -1) {
-                return (1);
-        }
+	if ((vcc5v = read_vcc5v ()) == -1) {
+		return (1);
+	}
 
-        if ((vcc5v > VCC5V_MAX) || (vcc5v < VCC5V_MIN)) {
-                return (1);
-        } else {
-                return (0);
-        }
+	if ((vcc5v > VCC5V_MAX) || (vcc5v < VCC5V_MIN)) {
+		printf ("%s: vcc5v[V/100]=%d\n", __FUNCTION__, vcc5v);
+		return (1);
+	} else {
+		return (0);
+	}
 }
 
 
 static int test_rotary_switch (void)
 {
-        static int first_run = 1;
-        static int first_rs;
-
-        if (first_run) {
-                /*
-                 * clear bits in CPLD, because they have random values after
-                 * power-up or reset.
-                 */
-                *CPLD_ROTARY_SWITCH |= (1 << 16) | (1 << 17);
-
-                first_rs = ((*CPLD_ROTARY_SWITCH >> 16) & 0x7);
-                first_run = 0;
-                debug ("%s: first_rs=%d\n", __FUNCTION__, first_rs);
-        }
-
-        if (first_rs != ((*CPLD_ROTARY_SWITCH >> 16) & 0x7)) {
-                return (1);
-        } else {
-                return (0);
-        }
+	static int first_run = 1;
+	static int first_rs;
+
+	if (first_run) {
+		/*
+		 * clear bits in CPLD, because they have random values after
+		 * power-up or reset.
+		 */
+		*CPLD_ROTARY_SWITCH |= (1 << 16) | (1 << 17);
+
+		first_rs = ((*CPLD_ROTARY_SWITCH >> 16) & 0x7);
+		first_run = 0;
+		debug ("%s: first_rs=%d\n", __FUNCTION__, first_rs);
+	}
+
+	if (first_rs != ((*CPLD_ROTARY_SWITCH >> 16) & 0x7)) {
+		return (1);
+	} else {
+		return (0);
+	}
 }
 
 
 static int test_sram (void)
 {
-        return (memory_post_tests (SRAM_ADDR, SRAM_SIZE));
+	return (memory_post_tests (SRAM_ADDR, SRAM_SIZE));
 }
 
 
 static int test_eeprom (void)
 {
-        unsigned char temp[sizeof (EEPROM_TEST_STRING_1)];
-        int result = 0;
-
-        /* write test string 1, read back and verify */
-        if (i2c_write_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_TEST, 1,
-                                EEPROM_TEST_STRING_1,
-                                sizeof (EEPROM_TEST_STRING_1))) {
-                return (1);
-        }
-
-        if (i2c_read_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_TEST, 1,
-                               temp, sizeof (EEPROM_TEST_STRING_1))) {
-                return (1);
-        }
-
-        if (strcmp (temp, EEPROM_TEST_STRING_1) != 0) {
-                result = 1;
-                printf ("%s: error; read_str = \"%s\"\n", __FUNCTION__, temp);
-        }
-
-        /* write test string 2, read back and verify */
-        if (result == 0) {
-                if (i2c_write_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_TEST, 1,
-                                        EEPROM_TEST_STRING_2,
-                                        sizeof (EEPROM_TEST_STRING_2))) {
-                        return (1);
-                }
-
-                if (i2c_read_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_TEST, 1,
-                                       temp, sizeof (EEPROM_TEST_STRING_2))) {
-                        return (1);
-                }
-
-                if (strcmp (temp, EEPROM_TEST_STRING_2) != 0) {
-                        result = 1;
-                        printf ("%s: error; read str = \"%s\"\n",
-                                __FUNCTION__, temp);
-                }
-        }
-        return (result);
+	unsigned char temp[sizeof (EEPROM_TEST_STRING_1)];
+	int result = 0;
+
+	/* write test string 1, read back and verify */
+	if (i2c_write_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_TEST, 1,
+				EEPROM_TEST_STRING_1,
+				sizeof (EEPROM_TEST_STRING_1))) {
+		return (1);
+	}
+
+	if (i2c_read_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_TEST, 1,
+			       temp, sizeof (EEPROM_TEST_STRING_1))) {
+		return (1);
+	}
+
+	if (strcmp (temp, EEPROM_TEST_STRING_1) != 0) {
+		result = 1;
+		printf ("%s: error; read_str = \"%s\"\n", __FUNCTION__, temp);
+	}
+
+	/* write test string 2, read back and verify */
+	if (result == 0) {
+		if (i2c_write_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_TEST, 1,
+					EEPROM_TEST_STRING_2,
+					sizeof (EEPROM_TEST_STRING_2))) {
+			return (1);
+		}
+
+		if (i2c_read_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_TEST, 1,
+				       temp, sizeof (EEPROM_TEST_STRING_2))) {
+			return (1);
+		}
+
+		if (strcmp (temp, EEPROM_TEST_STRING_2) != 0) {
+			result = 1;
+			printf ("%s: error; read str = \"%s\"\n",
+				__FUNCTION__, temp);
+		}
+	}
+	return (result);
 }
 
 
 static int test_contact_temp (void)
 {
-        int contact_temp;
+	int contact_temp;
 
-        spi_init ();
-        contact_temp = tsc2000_contact_temp ();
+	spi_init ();
+	contact_temp = tsc2000_contact_temp ();
 
-        if ((contact_temp < MIN_CONTACT_TEMP)
-            || (contact_temp > MAX_CONTACT_TEMP))
-                return (1);
-        else
-                return (0);
+	if ((contact_temp < MIN_CONTACT_TEMP)
+	    || (contact_temp > MAX_CONTACT_TEMP))
+		return (1);
+	else
+		return (0);
 }
 
 
 int i2c_write_multiple (uchar chip, uint addr, int alen,
 			uchar *buffer, int len)
 {
-        int i;
-
-        if (alen != 1) {
-                printf ("%s: addr len other than 1 not supported\n",
-                         __FUNCTION__);
-                return (1);
-        }
-
-        for (i = 0; i < len; i++) {
-                if (i2c_write (chip, addr+i, alen, buffer+i, 1)) {
-                        printf ("%s: could not write to i2c device %d"
-                                 ", addr %d\n", __FUNCTION__, chip, addr);
-                        return (1);
-                }
+	int i;
+
+	if (alen != 1) {
+		printf ("%s: addr len other than 1 not supported\n",
+			 __FUNCTION__);
+		return (1);
+	}
+
+	for (i = 0; i < len; i++) {
+		if (i2c_write (chip, addr+i, alen, buffer+i, 1)) {
+			printf ("%s: could not write to i2c device %d"
+				 ", addr %d\n", __FUNCTION__, chip, addr);
+			return (1);
+		}
 #if 0
-                printf ("chip=%#x, addr+i=%#x+%d=%p, alen=%d, *buffer+i="
-                        "%#x+%d=%p=\"%.1s\"\n", chip, addr, i, addr+i,
-                        alen, buffer, i, buffer+i, buffer+i);
+		printf ("chip=%#x, addr+i=%#x+%d=%p, alen=%d, *buffer+i="
+			"%#x+%d=%p=\"%.1s\"\n", chip, addr, i, addr+i,
+			alen, buffer, i, buffer+i, buffer+i);
 #endif
 
-                udelay (30000);
-        }
-        return (0);
+		udelay (30000);
+	}
+	return (0);
 }
 
 
 int i2c_read_multiple ( uchar chip, uint addr, int alen,
 			uchar *buffer, int len)
 {
-        int i;
-
-        if (alen != 1) {
-                printf ("%s: addr len other than 1 not supported\n",
-                         __FUNCTION__);
-                return (1);
-        }
-
-        for (i = 0; i < len; i++) {
-                if (i2c_read (chip, addr+i, alen, buffer+i, 1)) {
-                        printf ("%s: could not read from i2c device %#x"
-                                 ", addr %d\n", __FUNCTION__, chip, addr);
-                        return (1);
-                }
-        }
-        return (0);
+	int i;
+
+	if (alen != 1) {
+		printf ("%s: addr len other than 1 not supported\n",
+			 __FUNCTION__);
+		return (1);
+	}
+
+	for (i = 0; i < len; i++) {
+		if (i2c_read (chip, addr+i, alen, buffer+i, 1)) {
+			printf ("%s: could not read from i2c device %#x"
+				 ", addr %d\n", __FUNCTION__, chip, addr);
+			return (1);
+		}
+	}
+	return (0);
 }
 
 
 static int adc_read (unsigned int channel)
 {
-        int j = 1000; /* timeout value for wait loop in us */
-        S3C2400_ADC *padc;
-
-        padc = S3C2400_GetBase_ADC();
-        channel &= 0x7;
+	int j = 1000; /* timeout value for wait loop in us */
+	int result;
+	S3C2400_ADC *padc;
 
-        adc_init ();
+	padc = S3C2400_GetBase_ADC();
+	channel &= 0x7;
 
-	debug ("%s: adccon %#x\n", __FUNCTION__, padc->ADCCON);
+	adc_init ();
 
-        padc->ADCCON &= ~ADC_STDBM; /* select normal mode */
+	padc->ADCCON &= ~ADC_STDBM; /* select normal mode */
 	padc->ADCCON &= ~(0x7 << 3); /* clear the channel bits */
-        padc->ADCCON |= ((channel << 3) | ADC_ENABLE_START);
+	padc->ADCCON |= ((channel << 3) | ADC_ENABLE_START);
 
-        debug ("%s: reading ch %d, addcon %#x\n", __FUNCTION__,
-		(padc->ADCCON >> 3) & 0x7, padc->ADCCON);
+	while (j--) {
+		if ((padc->ADCCON & ADC_ENABLE_START) == 0)
+			break;
+		udelay (1);
+	}
+
+	if (j == 0) {
+		printf("%s: ADC timeout\n", __FUNCTION__);
+		padc->ADCCON |= ADC_STDBM; /* select standby mode */
+		return -1;
+	}
 
-        while (j--) {
-                if ((padc->ADCCON & ADC_ENABLE_START) == 0)
-                        break;
-                udelay (1);
-        }
+	result = padc->ADCDAT & 0x3FF;
 
-        if (j == 0) {
-                printf("%s: ADC timeout\n", __FUNCTION__);
-                padc->ADCCON |= ADC_STDBM; /* select standby mode */
-                return -1;
-        }
+	padc->ADCCON |= ADC_STDBM; /* select standby mode */
 
-        padc->ADCCON |= ADC_STDBM; /* select standby mode */
+	debug ("%s: channel %d, result[DIGIT]=%d\n", __FUNCTION__,
+	       (padc->ADCCON >> 3) & 0x7, result);
 
-        debug ("%s: return %#x, adccon %#x\n", __FUNCTION__,
-		padc->ADCDAT & 0x3FF, padc->ADCCON);
+	/*
+	 * Wait for ADC to be ready for next conversion. This delay value was
+	 * estimated, because the datasheet does not specify a value.
+	 */
+	udelay (1000);
 
-        return (padc->ADCDAT & 0x3FF);
+	return (result);
 }
 
 
 static void adc_init (void)
 {
-        S3C2400_ADC *padc;
+	S3C2400_ADC *padc;
 
-        padc = S3C2400_GetBase_ADC();
+	padc = S3C2400_GetBase_ADC();
 
 	padc->ADCCON &= ~(0xff << 6); /* clear prescaler bits */
 	padc->ADCCON |= ((65 << 6) | ADC_PRSCEN); /* set prescaler */
 
-        return;
+	/*
+	 * Wait some time to avoid problem with very first call of
+	 * adc_read(). Without this delay, sometimes the first read
+	 * adc value is 0. Perhaps because the adjustment of prescaler
+	 * takes some clock cycles?
+	 */
+	udelay (1000);
+
+	return;
 }
 
 
 static void led_set (unsigned int state)
 {
-        S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
-
-        led_init ();
-
-        switch (state) {
-        case 0: /* turn LED off */
-                gpio->PADAT |= (1 << 12);
-                break;
-        case 1: /* turn LED on */
-                gpio->PADAT &= ~(1 << 12);
-                break;
-        default:
-        }
+	S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
+
+	led_init ();
+
+	switch (state) {
+	case 0: /* turn LED off */
+		gpio->PADAT |= (1 << 12);
+		break;
+	case 1: /* turn LED on */
+		gpio->PADAT &= ~(1 << 12);
+		break;
+	default:
+	}
 }
 
 static void led_blink (void)
 {
-        led_init ();
-
-        /* blink LED. This function does not return! */
-        while (1) {
-                led_set (1);
-                udelay (1000000 / LED_BLINK_FREQ / 2);
-                led_set (0);
-                udelay (1000000 / LED_BLINK_FREQ / 2);
-        }
+	led_init ();
+
+	/* blink LED. This function does not return! */
+	while (1) {
+		led_set (1);
+		udelay (1000000 / LED_BLINK_FREQ / 2);
+		led_set (0);
+		udelay (1000000 / LED_BLINK_FREQ / 2);
+	}
 }
 
 
 static void led_init (void)
 {
-        S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
+	S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
 
-        /* configure GPA12 as output and set to High -> LED off */
-        gpio->PACON &= ~(1 << 12);
-        gpio->PADAT |= (1 << 12);
+	/* configure GPA12 as output and set to High -> LED off */
+	gpio->PACON &= ~(1 << 12);
+	gpio->PADAT |= (1 << 12);
 }
 
 
 static void sdelay (unsigned long seconds)
 {
-        unsigned long i;
+	unsigned long i;
 
-        for (i = 0; i < seconds; i++) {
-                udelay (1000000);
-        }
+	for (i = 0; i < seconds; i++) {
+		udelay (1000000);
+	}
 }
 
 
 static int global_vars_write_to_eeprom (void)
 {
-        if (i2c_write_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_STATUS, 1,
-                                (unsigned char*) &status, 1)) {
-                return (1);
-        }
-        if (i2c_write_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_PASS_CYCLES, 1,
-                                (unsigned char*) &pass_cycles, 2)) {
-                return (1);
-        }
-        if (i2c_write_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_FIRST_ERROR_CYCLE,
-                                1, (unsigned char*) &first_error_cycle, 2)) {
-                return (1);
-        }
-        if (i2c_write_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_FIRST_ERROR_NUM,
-                                1, (unsigned char*) &first_error_num, 1)) {
-                return (1);
-        }
-        if (i2c_write_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_FIRST_ERROR_NAME,
-                                1, first_error_name,
-                                sizeof(first_error_name))) {
-                return (1);
-        }
-        return (0);
+	if (i2c_write_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_STATUS, 1,
+				(unsigned char*) &status, 1)) {
+		return (1);
+	}
+	if (i2c_write_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_PASS_CYCLES, 1,
+				(unsigned char*) &pass_cycles, 2)) {
+		return (1);
+	}
+	if (i2c_write_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_FIRST_ERROR_CYCLE,
+				1, (unsigned char*) &first_error_cycle, 2)) {
+		return (1);
+	}
+	if (i2c_write_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_FIRST_ERROR_NUM,
+				1, (unsigned char*) &first_error_num, 1)) {
+		return (1);
+	}
+	if (i2c_write_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_FIRST_ERROR_NAME,
+				1, first_error_name,
+				sizeof(first_error_name))) {
+		return (1);
+	}
+	return (0);
 }
 
 static void global_vars_init (void)
 {
-        status                  = 1; /* error */
-        pass_cycles             = 0;
-        first_error_cycle       = 0;
-        first_error_num         = 0;
-        first_error_name[0]     = '\0';
-        act_cycle               = 0;
-        max_cycles              = 0;
+	status                  = 1; /* error */
+	pass_cycles             = 0;
+	first_error_cycle       = 0;
+	first_error_num         = 0;
+	first_error_name[0]     = '\0';
+	act_cycle               = 0;
+	max_cycles              = 0;
 }
 
 
 static void test_function_table_init (void)
 {
-        int i;
+	int i;
 
-  	for (i = 0; i < BIF_MAX; i++)
+	for (i = 0; i < BIF_MAX; i++)
 		test_function[i].pf = dummy;
 
-        /*
-         * the length of "name" must not exceed 16, including the '\0'
-         * termination. See also the EEPROM address map.
-         */
-        test_function[0].pf = test_dip;
-        test_function[0].name = "dip";
+	/*
+	 * the length of "name" must not exceed 16, including the '\0'
+	 * termination. See also the EEPROM address map.
+	 */
+	test_function[0].pf = test_dip;
+	test_function[0].name = "dip";
 
-        test_function[1].pf = test_vcc5v;
-        test_function[1].name = "vcc5v";
+	test_function[1].pf = test_vcc5v;
+	test_function[1].name = "vcc5v";
 
-        test_function[2].pf = test_rotary_switch;
-        test_function[2].name = "rotary_switch";
+	test_function[2].pf = test_rotary_switch;
+	test_function[2].name = "rotary_switch";
 
-        test_function[3].pf = test_sram;
-        test_function[3].name = "sram";
+	test_function[3].pf = test_sram;
+	test_function[3].name = "sram";
 
-        test_function[4].pf = test_eeprom;
-        test_function[4].name = "eeprom";
+	test_function[4].pf = test_eeprom;
+	test_function[4].name = "eeprom";
 
-        test_function[5].pf = test_contact_temp;
-        test_function[5].name = "contact_temp";
+	test_function[5].pf = test_contact_temp;
+	test_function[5].name = "contact_temp";
 }
 
 
 static int read_max_cycles (void)
 {
-        if (i2c_read_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_MAX_CYCLES, 1,
-                               (unsigned char *) &max_cycles, 2) != 0) {
-                return (1);
-        }
+	if (i2c_read_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_MAX_CYCLES, 1,
+			       (unsigned char *) &max_cycles, 2) != 0) {
+		return (1);
+	}
 
-        return (0);
+	return (0);
 }
 
 static int dummy(void)
 {
-        return (0);
+	return (0);
 }
 
 #endif	/* CFG_CMD_BSP */

board/trab/rs485.c

@@ -47,8 +47,8 @@ static void rs485_setbrg (void)
 	unsigned int reg = 0;
 
 	/* value is calculated so : (int)(PCLK/16./baudrate) -1 */
-        /* reg = (33000000 / (16 * gd->baudrate)) - 1; */
-        reg = (33000000 / (16 * 38.400)) - 1;
+	/* reg = (33000000 / (16 * gd->baudrate)) - 1; */
+	reg = (33000000 / (16 * 38400)) - 1;
 
 	/* FIFO enable, Tx/Rx FIFO clear */
 	uart->UFCON = 0x07;
@@ -67,18 +67,18 @@ static void rs485_setbrg (void)
 
 static void rs485_cfgio (void)
 {
-        S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
+	S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
 
-        gpio->PFCON &= ~(0x3 << 2);
-        gpio->PFCON |=  (0x2 << 2); /* configure GPF1 as RXD1 */
+	gpio->PFCON &= ~(0x3 << 2);
+	gpio->PFCON |=  (0x2 << 2); /* configure GPF1 as RXD1 */
 
-        gpio->PFCON &= ~(0x3 << 6);
-        gpio->PFCON |=  (0x2 << 6); /* configure GPF3 as TXD1 */
+	gpio->PFCON &= ~(0x3 << 6);
+	gpio->PFCON |=  (0x2 << 6); /* configure GPF3 as TXD1 */
 
-        gpio->PFUP |= (1 << 1); /* disable pullup on GPF1 */
-        gpio->PFUP |= (1 << 3); /* disable pullup on GPF3 */
+	gpio->PFUP |= (1 << 1); /* disable pullup on GPF1 */
+	gpio->PFUP |= (1 << 3); /* disable pullup on GPF3 */
 
-        gpio->PACON &= ~(1 << 11); /* set GPA11 (RS485_DE) to output */
+	gpio->PACON &= ~(1 << 11); /* set GPA11 (RS485_DE) to output */
 }
 
 /*
@@ -88,8 +88,8 @@ static void rs485_cfgio (void)
  */
 int rs485_init (void)
 {
-        rs485_cfgio ();
-        rs485_setbrg ();
+	rs485_cfgio ();
+	rs485_setbrg ();
 
 	return (0);
 }
@@ -168,13 +168,13 @@ static void set_rs485re(unsigned char rs485re_state)
 
 static void set_rs485de(unsigned char rs485de_state)
 {
-        S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
+	S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
 
-        /* This is on PORT A bit 11 */
-        if(rs485de_state)
-                gpio->PADAT |= (1 << 11);
-        else
-                gpio->PADAT &= ~(1 << 11);
+	/* This is on PORT A bit 11 */
+	if(rs485de_state)
+		gpio->PADAT |= (1 << 11);
+	else
+		gpio->PADAT &= ~(1 << 11);
 }
 
 

fs/fat/fat.c

@@ -33,6 +33,11 @@
 
 #if (CONFIG_COMMANDS & CFG_CMD_FAT)
 
+#ifdef CONFIG_AUTO_UPDATE
+/* the VFAT code has a bug which breaks auto update */
+#undef CONFIG_SUPPORT_VFAT
+#endif
+
 /*
  * Convert a string to lowercase.
  */

include/configs/trab.h

@@ -182,7 +182,7 @@
 #define CONFIG_IPADDR		192.168.3.68
 #define CONFIG_HOSTNAME		trab
 #define CONFIG_SERVERIP		192.168.3.1
-#define CONFIG_BOOTCOMMAND	"run flash_nfs"
+#define CONFIG_BOOTCOMMAND	"burn_in"
 
 #ifndef CONFIG_FLASH_8MB	/* current config: 16 MB flash */
 #ifdef CFG_HUSH_PARSER
@@ -331,9 +331,13 @@
 #define CONFIG_MISC_INIT_R		/* have misc_init_r() function	*/
 
 /*-----------------------------------------------------------------------
- * burn-in test stuff
+ * burn-in test stuff.
+ *  
+ * BURN_IN_CYCLE_DELAY defines the seconds to wait between each burn-in cycle
+ * Because the burn-in test itself causes also an delay of about 4 seconds,
+ * this time must be subtracted from the desired overall burn-in cycle time.
  */
-#define BURN_IN_CYCLE_DELAY	20	/* delay in sec between burn-in test cycles */
+#define BURN_IN_CYCLE_DELAY	296	/* seconds between burn-in cycles */
 
 /*-----------------------------------------------------------------------
  * Stack sizes