From 1d0350ed0b1b0f63e3fb5db6b19397b84a2ea1c7 Mon Sep 17 00:00:00 2001 From: wdenk Date: Mon, 11 Nov 2002 21:14:20 +0000 Subject: * Patch by Jim Sandoz, 07 Nov 2002: Increase number of network RX buffers (PKTBUFSRX in "include/net.h") for EEPRO100 based boards (especially SP8240) which showed "Receiver is not ready" errors when U-Boot was processing the receive buffers slower than the network controller was filling them. * Get rid of obsolete include/mpc74xx.h --- include/configs/ELPPC.h | 2 +- include/configs/EVB64260.h | 2 +- include/configs/LANTEC.h | 1 + include/configs/MPC8260ADS.h | 1 + include/configs/ZUMA.h | 2 +- include/configs/ep8260.h | 1 + include/configs/hymod.h | 1 + include/configs/sacsng.h | 16 +++++++++---- include/configs/sbc8260.h | 54 ++++++++++++++++++++++++++++++++++++++++---- 9 files changed, 69 insertions(+), 11 deletions(-) (limited to 'include/configs') diff --git a/include/configs/ELPPC.h b/include/configs/ELPPC.h index a3b1296..a9e87c5 100644 --- a/include/configs/ELPPC.h +++ b/include/configs/ELPPC.h @@ -310,7 +310,7 @@ /* * L2CR setup -- make sure this is right for your board! - * look in include/mpc74xx.h for the defines used here + * look in include/74xx_7xx.h for the defines used here */ #define CFG_L2 diff --git a/include/configs/EVB64260.h b/include/configs/EVB64260.h index fa7e1f6..acd8538 100644 --- a/include/configs/EVB64260.h +++ b/include/configs/EVB64260.h @@ -400,7 +400,7 @@ /*----------------------------------------------------------------------- * L2CR setup -- make sure this is right for your board! - * look in include/mpc74xx.h for the defines used here + * look in include/74xx_7xx.h for the defines used here */ #define CFG_L2 diff --git a/include/configs/LANTEC.h b/include/configs/LANTEC.h index 015e621..c7c78ad 100644 --- a/include/configs/LANTEC.h +++ b/include/configs/LANTEC.h @@ -100,6 +100,7 @@ & ~CFG_CMD_PCI \ & ~CFG_CMD_PCMCIA \ & ~CFG_CMD_SCSI \ + & ~CFG_CMD_SPI \ & ~CFG_CMD_USB \ & ~CFG_CMD_VFD ) diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h index f6d186f..14ad313 100644 --- a/include/configs/MPC8260ADS.h +++ b/include/configs/MPC8260ADS.h @@ -120,6 +120,7 @@ CFG_CMD_PCI | \ CFG_CMD_PCMCIA | \ CFG_CMD_SCSI | \ + CFG_CMD_SPI | \ CFG_CMD_VFD | \ CFG_CMD_USB ) ) diff --git a/include/configs/ZUMA.h b/include/configs/ZUMA.h index 4978f7e..541cf92 100644 --- a/include/configs/ZUMA.h +++ b/include/configs/ZUMA.h @@ -344,7 +344,7 @@ /*----------------------------------------------------------------------- * L2CR setup -- make sure this is right for your board! - * look in include/mpc74xx.h for the defines used here + * look in include/74xx_7xx.h for the defines used here */ #define CFG_L2 diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h index f6bc572..5db1f13 100644 --- a/include/configs/ep8260.h +++ b/include/configs/ep8260.h @@ -284,6 +284,7 @@ ~CFG_CMD_PCI & \ ~CFG_CMD_PCMCIA & \ ~CFG_CMD_SCSI & \ + ~CFG_CMD_SPI & \ ~CFG_CMD_USB & \ ~CFG_CMD_VFD & \ ~CFG_CMD_DTT ) diff --git a/include/configs/hymod.h b/include/configs/hymod.h index eeae055..af3ba68 100644 --- a/include/configs/hymod.h +++ b/include/configs/hymod.h @@ -149,6 +149,7 @@ CFG_CMD_PCI | \ CFG_CMD_USB | \ CFG_CMD_SCSI | \ + CFG_CMD_SPI | \ CFG_CMD_VFD | \ CFG_CMD_DTT ) ) diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h index 92cdcf0..7accf74 100644 --- a/include/configs/sacsng.h +++ b/include/configs/sacsng.h @@ -252,10 +252,12 @@ /* - * select SPI support configuration + * Select SPI support configuration */ -#define CONFIG_SOFT_SPI /* enable SPI driver */ - +#define CONFIG_SOFT_SPI /* Enable SPI driver */ +#define MAX_SPI_BYTES 4 /* Maximum number of bytes we can handle */ +#undef DEBUG_SPI /* Disable SPI debugging */ + /* * Software (bit-bang) SPI driver configuration */ @@ -274,7 +276,7 @@ else immr->im_ioport.iop_pdatd &= ~I2C_MOSI #define SPI_SCL(bit) if(bit) immr->im_ioport.iop_pdatd |= I2C_SCLK; \ else immr->im_ioport.iop_pdatd &= ~I2C_SCLK -#define SPI_DELAY /*udelay(1)*/ /* 1/2 SPI clock duration */ +#define SPI_DELAY /* No delay is needed */ #endif /* CONFIG_SOFT_SPI */ @@ -485,6 +487,11 @@ #define CFG_PROMPT_HUSH_PS2 "> " #endif +/* When CONFIG_TIMESTAMP is selected, the timestamp (date and time) + * of an image is printed by image commands like bootm or iminfo. + */ +#define CONFIG_TIMESTAMP + /* What U-Boot subsytems do you want enabled? */ #ifdef CONFIG_ETHER_ON_FCC # define CONFIG_COMMANDS (((CONFIG_CMD_DFL & ~(CFG_CMD_KGDB))) | \ @@ -544,6 +551,7 @@ #define CFG_LOAD_ADDR 0x400000 /* default load address */ #define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */ +#define CFG_ALT_MEMTEST /* Select full-featured memory test */ #define CFG_MEMTEST_START 0x2000 /* memtest works from the end of */ /* the exception vector table */ /* to the end of the DRAM */ diff --git a/include/configs/sbc8260.h b/include/configs/sbc8260.h index b89f503..ec60179 100644 --- a/include/configs/sbc8260.h +++ b/include/configs/sbc8260.h @@ -294,9 +294,7 @@ * is on the board edge side of both the LED strip and the DS0-DS7 * switch. */ -#if 0 -# define CONFIG_MISC_INIT_R -#endif +#undef CONFIG_MISC_INIT_R /* Set to a positive value to delay for running BOOTCOMMAND */ #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ @@ -312,6 +310,43 @@ # define DEBUG_BOOTKEYS 0 #endif +/* Define this to contain any number of null terminated strings that + * will be part of the default enviroment compiled into the boot image. + */ +#define CONFIG_EXTRA_ENV_SETTINGS \ + "serverip=192.168.123.201\0" \ + "ipaddr=192.168.123.203\0" \ + "reprog="\ + "tftpboot 0x140000 /bdi2000/u-boot.bin; " \ + "protect off 1:0; " \ + "erase 1:0; " \ + "cp.b 140000 40000000 $(filesize); " \ + "protect on 1:0\0" \ + "zapenv="\ + "protect off 1:1; " \ + "erase 1:1; " \ + "protect on 1:1\0" \ + "root-on-initrd="\ + "setenv bootcmd "\ + "version;" \ + "echo;" \ + "bootp;" \ + "setenv bootargs root=/dev/ram0 rw " \ + "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;" \ + "run boot-hook;" \ + "bootm\0" \ + "root-on-nfs="\ + "setenv bootcmd "\ + "version;" \ + "echo;" \ + "bootp;" \ + "setenv bootargs root=/dev/nfs rw " \ + "nfsroot=$(serverip):$(rootpath) " \ + "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off\\;" \ + "run boot-hook;" \ + "bootm\0" \ + "boot-hook=echo boot-hook\0" + /* Define a command string that is automatically executed when no character * is read on the console interface withing "Boot Delay" after reset. */ @@ -352,6 +387,16 @@ /* Monitor Command Prompt */ #define CFG_PROMPT "=> " +#undef CFG_HUSH_PARSER +#ifdef CFG_HUSH_PARSER +#define CFG_PROMPT_HUSH_PS2 "> " +#endif + +/* When CONFIG_TIMESTAMP is selected, the timestamp (date and time) + * of an image is printed by image commands like bootm or iminfo. + */ +#define CONFIG_TIMESTAMP + /* What U-Boot subsytems do you want enabled? */ #ifdef CONFIG_ETHER_ON_FCC # define CONFIG_COMMANDS (((CONFIG_CMD_DFL & ~(CFG_CMD_KGDB))) | \ @@ -405,9 +450,10 @@ #define CFG_BARGSIZE CFG_CBSIZE /* Boot Argument Buffer Size */ -#define CFG_LOAD_ADDR 0x140000 /* default load address */ +#define CFG_LOAD_ADDR 0x400000 /* default load address */ #define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */ +#define CFG_ALT_MEMTEST /* Select full-featured memory test */ #define CFG_MEMTEST_START 0x2000 /* memtest works from the end of */ /* the exception vector table */ /* to the end of the DRAM */ -- cgit v1.1