diff options
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | board/trab/Makefile | 2 | ||||
| -rw-r--r-- | board/trab/auto_update.c | 414 | ||||
| -rw-r--r-- | board/trab/cmd_trab.c | 16 | ||||
| -rw-r--r-- | board/trab/trab.c | 6 | ||||
| -rw-r--r-- | common/usb_storage.c | 2 | ||||
| -rw-r--r-- | cpu/arm920t/serial.c | 2 | ||||
| -rw-r--r-- | include/configs/IceCube.h | 1 | ||||
| -rw-r--r-- | include/configs/trab.h | 83 | ||||
| -rw-r--r-- | lib_arm/board.c | 2 |
11 files changed, 487 insertions, 53 deletions
@@ -2,6 +2,8 @@ Changes for U-Boot 1.0.0: ====================================================================== +* Add auto-update code for TRAB board using USB memory sticks + * disable MPC5200 bus pipelining as workaround for bus contention * Modify XLB arbiter priorities on MPC5200 so all devices use same @@ -796,7 +796,7 @@ shannon_config : unconfig ## ARM92xT Systems ######################################################################### -xtract_trab = $(subst _big_flash,,$(subst _config,,$1)) +xtract_trab = $(subst _old,,$(subst _config,,$1)) omap1510inn_config : unconfig @./mkconfig $(@:_config=) arm arm925t omap1510inn @@ -811,11 +811,11 @@ smdk2410_config : unconfig @./mkconfig $(@:_config=) arm arm920t smdk2410 trab_config \ -trab_big_flash_config: unconfig +trab_old_config: unconfig @ >include/config.h - @[ -z "$(findstring _big_flash,$@)" ] || \ - { echo "#define CONFIG_BIG_FLASH" >>include/config.h ; \ - echo "... with big flash support" ; \ + @[ -z "$(findstring _old,$@)" ] || \ + { echo "#define CONFIG_OLD_VERSION" >>include/config.h ; \ + echo "... with small memory configuration" ; \ } @./mkconfig -a $(call xtract_trab,$@) arm arm920t trab diff --git a/board/trab/Makefile b/board/trab/Makefile index f376771..4e6e9d6 100644 --- a/board/trab/Makefile +++ b/board/trab/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk LIB = lib$(BOARD).a -OBJS := trab.o flash.o vfd.o cmd_trab.o memory.o tsc2000.o +OBJS := trab.o flash.o vfd.o cmd_trab.o memory.o tsc2000.o auto_update.o SOBJS := memsetup.o gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`) diff --git a/board/trab/auto_update.c b/board/trab/auto_update.c new file mode 100644 index 0000000..5911185 --- /dev/null +++ b/board/trab/auto_update.c @@ -0,0 +1,414 @@ +/* + * (C) Copyright 2003 + * Gary Jennejohn, DENX Software Engineering, gj@denx.de. + * + * 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 + */ + +#include <common.h> +#include <command.h> +#include <malloc.h> +#include <image.h> +#include <asm/byteorder.h> +#include <usb.h> + +#ifdef CFG_HUSH_PARSER +#include <hush.h> +#endif + +#ifdef CONFIG_AUTO_UPDATE + +#ifndef CONFIG_USB_OHCI +#error "must define CONFIG_USB_OHCI" +#endif + +#ifndef CONFIG_USB_STORAGE +#error "must define CONFIG_USB_STORAGE" +#endif + +#ifndef CFG_HUSH_PARSER +#error "must define CFG_HUSH_PARSER" +#endif + +#if !(CONFIG_COMMANDS & CFG_CMD_FAT) +#error "must define CFG_CMD_FAT" +#endif + +/* + * Check whether a USB memory stick is plugged in. + * If one is found: + * 1) try to do an MSDOS ls + * 2) if preinst.img is found and is not 0 length, load it into + * memory and run it (how to check beforehand if it's a + * valid HUSH command file?) + * 3) + * 4) + * 5) + * 6) + * 7) + * 8) + * 9) + * 10) + * 11) + * 12) + */ + +#undef AU_DEBUG + +#undef debug +#ifdef AU_DEBUG +#define debug(fmt,args...) printf (fmt ,##args) +#else +#define debug(fmt,args...) +#endif /* AU_DEBUG */ + +/* possible names of files on the USB stick. */ +#define AU_PREPARE "prepare.img" +#define AU_PREINST "preinst.img" +#define AU_FIRMWARE "firmware.img" +#define AU_KERNEL "kernel.img" +#define AU_APP "app.img" +#define AU_DISK "disk.img" +#define AU_POSTINST "postinst.img" + +/* layout of the FLASH. ST = start address, ND = end address. */ +#ifndef CONFIG_OLD_VERSION /* 16 MB Flash, 32 MB RAM */ +#define AU_FL_FIRMWARE_ST 0x00000000 +#define AU_FL_FIRMWARE_ND 0x0009FFFF +#define AU_FL_VFD_ST 0x000A0000 +#define AU_FL_VFD_ND 0x000BFFFF +#define AU_FL_KERNEL_ST 0x000C0000 +#define AU_FL_KERNEL_ND 0x001BFFFF +#define AU_FL_APP_ST 0x001C0000 +#define AU_FL_APP_ND 0x005BFFFF +#define AU_FL_DISK_ST 0x005C0000 +#define AU_FL_DISK_ND 0x00FFFFFF +#else /* 8 MB Flash, 16 MB RAM */ +#define AU_FL_FIRMWARE_ST 0x00000000 +#define AU_FL_FIRMWARE_ND 0x0003FFFF +#define AU_FL_KERNEL_ST 0x00040000 +#define AU_FL_KERNEL_ND 0x0011FFFF +#define AU_FL_APP_ST 0x00120000 +#define AU_FL_APP_ND 0x003FFFFF +#define AU_FL_DISK_ST 0x00400000 +#define AU_FL_DISK_ND 0x007DFFFF +#define AU_FL_VFD_ST 0x007E0000 +#define AU_FL_VFD_ND 0x007FFFFF +#endif /* CONFIG_OLD_VERSION */ + +/* a structure with the offsets to values in the EEPROM */ +struct eeprom_layout +{ + unsigned int time; + unsigned int size; + unsigned int dcrc; +}; + +/* layout of the EEPROM - offset from the start. All entries are 32 bit. */ +#define AU_EEPROM_TIME_PREINST 64 +#define AU_EEPROM_SIZE_PREINST 68 +#define AU_EEPROM_DCRC_PREINST 72 +#define AU_EEPROM_TIME_FIRMWARE 76 +#define AU_EEPROM_SIZE_FIRMWARE 80 +#define AU_EEPROM_DCRC_FIRMWARE 84 +#define AU_EEPROM_TIME_KERNEL 88 +#define AU_EEPROM_SIZE_KERNEL 92 +#define AU_EEPROM_DCRC_KERNEL 96 +#define AU_EEPROM_TIME_APP 100 +#define AU_EEPROM_SIZE_APP 104 +#define AU_EEPROM_DCRC_APP 108 +#define AU_EEPROM_TIME_DISK 112 +#define AU_EEPROM_SIZE_DISK 116 +#define AU_EEPROM_DCRC_DISK 120 +#define AU_EEPROM_TIME_POSTINST 124 +#define AU_EEPROM_SIZE_POSTINST 128 +#define AU_EEPROM_DCRC_POSTINST 132 + +static int au_usb_stor_curr_dev; /* current device */ +/* max. number of files which could interest us */ +#define AU_MAXFILES 7 +/* pointers to file names */ +char *aufile[AU_MAXFILES]; +/* sizes of flash areas for each file */ +long ausize[AU_MAXFILES]; +/* offsets into the EEEPROM */ +struct eeprom_layout auee_off[AU_MAXFILES] = { \ + {0}, \ + {AU_EEPROM_TIME_PREINST, AU_EEPROM_SIZE_PREINST, AU_EEPROM_DCRC_PREINST,}, \ + {AU_EEPROM_TIME_FIRMWARE, AU_EEPROM_SIZE_FIRMWARE, AU_EEPROM_DCRC_FIRMWARE,}, \ + {AU_EEPROM_TIME_KERNEL, AU_EEPROM_SIZE_KERNEL, AU_EEPROM_DCRC_KERNEL,}, \ + {AU_EEPROM_TIME_APP, AU_EEPROM_SIZE_APP, AU_EEPROM_DCRC_APP,}, \ + {AU_EEPROM_TIME_DISK, AU_EEPROM_SIZE_DISK, AU_EEPROM_DCRC_DISK,}, \ + {AU_EEPROM_TIME_POSTINST, AU_EEPROM_SIZE_POSTINST, AU_EEPROM_DCRC_POSTINST,} \ + }; +/* index of each file in the above array */ +#define IDX_PREPARE 0 +#define IDX_PREINST 1 +#define IDX_FIRMWARE 2 +#define IDX_KERNEL 3 +#define IDX_APP 4 +#define IDX_DISK 5 +#define IDX_POSTINST 6 +/* where to load files into memory */ +#define LOAD_ADDR ((unsigned char *)0x0c100000) +/* the disk is the largest image */ +#define MAX_LOADSZ ausize[IDX_DISK] + +/* externals */ +extern int fat_register_device(block_dev_desc_t *, int); +extern int file_fat_detectfs(void); +extern long file_fat_read(const char *, void *, unsigned long); +extern int i2c_read (unsigned char, unsigned int, int , unsigned char* , int); +extern int i2c_write (uchar, uint, int , uchar* , int); +#ifdef CONFIG_VFD +extern int trab_vfd (ulong); +extern int transfer_pic(unsigned char, unsigned char *, int, int); +#endif +extern int i2c_write_multiple (uchar, uint, int, uchar *, int); +extern int i2c_read_multiple (uchar, uint, int, uchar *, int); + + +int +au_check_valid(int idx, long nbytes) +{ + image_header_t *hdr; + unsigned long checksum; + unsigned char buf[4]; + + hdr = (image_header_t *)LOAD_ADDR; + /* check the easy ones first */ +#ifdef CHECK_VALID_DEBUG + printf("magic %#x %#x ", ntohl(hdr->ih_magic), IH_MAGIC); + printf("arch %#x %#x ", hdr->ih_arch, IH_CPU_ARM); + printf("size %#x %#lx ", ntohl(hdr->ih_size), nbytes); + printf("type %#x %#x ", hdr->ih_type, IH_TYPE_KERNEL); +#endif + if (ntohl(hdr->ih_magic) != IH_MAGIC || + hdr->ih_arch != IH_CPU_ARM || + nbytes < ntohl(hdr->ih_size)) { + printf ("Image %s Bad MAGIC or ARCH or SIZE\n", aufile[idx]); + return -1; + } + /* check the hdr CRC */ + checksum = ntohl(hdr->ih_hcrc); + hdr->ih_hcrc = 0; + + if (crc32 (0, (char *)hdr, sizeof(*hdr)) != checksum) { + printf ("Image %s Bad Header Checksum\n", aufile[idx]); + return -1; + } + /* check the data CRC */ + checksum = ntohl(hdr->ih_dcrc); + + if (crc32 (0, (char *)(LOAD_ADDR + sizeof(*hdr)), ntohl(hdr->ih_size)) + != checksum) + { + printf ("Image %s Bad Data Checksum\n", aufile[idx]); + return -1; + } + /* check the type - could do this all in one gigantic if() */ + if ((idx == IDX_FIRMWARE) && (hdr->ih_type != IH_TYPE_FIRMWARE)) { + printf ("Image %s Wrong Type\n", aufile[idx]); + return -1; + } + if ((idx == IDX_KERNEL) && (hdr->ih_type != IH_TYPE_KERNEL)) { + printf ("Image %s Wrong Type\n", aufile[idx]); + return -1; + } + if ((idx == IDX_DISK || idx == IDX_APP) + && (hdr->ih_type != IH_TYPE_RAMDISK)) + { + printf ("Image %s Wrong Type\n", aufile[idx]); + return -1; + } + if ((idx == IDX_PREPARE || idx == IDX_PREINST || idx == IDX_POSTINST) + && (hdr->ih_type != IH_TYPE_SCRIPT)) + { + printf ("Image %s Wrong Type\n", aufile[idx]); + return -1; + } + /* special case for prepare.img */ + if (idx == IDX_PREPARE) + return 0; + /* check the size does not exceed space in flash */ + if ((ausize[idx] != 0) && (ausize[idx] < ntohl(hdr->ih_size))) { + printf ("Image %s is bigger than FLASH\n", aufile[idx]); + return -1; + } + /* check the time stamp from the EEPROM */ + /* read it in */ + i2c_read_multiple(0x54, auee_off[idx].time, 1, buf, sizeof(buf)); +#ifdef CHECK_VALID_DEBUG +printf("buf[0] %#x buf[1] %#x buf[2] %#x buf[3] %#x as int %#x time %#x\n", +buf[0], buf[1], buf[2], buf[3], *((unsigned int *)buf), ntohl(hdr->ih_time)); +#endif + /* check it */ + if (*((unsigned int *)buf) >= ntohl(hdr->ih_time)) { + printf ("Image %s is too old\n", aufile[idx]); + return -1; + } + + return 0; +} + +/* power control defines */ +#define CPLD_VFD_BK ((volatile char *)0x04038002) +#define POWER_OFF (1 << 1) + +int +au_do_update(int idx) +{ + image_header_t *hdr; + char *addr; + + hdr = (image_header_t *)LOAD_ADDR; + /* disable the power switch */ + *CPLD_VFD_BK |= POWER_OFF; + /* execute a script */ + if (hdr->ih_type == IH_TYPE_SCRIPT) { + addr = (char *)((char *)hdr + sizeof(*hdr) + 8); + parse_string_outer(addr, + FLAG_PARSE_SEMICOLON | FLAG_EXIT_FROM_LOOP); + return 0; + } + return 0; +} + +int +au_update_eeprom(int idx) +{ + image_header_t *hdr; + + hdr = (image_header_t *)LOAD_ADDR; + /* enable the power switch */ + *CPLD_VFD_BK &= ~POWER_OFF; + return 0; +} + +/* + * this is called from board_init() after the hardware has been set up + * and is usable. That seems like a good time to do this. + * Right now the return value is ignored. + */ +int +do_auto_update(void) +{ + block_dev_desc_t *stor_dev; + long sz; + int i, res, bitmap_first; + char *env; + +#ifdef ERASE_EEPROM + int arr[18]; + memset(arr, 0, sizeof(arr)); + i2c_write_multiple(0x54, 64, 1, arr, sizeof(arr)); +#endif + au_usb_stor_curr_dev = -1; + /* start USB */ + if (usb_stop() < 0) { + debug ("usb_stop failed\n"); + return -1; + } + if (usb_init() < 0) { + debug ("usb_init failed\n"); + return -1; + } + /* + * check whether a storage device is attached (assume that it's + * a USB memory stick, since nothing else should be attached). + */ + au_usb_stor_curr_dev = usb_stor_scan(1); + if (au_usb_stor_curr_dev == -1) { + debug ("No device found. Not initialized?\n"); + return -1; + } + /* check whether it has a partition table */ + stor_dev = usb_stor_get_dev(au_usb_stor_curr_dev); + if (stor_dev->type == DEV_TYPE_UNKNOWN) { + debug ("uknown device type\n"); + return -1; + } + if (fat_register_device(stor_dev, 1) != 0) { + debug ("Unable to use USB %d:%d for fatls\n", + au_usb_stor_curr_dev, 1); + return -1; + } + if (file_fat_detectfs() != 0) { + debug ("file_fat_detectfs failed\n"); + } + /* initialize the array of file names */ + memset(aufile, 0, sizeof(aufile)); + aufile[IDX_PREPARE] = AU_PREPARE; + aufile[IDX_PREINST] = AU_PREINST; + aufile[IDX_FIRMWARE] = AU_FIRMWARE; + aufile[IDX_KERNEL] = AU_KERNEL; + aufile[IDX_APP] = AU_APP; + aufile[IDX_DISK] = AU_DISK; + aufile[IDX_POSTINST] = AU_POSTINST; + /* initialize the array of flash sizes */ + memset(ausize, 0, sizeof(ausize)); + ausize[IDX_FIRMWARE] = (AU_FL_FIRMWARE_ND + 1) - AU_FL_FIRMWARE_ST; + ausize[IDX_KERNEL] = (AU_FL_KERNEL_ND + 1) - AU_FL_KERNEL_ST; + ausize[IDX_APP] = (AU_FL_APP_ND + 1) - AU_FL_APP_ST; + ausize[IDX_DISK] = (AU_FL_DISK_ND + 1) - AU_FL_DISK_ST; + bitmap_first = 0; + /* just loop thru all the possible files */ + for (i = 0; i < AU_MAXFILES; i++) { + sz = file_fat_read(aufile[i], LOAD_ADDR, MAX_LOADSZ); + debug ("read %s sz %ld hdr %d\n", + aufile[i], sz, sizeof(image_header_t)); + if (sz <= 0 || sz <= sizeof(image_header_t)) { + debug ("%s not found\n", aufile[i]); + continue; + } + if (au_check_valid(i, sz) < 0) { + debug ("%s not valid\n", aufile[i]); + continue; + } +#ifdef CONFIG_VFD + /* now that we have a valid file we can display the */ + /* bitmap. */ + if (bitmap_first == 0) { + env = getenv("bitmap2"); + if (env == NULL) { + trab_vfd(0); + } else { + /* not so simple - bitmap2 is supposed to */ + /* contain the address of the bitmap */ + env = (char *)simple_strtoul(env, NULL, 16); +/* NOTE: these are taken from vfd_logo.h. If that file changes then */ +/* these defines MUST also be updated! These may be wrong for bitmap2. */ +#define VFD_LOGO_WIDTH 112 +#define VFD_LOGO_HEIGHT 72 + /* must call transfer_pic directly */ + transfer_pic(3, env, VFD_LOGO_HEIGHT, VFD_LOGO_WIDTH); + } + bitmap_first = 1; + } +#endif + /* this is really not a good idea, but it's what the */ + /* customer wants. */ + do { + res = au_do_update(i); + } while (res < 0); + au_update_eeprom(i); + } + return 0; +} +#endif /* CONFIG_AUTO_UPDATE */ diff --git a/board/trab/cmd_trab.c b/board/trab/cmd_trab.c index 0a9768a..78e14bd 100644 --- a/board/trab/cmd_trab.c +++ b/board/trab/cmd_trab.c @@ -111,6 +111,10 @@ int do_vcc5v (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); int do_burn_in (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); int do_contact_temp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); int do_burn_in_status (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); +int i2c_write_multiple (uchar chip, uint addr, int alen, + uchar *buffer, int len); +int i2c_read_multiple (uchar chip, uint addr, int alen, + uchar *buffer, int len); /* helper functions */ static void adc_init (void); @@ -123,10 +127,6 @@ static int test_rotary_switch (void); static int test_sram (void); static int test_eeprom (void); static int test_contact_temp (void); -static int i2c_write_multiple (uchar chip, uint addr, int alen, - uchar *buffer, int len); -static int i2c_read_multiple (uchar chip, uint addr, int alen, - uchar *buffer, int len); static void led_set (unsigned int); static void led_blink (void); static void led_init (void); @@ -579,8 +579,8 @@ static int test_contact_temp (void) } -static int i2c_write_multiple (uchar chip, uint addr, int alen, - uchar *buffer, int len) +int i2c_write_multiple (uchar chip, uint addr, int alen, + uchar *buffer, int len) { int i; @@ -608,8 +608,8 @@ static int i2c_write_multiple (uchar chip, uint addr, int alen, } -static int i2c_read_multiple (uchar chip, uint addr, int alen, - uchar *buffer, int len) +int i2c_read_multiple ( uchar chip, uint addr, int alen, + uchar *buffer, int len) { int i; diff --git a/board/trab/trab.c b/board/trab/trab.c index 71b3cbe..fb57f5b 100644 --- a/board/trab/trab.c +++ b/board/trab/trab.c @@ -169,6 +169,12 @@ int misc_init_r (void) uchar *str; int i; +#ifdef CONFIG_AUTO_UPDATE + extern int do_auto_update(void); + /* this has priority over all else */ + do_auto_update(); +#endif + for (i = 0; i < KEYBD_KEY_NUM; ++i) { keybd_env[i] = '0' + ((kbd_data >> i) & 1); } diff --git a/common/usb_storage.c b/common/usb_storage.c index f95a1d3..d99f259 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -188,7 +188,7 @@ int usb_stor_scan(int mode) memset(usb_stor_buf, 0, sizeof(usb_stor_buf)); if(mode==1) { - printf("scanning bus for storage devices...\n"); + printf(" scanning bus for storage devices...\n"); } usb_disable_asynch(1); /* asynch transfer not allowed */ diff --git a/cpu/arm920t/serial.c b/cpu/arm920t/serial.c index 7ed452e..6104e75 100644 --- a/cpu/arm920t/serial.c +++ b/cpu/arm920t/serial.c @@ -30,7 +30,7 @@ #elif CONFIG_SERIAL2 # if defined(CONFIG_TRAB) -# #error "TRAB supports only CONFIG_SERIAL1" +# error "TRAB supports only CONFIG_SERIAL1" # endif #define UART_NR S3C24X0_UART1 diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h index 71cd81b..204f332 100644 --- a/include/configs/IceCube.h +++ b/include/configs/IceCube.h @@ -71,6 +71,7 @@ #define CONFIG_NET_MULTI 1 #define CONFIG_EEPRO100 1 #define CFG_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */ +#define CONFIG_NS8382X 1 #define ADD_PCI_CMD CFG_CMD_PCI diff --git a/include/configs/trab.h b/include/configs/trab.h index daa62a3..6884270 100644 --- a/include/configs/trab.h +++ b/include/configs/trab.h @@ -42,6 +42,9 @@ #undef CONFIG_TRAB_50MHZ /* run the CPU at 50 MHz */ #define LITTLEENDIAN 1 /* used by usb_ohci.c */ +/* automatic software updates (see board/trab/auto_update.c) */ +#define CONFIG_AUTO_UPDATE 1 + /* input clock of PLL */ #define CONFIG_SYS_CLK_FREQ 12000000 /* TRAB has 12 MHz input clock */ @@ -176,7 +179,7 @@ #define CONFIG_SERVERIP 192.168.3.1 #define CONFIG_BOOTCOMMAND "run flash_nfs" -#ifndef CONFIG_BIG_FLASH +#ifndef CONFIG_OLD_VERSION /* current config: 16 MB flash, 32 MB RAM */ #ifdef CFG_HUSH_PARSER #define CONFIG_EXTRA_ENV_SETTINGS \ "nfs_args=setenv bootargs root=/dev/nfs rw " \ @@ -186,14 +189,15 @@ "add_net=setenv bootargs $bootargs ethaddr=$ethaddr " \ "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname::off\0" \ "add_misc=setenv bootargs $bootargs console=ttyS0 panic=1\0" \ - "load=tftp 0xC100000 /tftpboot/TRAB/u-boot.bin\0" \ - "update=protect off 1:0-8;era 1:0-8;cp.b 0xc100000 0 $filesize;" \ - "setenv filesize;saveenv\0" \ + "u-boot=/tftpboot/TRAB/u-boot.bin\0" \ + "load=tftp C100000 ${u-boot}\0" \ + "update=protect off 0 5FFFF;era 0 5FFFF;" \ + "cp.b C100000 0 $filesize\0" \ "loadfile=/tftpboot/TRAB/uImage\0" \ "loadaddr=c400000\0" \ "net_load=tftpboot $loadaddr $loadfile\0" \ "net_nfs=run net_load nfs_args add_net add_misc;bootm\0" \ - "kernel_addr=00040000\0" \ + "kernel_addr=000C0000\0" \ "flash_nfs=run nfs_args add_net add_misc;bootm $kernel_addr\0" \ "mdm_init1=ATZ\0" \ "mdm_init2=ATS0=1\0" \ @@ -207,20 +211,21 @@ "add_net=setenv bootargs $(bootargs) ethaddr=$(ethaddr) " \ "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off\0" \ "add_misc=setenv bootargs $(bootargs) console=ttyS0 panic=1\0" \ - "load=tftp 0xC100000 /tftpboot/TRAB/u-boot.bin\0" \ - "update=protect off 1:0-8;era 1:0-8;cp.b 0xc100000 0 $(filesize);" \ - "setenv filesize;saveenv\0" \ + "u-boot=/tftpboot/TRAB/u-boot.bin\0" \ + "load=tftp C100000 $(u-boot)\0" \ + "update=protect off 0 5FFFF;era 0 5FFFF;" \ + "cp.b C100000 0 $(filesize)\0" \ "loadfile=/tftpboot/TRAB/uImage\0" \ "loadaddr=c400000\0" \ "net_load=tftpboot $(loadaddr) $(loadfile)\0" \ "net_nfs=run net_load nfs_args add_net add_misc;bootm\0" \ - "kernel_addr=00040000\0" \ + "kernel_addr=000C0000\0" \ "flash_nfs=run nfs_args add_net add_misc;bootm $(kernel_addr)\0" \ "mdm_init1=ATZ\0" \ "mdm_init2=ATS0=1\0" \ "mdm_flow_control=rts/cts\0" -#endif /* CFG_HUSH_PARSER */ -#else /* CONFIG_BIG_FLASH */ +#endif /* CFG_HUSH_PARSER */ +#else /* CONFIG_OLD_VERSION => 8 MB flash, 16 MB RAM */ #ifdef CFG_HUSH_PARSER #define CONFIG_EXTRA_ENV_SETTINGS \ "nfs_args=setenv bootargs root=/dev/nfs rw " \ @@ -230,13 +235,16 @@ "add_net=setenv bootargs $bootargs ethaddr=$ethaddr " \ "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname::off\0" \ "add_misc=setenv bootargs $bootargs console=ttyS0 panic=1\0" \ - "load=tftp 0xC100000 /tftpboot/TRAB/u-boot.bin\0" \ - "update=protect off 1:0;era 1:0;cp.b 0xc100000 0 $filesize\0" \ + "u-boot=/tftpboot/TRAB/u-boot.bin-old\0" \ + "load=tftp C100000 ${u-boot}\0" \ + "update=protect off 0 3FFFF;era 0 3FFFF;" \ + "cp.b C100000 0 $filesize;" \ + "setenv filesize;saveenv\0" \ "loadfile=/tftpboot/TRAB/uImage\0" \ - "loadaddr=c400000\0" \ + "loadaddr=C400000\0" \ "net_load=tftpboot $loadaddr $loadfile\0" \ "net_nfs=run net_load nfs_args add_net add_misc;bootm\0" \ - "kernel_addr=00040000\0" \ + "kernel_addr=000C0000\0" \ "flash_nfs=run nfs_args add_net add_misc;bootm $kernel_addr\0" \ "mdm_init1=ATZ\0" \ "mdm_init2=ATS0=1\0" \ @@ -250,19 +258,22 @@ "add_net=setenv bootargs $(bootargs) ethaddr=$(ethaddr) " \ "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off\0" \ "add_misc=setenv bootargs $(bootargs) console=ttyS0 panic=1\0" \ - "load=tftp 0xC100000 /tftpboot/TRAB/u-boot.bin\0" \ - "update=protect off 1:0;era 1:0;cp.b 0xc100000 0 $(filesize)\0" \ + "u-boot=/tftpboot/TRAB/u-boot.bin-old\0" \ + "load=tftp C100000 $(u-boot)\0" \ + "update=protect off 0 3FFFF;era 0 3FFFF;" \ + "cp.b C100000 0 $(filesize);" \ + "setenv filesize;saveenv\0" \ "loadfile=/tftpboot/TRAB/uImage\0" \ - "loadaddr=c400000\0" \ + "loadaddr=C400000\0" \ "net_load=tftpboot $(loadaddr) $(loadfile)\0" \ "net_nfs=run net_load nfs_args add_net add_misc;bootm\0" \ - "kernel_addr=00040000\0" \ + "kernel_addr=000C0000\0" \ "flash_nfs=run nfs_args add_net add_misc;bootm $(kernel_addr)\0" \ "mdm_init1=ATZ\0" \ "mdm_init2=ATS0=1\0" \ "mdm_flow_control=rts/cts\0" #endif /* CFG_HUSH_PARSER */ -#endif /* CONFIG_BIG_FLASH */ +#endif /* CONFIG_OLD_VERSION */ #if 0 /* disabled for development */ #define CONFIG_AUTOBOOT_KEYED /* Enable password protection */ @@ -290,12 +301,12 @@ #define CFG_MAXARGS 16 /* max number of command args */ #define CFG_BARGSIZE CFG_CBSIZE /* Boot Argument Buffer Size */ -#define CFG_MEMTEST_START 0x0c000000 /* memtest works on */ -#define CFG_MEMTEST_END 0x0d000000 /* 16 MB in DRAM */ +#define CFG_MEMTEST_START 0x0C000000 /* memtest works on */ +#define CFG_MEMTEST_END 0x0D000000 /* 16 MB in DRAM */ #undef CFG_CLKS_IN_HZ /* everything, incl board info, in Hz */ -#define CFG_LOAD_ADDR 0x0cf00000 /* default load address */ +#define CFG_LOAD_ADDR 0x0CF00000 /* default load address */ #ifdef CONFIG_TRAB_50MHZ /* the PWM TImer 4 uses a counter of 15625 for 10 ms, so we need */ @@ -334,27 +345,27 @@ * Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ -#define PHYS_SDRAM_1 0x0c000000 /* SDRAM Bank #1 */ +#define PHYS_SDRAM_1 0x0C000000 /* SDRAM Bank #1 */ +#ifndef CONFIG_OLD_VERSION +#define PHYS_SDRAM_1_SIZE 0x02000000 /* 32 MB */ +#else #define PHYS_SDRAM_1_SIZE 0x01000000 /* 16 MB */ +#endif #define CFG_FLASH_BASE 0x00000000 /* Flash Bank #1 */ /* The following #defines are needed to get flash environment right */ #define CFG_MONITOR_BASE CFG_FLASH_BASE -#ifndef CONFIG_BIG_FLASH #define CFG_MONITOR_LEN (256 << 10) -#else -#define CFG_MONITOR_LEN (128 << 10) -#endif /*----------------------------------------------------------------------- * FLASH and environment organization */ #define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */ -#ifndef CONFIG_BIG_FLASH -#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */ -#else +#ifndef CONFIG_OLD_VERSION #define CFG_MAX_FLASH_SECT 128 /* max number of sectors on one chip */ +#else +#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */ #endif /* timeout values are in ticks */ @@ -364,14 +375,14 @@ #define CFG_ENV_IS_IN_FLASH 1 /* Address and size of Primary Environment Sector */ -#ifndef CONFIG_BIG_FLASH -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x4000) +#ifndef CONFIG_OLD_VERSION +#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x60000) #define CFG_ENV_SIZE 0x4000 -#define CFG_ENV_SECT_SIZE 0x4000 +#define CFG_ENV_SECT_SIZE 0x20000 #else -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x20000) +#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x4000) #define CFG_ENV_SIZE 0x4000 -#define CFG_ENV_SECT_SIZE 0x20000 +#define CFG_ENV_SECT_SIZE 0x4000 #endif /* Address and size of Redundant Environment Sector */ diff --git a/lib_arm/board.c b/lib_arm/board.c index 6e19ddc..93deef7 100644 --- a/lib_arm/board.c +++ b/lib_arm/board.c @@ -285,7 +285,7 @@ void start_armboot (void) } } - devices_init (); /* get the devices list going. */ + devices_init (); /* get the devices list going. */ jumptable_init (); |