diff options
| -rw-r--r-- | CHANGELOG | 12 | ||||
| -rw-r--r-- | CREDITS | 4 | ||||
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | README | 10 | ||||
| -rw-r--r-- | board/cray/L1/L1.c | 118 | ||||
| -rw-r--r-- | board/cray/L1/Makefile | 16 | ||||
| -rw-r--r-- | board/cray/L1/bootscript.hush | 117 | ||||
| -rw-r--r-- | board/cray/L1/patchme | 30 | ||||
| -rw-r--r-- | board/cray/L1/x2c.awk | 6 | ||||
| -rw-r--r-- | common/cmd_bootm.c | 106 | ||||
| -rw-r--r-- | common/cmd_pcmcia.c | 6 | ||||
| -rw-r--r-- | disk/part_dos.c | 4 | ||||
| -rw-r--r-- | doc/README.Purple | 8 | ||||
| -rw-r--r-- | include/configs/CRAYL1.h | 82 | ||||
| -rw-r--r-- | include/configs/NETVIA.h | 2 | ||||
| -rw-r--r-- | include/image.h | 1 | ||||
| -rw-r--r-- | rtc/ds1307.c | 7 | ||||
| -rw-r--r-- | tools/mkimage.c | 1 |
18 files changed, 447 insertions, 84 deletions
@@ -2,6 +2,18 @@ Changes since U-Boot 0.3.1: ====================================================================== +* Patch by David Updegraff, 22 Apr 2003: + update for CrayL1 board + +* Patch by Pantelis Antoniou, 21 Apr 2003: + add boot support for ARTOS (a proprietary OS) + +* Patch by Steven Scholz, 11 Apr 2003: + Add support for RTC DS1338 + +* Patch by Rod Boyce, 24 Jan 2003: + Fix counting of extended partitions in diskboot command + * Patch by Christophe Lindheimer, 20 May 2003: allow the use of CFG_LOADS when CFG_NO_FLASH is set @@ -26,6 +26,10 @@ N: Guillaume Alexandre E: guillaume.alexandre@gespac.ch D: Add PCIPPC6 configuration +N: Pantelis Antoniou +E: panto@intracom.gr +D: NETVIA board support, ARTOS support. + N: Pierre Aubert E: <p.aubert@staubli.com> D: Support for RPXClassic board @@ -747,6 +747,7 @@ clean: rm -f tools/easylogo/easylogo tools/bmp_logo rm -f tools/gdb/astest tools/gdb/gdbcont tools/gdb/gdbsend rm -f tools/env/fw_printenv tools/env/fw_setenv + rm -f board/cray/L1/bootscript.c board/cray/L1/bootscript.image clobber: clean find . -type f \ @@ -343,7 +343,8 @@ The following options need to be configured: CONFIG_GTH, CONFIG_RPXClassic, CONFIG_rsdproto, CONFIG_IAD210, CONFIG_RPXlite, CONFIG_sbc8260, CONFIG_EBONY, CONFIG_sacsng, CONFIG_FPS860L, - CONFIG_V37, CONFIG_ELPT860, CONFIG_CMI + CONFIG_V37, CONFIG_ELPT860, CONFIG_CMI, + CONFIG_NETVIA ARM based boards: ----------------- @@ -638,6 +639,7 @@ The following options need to be configured: CONFIG_RTC_MC146818 - use MC146818 RTC CONFIG_RTC_DS1307 - use Maxim, Inc. DS1307 RTC CONFIG_RTC_DS1337 - use Maxim, Inc. DS1337 RTC + CONFIG_RTC_DS1338 - use Maxim, Inc. DS1338 RTC CONFIG_RTC_DS164x - use Dallas DS164x RTC - Timestamp Support: @@ -1750,7 +1752,7 @@ configurations; the following names are supported: FPS850L_config Sandpoint8240_config sbc8260_config GENIETV_config TQM823L_config PIP405_config GEN860T_config EBONY_config FPS860L_config - ELPT860_config cmi_mpc5xx_config + ELPT860_config cmi_mpc5xx_config NETVIA_config Note: for some board special configuration names may exist; check if additional information is available from the board vendor; for @@ -2066,8 +2068,8 @@ defines the following image properties: * Target Operating System (Provisions for OpenBSD, NetBSD, FreeBSD, 4.4BSD, Linux, SVR4, Esix, Solaris, Irix, SCO, Dell, NCR, VxWorks, - LynxOS, pSOS, QNX; - Currently supported: Linux, NetBSD, VxWorks, QNX). + LynxOS, pSOS, QNX, RTEMS, ARTOS; + Currently supported: Linux, NetBSD, VxWorks, QNX, RTEMS, ARTOS). * Target CPU Architecture (Provisions for Alpha, ARM, Intel x86, IA64, MIPS, MIPS, PowerPC, IBM S390, SuperH, Sparc, Sparc 64 Bit; Currently supported: PowerPC). diff --git a/board/cray/L1/L1.c b/board/cray/L1/L1.c index f5dfba4aac..b1e2783024 100644 --- a/board/cray/L1/L1.c +++ b/board/cray/L1/L1.c @@ -27,7 +27,9 @@ #include <command.h> #include <cmd_nvedit.h> #include <cmd_bootm.h> +#include <cmd_boot.h> #include <rtc.h> +#include <post.h> #include <net.h> #include <malloc.h> @@ -53,17 +55,19 @@ * space. * on the server this looks like: * - * option space U-Boot; - * option U-Boot.initrd code 3 = string; - * option U-Boot.bootcmd code 4 = string; - * option U-Boot.bootflags code 5 = string; - * option U-Boot.rootdev code 6 = string; + * option space CRAYL1; + * option CRAYL1.initrd code 3 = string; + * ..etc... */ #define DHCP_VENDOR_SPECX 43 #define DHCP_VX_INITRD 3 #define DHCP_VX_BOOTCMD 4 -#define DHCP_VX_BOOTFLAGS 5 +#define DHCP_VX_BOOTARGS 5 #define DHCP_VX_ROOTDEV 6 +#define DHCP_VX_FROMFLASH 7 +#define DHCP_VX_BOOTSCRIPT 8 +#define DHCP_VX_RCFILE 9 +#define DHCP_VX_MAGIC 10 /* Things DHCP server can tellme about. If there's no flash address, then * they dont participate in 'update' to flash, and we force their values @@ -89,18 +93,29 @@ static dhcp_item_t Things[] = { /* and the other way.. */ {DHCP_VENDOR_SPECX, DHCP_VX_INITRD, NULL, "initrd"}, {DHCP_VENDOR_SPECX, DHCP_VX_BOOTCMD, NULL, "bootcmd"}, - {DHCP_VENDOR_SPECX, DHCP_VX_BOOTFLAGS, NULL, NULL}, + {DHCP_VENDOR_SPECX, DHCP_VX_FROMFLASH, NULL, "fromflash"}, + {DHCP_VENDOR_SPECX, DHCP_VX_BOOTSCRIPT, NULL, "bootscript"}, + {DHCP_VENDOR_SPECX, DHCP_VX_RCFILE, NULL, "rcfile"}, + {DHCP_VENDOR_SPECX, DHCP_VX_BOOTARGS, NULL, "xbootargs"}, {DHCP_VENDOR_SPECX, DHCP_VX_ROOTDEV, NULL, NULL}, + {DHCP_VENDOR_SPECX, DHCP_VX_MAGIC, NULL, NULL} }; #define N_THINGS ((sizeof(Things))/(sizeof(dhcp_item_t))) -static void init_ecc_sdram (void); +extern char bootscript[]; + +/* Here is the boot logic as HUSH script. Overridden by any TFP provided + * bootscript file. + */ + +static void init_sdram (void); /* ------------------------------------------------------------------------- */ int board_pre_init (void) { - init_ecc_sdram (); + /* Running from ROM: global data is still READONLY */ + init_sdram (); mtdcr (uicsr, 0xFFFFFFFF); /* clear all ints */ mtdcr (uicer, 0x00000000); /* disable all ints */ mtdcr (uiccr, 0x00000020); /* set all but FPGA SMI to be non-critical */ @@ -116,6 +131,7 @@ int checkboard (void) { return (0); } +/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */ int misc_init_r (void) @@ -124,6 +140,7 @@ int misc_init_r (void) image_header_t *hdr; time_t timestamp; struct rtc_time tm; + char bootcmd[32]; hdr = (image_header_t *) (CFG_MONITOR_BASE - sizeof (image_header_t)); timestamp = (time_t) hdr->ih_time; @@ -143,6 +160,8 @@ int misc_init_r (void) setenv ("ethaddr", e); } } + sprintf (bootcmd,"autoscript %X",(unsigned)bootscript); + setenv ("bootcmd", bootcmd); return (0); } @@ -168,11 +187,11 @@ void rtc_reset (void) } /* ------------------------------------------------------------------------- */ -/* Do sdram bank init in C so I can read it.. +/* Do sdram bank init in C so I can read it..no console to print to yet! */ -static void init_ecc_sdram (void) +static void init_sdram (void) { - unsigned long tmp, *p; + unsigned long tmp; /* write SDRAM bank 0 register */ mtdcr (memcfga, mem_mb0cf); @@ -202,33 +221,78 @@ static void init_ecc_sdram (void) mtdcr (memcfgd, 0x90800000); udelay (200); -/* disable ECC on all banks */ +/* initially, disable ECC on all banks */ + udelay (200); mtdcr (memcfga, mem_ecccf); tmp = mfdcr (memcfgd); tmp &= 0xff0fffff; mtdcr (memcfga, mem_ecccf); mtdcr (memcfgd, tmp); -/* set up SDRAM Controller with ECC enabled */ + return; +} + +extern int memory_post_test (int flags); + +int testdram (void) +{ + unsigned long tmp; + uint *pstart = (uint *) 0x00000000; + uint *pend = (uint *) L1_MEMSIZE; + uint *p; + + if (getenv_r("booted",NULL,0) <= 0) + { + printf ("testdram.."); + /*AA*/ + for (p = pstart; p < pend; p++) + *p = 0xaaaaaaaa; + for (p = pstart; p < pend; p++) { + if (*p != 0xaaaaaaaa) { + printf ("SDRAM test fails at: %08x, was %08x expected %08x\n", + (uint) p, *p, 0xaaaaaaaa); + return 1; + } + } + /*55*/ + for (p = pstart; p < pend; p++) + *p = 0x55555555; + for (p = pstart; p < pend; p++) { + if (*p != 0x55555555) { + printf ("SDRAM test fails at: %08x, was %08x expected %08x\n", + (uint) p, *p, 0x55555555); + return 1; + } + } + /*addr*/ + for (p = pstart; p < pend; p++) + *p = (unsigned)p; + for (p = pstart; p < pend; p++) { + if (*p != (unsigned)p) { + printf ("SDRAM test fails at: %08x, was %08x expected %08x\n", + (uint) p, *p, (uint)p); + return 1; + } + } + printf ("Success. "); + } + printf ("Enable ECC.."); + mtdcr (memcfga, mem_mcopt1); tmp = (mfdcr (memcfgd) & ~0xFFE00000) | 0x90800000; mtdcr (memcfga, mem_mcopt1); mtdcr (memcfgd, tmp); udelay (600); - -/* fill all the memory */ - for (p = (unsigned long) 0; ((unsigned long) p < L1_MEMSIZE); - *p++ = 0L); + for (p = (unsigned long) 0; ((unsigned long) p < L1_MEMSIZE); *p++ = 0L) + ; udelay (400); mtdcr (memcfga, mem_ecccf); tmp = mfdcr (memcfgd); - -/* enable ECC on bank 0 */ tmp |= 0x00800000; mtdcr (memcfgd, tmp); udelay (400); - - return; + printf ("enabled.\n"); + return (0); } /* ------------------------------------------------------------------------- */ @@ -250,7 +314,9 @@ static u8 *dhcp_env_update (u8 thing, u8 * pop) /* set env. */ if (Things[thing].envname) + { setenv (Things[thing].envname, Things[thing].dhcpvalue); + } return (Things[thing].dhcpvalue); } @@ -285,9 +351,9 @@ u8 *dhcp_vendorex_proc (u8 * pop) oplen -= sub_oplen, sub_op += (sub_oplen + 2)) { for (thing = 0; thing < N_THINGS; thing++) { if (*sub_op == Things[thing].dhcp_vendor_option) { - if (!(retval = dhcp_env_update (thing, sub_op))) { - return NULL; - } + if (!(retval = dhcp_env_update (thing, sub_op))) { + return NULL; + } } } } @@ -298,5 +364,5 @@ u8 *dhcp_vendorex_proc (u8 * pop) return NULL; } } - return (thing >= N_THINGS ? NULL : pop); + return (pop); } diff --git a/board/cray/L1/Makefile b/board/cray/L1/Makefile index 12b2fa8107..4c09eddd91 100644 --- a/board/cray/L1/Makefile +++ b/board/cray/L1/Makefile @@ -25,18 +25,28 @@ include $(TOPDIR)/config.mk LIB = lib$(BOARD).a -OBJS = $(BOARD).o flash.o -SOBJS = init.o +OBJS = $(BOARD).o flash.o bootscript.o +SOBJS = init.o $(LIB): $(OBJS) $(SOBJS) $(AR) crv $@ $^ clean: - rm -f $(SOBJS) $(OBJS) + rm -f $(SOBJS) $(OBJS) bootscript.c bootscript.image distclean: clean rm -f $(LIB) core *.bak .depend +$(BOARD).o: $(BOARD).c bootscript.o + +bootscript.o: bootscript.c + +bootscript.c: bootscript.image + od -t x1 -v -A x $^ | awk -f x2c.awk > $@ + +bootscript.image: bootscript.hush Makefile + -$(TOPDIR)/tools/mkimage -A ppc -O linux -T script -C none -a 0 -e 0 -n bootscript -d bootscript.hush $@ + ######################################################################### .depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c) diff --git a/board/cray/L1/bootscript.hush b/board/cray/L1/bootscript.hush new file mode 100644 index 0000000000..ec4839b5d0 --- /dev/null +++ b/board/cray/L1/bootscript.hush @@ -0,0 +1,117 @@ +# $Header$ +# hush bootscript for PPCBOOT on L1 +# note: all #s are in hex, do _NOT_ prefix it with 0x + +flash_rfs=ffc00000 +flash_krl=fff00000 +tftp_addr=100000 +tftp2_addr=1000000 + +if printenv booted +then + echo already booted before +else + echo first boot in environment, create and save settings + setenv booted OK + saveenv +fi + +setenv autoload no +# clear out stale env stuff, so we get fresh from dhcp. +for setting in initrd fromflash kernel rootfs rootpath +do +setenv $setting +done + +dhcp + +# if host provides us with a different bootscript, us it. +if printenv bootscript + then + tftp $tftp_addr $bootcript + if imi $tftp_addr + then + autoscript $tftp_addr + fi +fi + +# default base kernel arguments. +setenv bootargs $xbootargs devfs=mount ip=$ipaddr:$serverip:$gatewayip:$netmask:L1:eth0:off wdt=120 + +# Have a kernel in flash? +if imi $flash_krl +then + echo ok kernel to boot from $flash_krl + setenv kernel $flash_krl +else + echo no kernel to boot from $flash_krl, need tftp +fi + +# Have a rootfs in flash? +echo test for SQUASHfs at $flash_rfs + +if imi $flash_rfs +then + echo appears to be a good initrd image at base of flash OK + setenv rootfs $flash_rfs +else + echo no image at base of flash, need nfsroot or initrd +fi + +# I boot from flash if told to and I can. +if printenv fromflash && printenv kernel && printenv rootfs +then + echo booting entirely from flash + setenv bootargs root=/dev/ram0 rw $bootargs + bootm $kernel $rootfs + echo oh no failed so I try some other stuff +fi + +# TFTP down a kernel +if printenv bootfile +then + tftp $tftp_addr $bootfile + setenv kernel $tftp_addr + echo I will boot the TFTP kernel +else + if printenv kernel + then + echo no bootfile specified, will use one from flash + else + setenv bootfile /opt/crayx1/craymcu/l1/flash/linux.image + echo OH NO! we have no bootfile,nor flash kernel! try default: $bootfile + tftp $tftp_addr $bootfile + setenv kernel $tftp_addr + fi +fi + +# the rootfs. +if printenv rootpath +then + echo rootpath is $rootpath + if printenv initrd + then + echo initrd is also specified, so use $initrd + tftp $tftp2_addr $initrd + setenv bootargs root=/dev/ram0 rw cwsroot=$serverip:$rootpath $bootargs + bootm $kernel $tftp2_addr + else + echo initrd is not specified, so use NFSROOT $rootpat + setenv bootargs root=/dev/nfs ro nfsroot=$serverip:$rootpath $bootargs + bootm $kernel + fi +else + echo we have no rootpath check for one in flash + if printenv rootfs + then + echo I will use the one in flash + setenv bootargs root=/dev/mtdblock/0 ro rootfstype=squashfs $bootargs + bootm $kernel + else + setenv rootpath /export/crayl1 + echo OH NO! we have no rootpath,nor flash kernel! try default: $rootpath + setenv bootargs root=/dev/mtdblock/0 ro rootfstype=squashfs $bootargs + bootm $kernel + fi +fi +reset diff --git a/board/cray/L1/patchme b/board/cray/L1/patchme new file mode 100644 index 0000000000..e77ee7e1f5 --- /dev/null +++ b/board/cray/L1/patchme @@ -0,0 +1,30 @@ +# master confi.mk +echo "CROSS_COMPILE = powerpc-linux-" >>include/config.mk + +# patch the examples/Makefile to ignore return value from OBJCOPY +sed -e 's/$(OBJCOPY)/-&/' < examples/Makefile > examples/makefile + +# add a built target for mkimage on the target architecture +sed -e 's/^all:.*$/all: .depend envcrc mkimage mkimage.ppc/' < tools/Makefile > tools/makefile + +cat <<EOF >>tools/makefile +mkimage.ppc : mkimage.o.ppc crc32.o.ppc + powerpc-linux-gcc -msoft-float -Wall -Wstrict-prototypes -o \$@ \$^ + powerpc-linux-strip $@ + +XFLAGS="-D__KERNEL__ -I../include -DCONFIG_4xx -Wall -Wstict-prototypes" +mkimage.o.ppc: mkimage.c + powerpc-linux-gcc -msoft-float -Wall -I../include -c -o \$@ \$^ + +crc32.o.ppc: crc32.c + powerpc-linux-gcc -msoft-float -Wall -I../include -c -o \$@ \$^ + +EOF + +# make an image by default out of the u-boot image +sed -e 's/^all:.*$/all: u-boot.image /' < Makefile > makefile +cat <<EOF >>makefile +u-boot.image: u-boot.bin + tools/mkimage -A ppc -O linux -T firmware -C none -a 0 -e 0 -n U-Boot -d \$^ \$@ + +EOF diff --git a/board/cray/L1/x2c.awk b/board/cray/L1/x2c.awk new file mode 100644 index 0000000000..9235e6cb36 --- /dev/null +++ b/board/cray/L1/x2c.awk @@ -0,0 +1,6 @@ +#!/bin/awk +BEGIN { print "unsigned char bootscript[] = { \n"} +{ for (i = 2; i <= NF ; i++ ) printf "0x"$i"," + print "" +} +END { print "\n};\n" } diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index c3d62cb8c1..fa32d467ed 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -31,6 +31,7 @@ #include <image.h> #include <malloc.h> #include <zlib.h> +#include <environment.h> #include <asm/byteorder.h> #if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_TIMESTAMP) #include <rtc.h> @@ -105,6 +106,9 @@ static boot_os_Fcn do_bootm_qnxelf; int do_bootvx ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] ); int do_bootelf (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] ); #endif /* CFG_CMD_ELF */ +#if defined(CONFIG_ARTOS) && defined(CONFIG_PPC) +static boot_os_Fcn do_bootm_artos; +#endif image_header_t header; @@ -338,6 +342,12 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) addr, len_ptr, verify); break; #endif /* CFG_CMD_ELF */ +#ifdef CONFIG_ARTOS + case IH_OS_ARTOS: + do_bootm_artos (cmdtp, flag, argc, argv, + addr, len_ptr, verify); + break; +#endif } SHOW_BOOT_PROGRESS (-9); @@ -717,6 +727,99 @@ do_bootm_netbsd (cmd_tbl_t *cmdtp, int flag, (*loader) (gd->bd, img_addr, consdev, cmdline); } +#if defined(CONFIG_ARTOS) && defined(CONFIG_PPC) + +/* Function that returns a character from the environment */ +extern uchar (*env_get_char)(int); + +static void +do_bootm_artos (cmd_tbl_t *cmdtp, int flag, + int argc, char *argv[], + ulong addr, + ulong *len_ptr, + int verify) +{ + DECLARE_GLOBAL_DATA_PTR; + ulong top; + char *s, *cmdline; + char **fwenv, **ss; + int i, j, nxt, len, envno, envsz; + bd_t *kbd; + void (*entry)(bd_t *bd, char *cmdline, char **fwenv, ulong top); + image_header_t *hdr = &header; + + /* + * Booting an ARTOS kernel image + application + */ + + /* this used to be the top of memory, but was wrong... */ +#ifdef CONFIG_PPC + /* get stack pointer */ + asm volatile ("mr %0,1" : "=r"(top) ); +#endif + debug ("## Current stack ends at 0x%08lX ", top); + + top -= 2048; /* just to be sure */ + if (top > CFG_BOOTMAPSZ) + top = CFG_BOOTMAPSZ; + top &= ~0xF; + + debug ("=> set upper limit to 0x%08lX\n", top); + + /* first check the artos specific boot args, then the linux args*/ + if ((s = getenv("abootargs")) == NULL && (s = getenv("bootargs")) == NULL) + s = ""; + + /* get length of cmdline, and place it */ + len = strlen(s); + top = (top - (len + 1)) & ~0xF; + cmdline = (char *)top; + debug ("## cmdline at 0x%08lX ", top); + strcpy(cmdline, s); + + /* copy bdinfo */ + top = (top - sizeof(bd_t)) & ~0xF; + debug ("## bd at 0x%08lX ", top); + kbd = (bd_t *)top; + memcpy(kbd, gd->bd, sizeof(bd_t)); + + /* first find number of env entries, and their size */ + envno = 0; + envsz = 0; + for (i = 0; env_get_char(i) != '\0'; i = nxt + 1) { + for (nxt = i; env_get_char(nxt) != '\0'; ++nxt) + ; + envno++; + envsz += (nxt - i) + 1; /* plus trailing zero */ + } + envno++; /* plus the terminating zero */ + debug ("## %u envvars total size %u ", envno, envsz); + + top = (top - sizeof(char **)*envno) & ~0xF; + fwenv = (char **)top; + debug ("## fwenv at 0x%08lX ", top); + + top = (top - envsz) & ~0xF; + s = (char *)top; + ss = fwenv; + + /* now copy them */ + for (i = 0; env_get_char(i) != '\0'; i = nxt + 1) { + for (nxt = i; env_get_char(nxt) != '\0'; ++nxt) + ; + *ss++ = s; + for (j = i; j < nxt; ++j) + *s++ = env_get_char(j); + *s++ = '\0'; + } + *ss++ = NULL; /* terminate */ + + entry = (void (*)(bd_t *, char *, char **, ulong))ntohl(hdr->ih_ep); + (*entry)(kbd, cmdline, fwenv, top); +} +#endif + + #if (CONFIG_COMMANDS & CFG_CMD_BOOTD) int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { @@ -839,6 +942,9 @@ print_type (image_header_t *hdr) case IH_OS_QNX: os = "QNX"; break; case IH_OS_U_BOOT: os = "U-Boot"; break; case IH_OS_RTEMS: os = "RTEMS"; break; +#ifdef CONFIG_ARTOS + case IH_OS_ARTOS: os = "ARTOS"; break; +#endif default: os = "Unknown OS"; break; } diff --git a/common/cmd_pcmcia.c b/common/cmd_pcmcia.c index cb7600c2af..10ba84c16e 100644 --- a/common/cmd_pcmcia.c +++ b/common/cmd_pcmcia.c @@ -87,7 +87,9 @@ static int hardware_disable(int slot); static int hardware_enable (int slot); static int voltage_set(int slot, int vcc, int vpp); +#ifndef CONFIG_I82365 static u_int m8xx_get_graycode(u_int size); +#endif /* CONFIG_I82365 */ #if 0 static u_int m8xx_get_speed(u_int ns, u_int is_io); #endif @@ -2258,6 +2260,8 @@ static const u_int m8xx_size_to_gray[M8XX_SIZES_NO] = /* -------------------------------------------------------------------- */ +#ifndef CONFIG_I82365 + static u_int m8xx_get_graycode(u_int size) { u_int k; @@ -2273,6 +2277,8 @@ static u_int m8xx_get_graycode(u_int size) return k; } +#endif /* CONFIG_I82365 */ + /* -------------------------------------------------------------------- */ #if 0 diff --git a/disk/part_dos.c b/disk/part_dos.c index 8e71baae0d..fc6769bd2f 100644 --- a/disk/part_dos.c +++ b/disk/part_dos.c @@ -169,7 +169,9 @@ static int get_partition_info_extended (block_dev_desc_t *dev_desc, int ext_part * fdisk does not show the extended partitions that * are not in the MBR */ - if (pt->sys_ind != 0 && part_num == which_part) { + if ((pt->sys_ind != 0) && + (part_num == which_part) && + (is_extended(pt->sys_ind) == 0)) { info->blksz = 512; info->start = ext_part_sector + le32_to_int (pt->start4); info->size = le32_to_int (pt->size4); diff --git a/doc/README.Purple b/doc/README.Purple index dc3e00d10b..f811b67daa 100644 --- a/doc/README.Purple +++ b/doc/README.Purple @@ -3,7 +3,7 @@ Installation Instructions: 1. Put the s2 switch into the following position: - 1 0 + Off On ------ |x | | x| @@ -13,7 +13,7 @@ Installation Instructions: Put the s3 switch into the following position: - 1 0 + Off On ------ | x | | x | @@ -23,7 +23,7 @@ Installation Instructions: Put the s4 switch into the following position: - 1 0 + Off On ------ |x | |x | @@ -60,7 +60,7 @@ Installation Instructions: 6. Power off. Restore the original S2 switch position: - 1 0 + Off On ------ | x| | x| diff --git a/include/configs/CRAYL1.h b/include/configs/CRAYL1.h index b10d967d54..1bd6899bff 100644 --- a/include/configs/CRAYL1.h +++ b/include/configs/CRAYL1.h @@ -41,43 +41,28 @@ #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ #define CONFIG_MII 1 /* MII PHY management */ #define CONFIG_PHY_ADDR 1 /* PHY address; handling of ENET */ -#define CONFIG_BOARD_PRE_INIT 1 /* setup for 405gp */ +#define CONFIG_BOARD_PRE_INIT 1 /* early setup for 405gp */ #define CONFIG_MISC_INIT_R 1 /* so that a misc_init_r() is called */ /* set PRAM to keep U-Boot out, mem= to keep linux out, and initrd_hi to * keep possible initrd ramdisk decompression out. This is in k (1024 bytes) - #define CONFIG_PRAM 16 + #define CONFIG_PRAM 16 */ -#define CONFIG_LOADADDR 0x100000 +#define CONFIG_LOADADDR 0x100000 /* where TFTP images go */ #undef CONFIG_BOOTARGS -/* the logic is that booting is driven by what env vars get set from DHCP. - * Normal DHCP sets things like serverip, rootpath, etc. - * if printenv - */ -#define CFG_AUTOLOAD "yes" -#define CONFIG_BOOTCOMMAND "dhcp;"\ - "setenv bootargs devfs=mount;"\ - "setenv bootargs ip=$ipaddr:$serverip:$gatewayip:$netmask:::off $bootargs;"\ - "if printenv initrd;"\ - "then;" \ - "setenv initrd_hi $mem;"\ - "tftp 1000000 $initrd;"\ - "setenv bootargs root=/dev/ram0 rw cwsroot=$serverip:$rootpath $bootargs;"\ - "bootm 100000 1000000;"\ - "else;"\ - "setenv bootargs root=/dev/nfs ro nfsroot=$serverip:$rootpath $bootargs;"\ - "bootm 100000;"\ - "fi;" - -#define CONFIG_EXTRA_ENV_SETTINGS "" +/* Bootcmd is overridden by the bootscript in board/cray/L1 + */ +#define CFG_AUTOLOAD "no" +#define CONFIG_BOOTCOMMAND "dhcp" -/* +/* * ..during experiments.. #define CONFIG_SERVERIP 10.0.0.1 - #define CONFIG_ETHADDR 00:40:a6:80:14:5 + #define CONFIG_ETHADDR 00:40:a6:80:14:5 */ #define CONFIG_HARD_I2C 1 /* hardware support for i2c */ +#define CONFIG_SDRAM_BANK0 1 #define CFG_I2C_SPEED 400000 /* I2C speed and slave address */ #define CFG_I2C_SLAVE 0x7F #define CFG_I2C_EEPROM_ADDR 0x57 @@ -87,6 +72,7 @@ #define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */ #define CFG_HUSH_PARSER 1 #define CFG_PROMPT_HUSH_PS2 "> " +#define CONFIG_AUTOSCRIPT 1 #define CONFIG_COMMANDS (\ @@ -106,6 +92,8 @@ CFG_CMD_RUN|\ CFG_CMD_I2C|\ CFG_CMD_EEPROM|\ + CFG_CMD_DIAG|\ + CFG_CMD_AUTOSCRIPT|\ CFG_CMD_SETGETDCR) /* @@ -120,7 +108,13 @@ CONFIG_BOOTP_BOOTFILESIZE|\ CONFIG_BOOTP_BOOTPATH) -/* +/* + * how many time to fail & restart a net-TFTP before giving up & resetting + * the board hoping that a reset of net interface might help.. + */ +#define CONFIG_NET_RESET 5 + +/* * bauds. Just to make it compile; in our case, I read the base_baud * from the DCR anyway, so its kinda-tied to the above ref. clock which in turn * drives the system clock. @@ -145,6 +139,7 @@ #define CFG_LOAD_ADDR 0x100000/* where to load what we get from TFTP */ #define CFG_TFTP_LOADADDR CFG_LOAD_ADDR #define CFG_EXTBDINFO 1 /* To use extended board_into (bd_t) */ +#define CFG_DRAM_TEST 1 /*----------------------------------------------------------------------- * Start addresses for the final memory configuration @@ -155,15 +150,8 @@ #define CFG_FLASH_BASE 0xFFC00000 #define CFG_MONITOR_BASE TEXT_BASE -#ifndef CFG_HUSH_PARSER -#define CFG_MONITOR_LEN (128 * 1024) /* Reserve 128 kB for Monitor */ -#define CFG_ENV_OFFSET 0x3D0000 -#else -#define CFG_MONITOR_LEN (192 * 1024) /* Reserve 192 kB for Monitor */ -#define CFG_ENV_OFFSET 0x3FE000 -#endif -#define CFG_MALLOC_LEN (128 * 1024) /* Reserve 128 kB for malloc() */ +#define CFG_MONITOR_LEN (192 * 1024) /* Reserve 192 kB for Monitor */ /* * For booting Linux, the board info and command line data @@ -180,11 +168,12 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ /* BEG ENVIRONNEMENT FLASH: needs to be a whole FlashSector */ +#define CFG_ENV_OFFSET 0x3c8000 #define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ -#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ +#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment area */ #define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */ -/* Memory tests: U-Boot relocates itself to the top of Ram, so its at +/* Memory tests: U-BOOT relocates itself to the top of Ram, so its at * 32meg-(128k+some_malloc_space+copy-of-ENV sector).. */ #define CFG_SDRAM_SIZE 32 /* megs of ram */ @@ -193,6 +182,7 @@ /* to the end of the DRAM */ /* less monitor and malloc area */ #define CFG_STACK_USAGE 0x10000 /* Reserve 64k for the stack usage */ +#define CFG_MALLOC_LEN (128 << 10) /* 128k for malloc space */ #define CFG_MEM_END_USAGE ( CFG_MONITOR_LEN \ + CFG_MALLOC_LEN \ + CFG_ENV_SECT_SIZE \ @@ -202,7 +192,7 @@ /* END ENVIRONNEMENT FLASH */ /*----------------------------------------------------------------------- - * Cache Configuration. Only used to ..?? clear it, I guess.. + * Cache Configuration. Only used to ..?? clear it, I guess.. */ #define CFG_DCACHE_SIZE 16384 #define CFG_CACHELINE_SIZE 32 @@ -219,20 +209,26 @@ /*----------------------------------------------------------------------- * Definitions for initial stack pointer and data area (in OnChipMem ) */ -#if 0 -#define CFG_INIT_RAM_ADDR 0x40000000 /* use data cache */ -#define CFG_INIT_RAM_END 0x2000 /* End of used area in RAM */ -#else +#if 1 +/* On Chip Memory location */ #define CFG_TEMP_STACK_OCM 1 #define CFG_OCM_DATA_ADDR 0xF0000000 #define CFG_OCM_DATA_SIZE 0x1000 + +#define CFG_INIT_RAM_ADDR CFG_OCM_DATA_ADDR /* inside of SDRAM */ +#define CFG_INIT_RAM_END CFG_OCM_DATA_SIZE /* End of used area in RAM */ +#define CFG_GBL_DATA_SIZE 256 /* size in bytes reserved for initial data */ +#define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) +#define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET +#else +#define CFG_OCM_DATA_ADDR 0xF0000000 +#define CFG_OCM_DATA_SIZE 0x1000 #define CFG_INIT_RAM_ADDR CFG_OCM_DATA_ADDR /* inside of On Chip SRAM */ #define CFG_INIT_RAM_END CFG_OCM_DATA_SIZE /* End of On Chip SRAM */ -#endif - #define CFG_GBL_DATA_SIZE 64 /* size in bytes reserved for initial data */ #define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) #define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET +#endif /*----------------------------------------------------------------------- * Definitions for Serial Presence Detect EEPROM address diff --git a/include/configs/NETVIA.h b/include/configs/NETVIA.h index 78853250a0..28ae9fa9e3 100644 --- a/include/configs/NETVIA.h +++ b/include/configs/NETVIA.h @@ -345,4 +345,6 @@ /* Ethernet at SCC2 */ #define CONFIG_SCC2_ENET +#define CONFIG_ARTOS /* include ARTOS support */ + #endif /* __CONFIG_H */ diff --git a/include/image.h b/include/image.h index f9b769e9c5..4413a1dc64 100644 --- a/include/image.h +++ b/include/image.h @@ -46,6 +46,7 @@ #define IH_OS_QNX 16 /* QNX */ #define IH_OS_U_BOOT 17 /* Firmware */ #define IH_OS_RTEMS 18 /* RTEMS */ +#define IH_OS_ARTOS 19 /* ARTOS */ /* * CPU Architecture Codes (supported by Linux) diff --git a/rtc/ds1307.c b/rtc/ds1307.c index 247494c34d..d2b6bbe82e 100644 --- a/rtc/ds1307.c +++ b/rtc/ds1307.c @@ -25,7 +25,7 @@ /* * Date & Time support (no alarms) for Dallas Semiconductor (now Maxim) - * DS1307 Real Time Clock (RTC). + * DS1307 and DS1338 Real Time Clock (RTC). * * based on ds1337.c */ @@ -35,7 +35,8 @@ #include <rtc.h> #include <i2c.h> -#if defined(CONFIG_RTC_DS1307) && (CONFIG_COMMANDS & CFG_CMD_DATE) +#if (defined(CONFIG_RTC_DS1307) || defined(CONFIG_RTC_DS1338) ) && \ + (CONFIG_COMMANDS & CFG_CMD_DATE) /*---------------------------------------------------------------------*/ #undef DEBUG_RTC @@ -200,4 +201,4 @@ static unsigned char bin2bcd (unsigned int n) return (((n / 10) << 4) | (n % 10)); } -#endif /* CONFIG_RTC_DS1307 && (CFG_COMMANDS & CFG_CMD_DATE) */ +#endif /* (CONFIG_RTC_DS1307 || CONFIG_RTC_DS1338) && (CFG_COMMANDS & CFG_CMD_DATE) */ diff --git a/tools/mkimage.c b/tools/mkimage.c index 1504ef874b..fc8310e78b 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -93,6 +93,7 @@ table_entry_t os_name[] = { { IH_OS_QNX, "qnx", "QNX", }, { IH_OS_U_BOOT, "u-boot", "U-Boot", }, { IH_OS_RTEMS, "rtems", "RTEMS", }, + { IH_OS_ARTOS, "artos", "ARTOS", }, { -1, "", "", }, }; |