diff options
Diffstat (limited to 'board')
| -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 |
5 files changed, 258 insertions, 29 deletions
diff --git a/board/cray/L1/L1.c b/board/cray/L1/L1.c index f5dfba4..b1e2783 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 12b2fa8..4c09edd 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 0000000..ec4839b --- /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 0000000..e77ee7e --- /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 0000000..9235e6c --- /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" } |