diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/cmd_confdefs.h | 4 | ||||
| -rw-r--r-- | include/cmd_spi.h | 2 | ||||
| -rw-r--r-- | include/configs/ELPPC.h | 2 | ||||
| -rw-r--r-- | include/configs/EVB64260.h | 2 | ||||
| -rw-r--r-- | include/configs/LANTEC.h | 1 | ||||
| -rw-r--r-- | include/configs/MPC8260ADS.h | 1 | ||||
| -rw-r--r-- | include/configs/ZUMA.h | 2 | ||||
| -rw-r--r-- | include/configs/ep8260.h | 1 | ||||
| -rw-r--r-- | include/configs/hymod.h | 1 | ||||
| -rw-r--r-- | include/configs/sacsng.h | 16 | ||||
| -rw-r--r-- | include/configs/sbc8260.h | 54 | ||||
| -rw-r--r-- | include/lists.h | 4 | ||||
| -rw-r--r-- | include/mpc74xx.h | 98 | ||||
| -rw-r--r-- | include/net.h | 5 |
14 files changed, 80 insertions, 113 deletions
diff --git a/include/cmd_confdefs.h b/include/cmd_confdefs.h index 52d3b6094c..a5308b6932 100644 --- a/include/cmd_confdefs.h +++ b/include/cmd_confdefs.h @@ -76,6 +76,7 @@ #define CFG_CMD_HWFLOW 0x0000020000000000 /* RTS/CTS hw flow control */ #define CFG_CMD_SAVES 0x0000040000000000 /* save S record dump */ #define CFG_CMD_VFD 0x0000080000000000 /* Display bitmap on VFD display*/ +#define CFG_CMD_SPI 0x0000100000000000 /* SPI utility */ #define CFG_CMD_ALL 0xFFFFFFFFFFFFFFFF /* ALL commands */ @@ -110,7 +111,8 @@ CFG_CMD_SCSI | \ CFG_CMD_SDRAM | \ CFG_CMD_USB | \ - CFG_CMD_VFD ) + CFG_CMD_VFD | \ + CFG_CMD_SPI ) /* Default configuration */ diff --git a/include/cmd_spi.h b/include/cmd_spi.h index f0349a1845..30927c1519 100644 --- a/include/cmd_spi.h +++ b/include/cmd_spi.h @@ -38,7 +38,7 @@ <dout> - Hexadecimal string that gets sent\n" \ ), -int do_spi (cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[]); +int do_spi (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); #else #define CMD_TBL_SPI diff --git a/include/configs/ELPPC.h b/include/configs/ELPPC.h index a3b12961b4..a9e87c5798 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 fa7e1f6d3c..acd8538c31 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 015e621110..c7c78ad0c6 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 f6d186f6ee..14ad313944 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 4978f7e2a2..541cf9225d 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 f6bc5722ac..5db1f13a14 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 eeae055a74..af3ba686df 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 92cdcf08cb..7accf745ab 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 b89f503b66..ec6017938d 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 */ diff --git a/include/lists.h b/include/lists.h index 3249fcaa46..b42a2fae1c 100644 --- a/include/lists.h +++ b/include/lists.h @@ -39,7 +39,7 @@ void *ListGetPtrToItem(list_t list, int itemPosition); void ListRemoveItem(list_t list, void *itemDestination, int itemPosition); void ListRemoveItems(list_t list, void *itemsDestination, int firstItemPosition, int numItemsToRemove); -#if 0 +#if 0 /* rarely ever used; kept here for reference just in case ... */ void ListDisposePtrList(list_t list); void ListGetItem(list_t list, void *itemDestination, int itemPosition); void ListReplaceItem(list_t list, void *ptrToItem, int itemPosition); @@ -72,6 +72,6 @@ int ListGetItemSize(list_t list); int GetIntListFromParmInfo(va_list parmInfo, int numIntegers, list_t *integerList); int ListInsertAfterItem(list_t list, void *ptrToItem, void *ptrToItemToInsertAfter, CompareFunction compareFunction); int ListInsertBeforeItem(list_t list, void *ptrToItem, void *ptrToItemToInsertBefore, CompareFunction compareFunction); -#endif 0 +#endif /* 0 */ #endif /* _LISTS_H_ */ diff --git a/include/mpc74xx.h b/include/mpc74xx.h deleted file mode 100644 index f36392ef01..0000000000 --- a/include/mpc74xx.h +++ /dev/null @@ -1,98 +0,0 @@ -/* - * (C) Copyright 2001 - * Josh Huber, Mission Critical Linux, Inc. <huber@mclx.com> - * - * 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 - */ - -/* - * mpc74xx.h - * - * MPC74xx specific definitions - */ - -#ifndef __MPC74XX_H__ -#define __MPC74XX_H__ - -/*---------------------------------------------------------------- - * Exception offsets (PowerPC standard) - */ -#define EXC_OFF_SYS_RESET 0x0100 /* default system reset offset */ - -/*---------------------------------------------------------------- - * l2cr values - */ -#define l2cr 1017 - -#define L2CR_L2E 0x80000000 /* bit 0 - enable */ -#define L2CR_L2PE 0x40000000 /* bit 1 - data parity */ -#define L2CR_L2SIZ_2M 0x00000000 /* bits 2-3 - 2MB, MPC7400 only! */ -#define L2CR_L2SIZ_1M 0x30000000 /* ... 1MB */ -#define L2CR_L2SIZ_HM 0x20000000 /* ... 512K */ -#define L2CR_L2SIZ_QM 0x10000000 /* ... 256k */ -#define L2CR_L2CLK_1 0x02000000 /* bits 4-6 clock ratio div 1 */ -#define L2CR_L2CLK_1_5 0x04000000 /* bits 4-6 clock ratio div 1.5 */ -#define L2CR_L2CLK_2 0x08000000 /* bits 4-6 clock ratio div 2 */ -#define L2CR_L2CLK_2_5 0x0a000000 /* bits 4-6 clock ratio div 2.5 */ -#define L2CR_L2CLK_3 0x0c000000 /* bits 4-6 clock ratio div 3 */ -#define L2CR_L2CLK_3_5 0x06000000 /* bits 4-6 clock ratio div 3.5 */ -#define L2CR_L2CLK_4 0x0e000000 /* bits 4-6 clock ratio div 4 */ -#define L2CR_L2RAM_BURST 0x01000000 /* bits 7-8 - burst SRAM */ -#define L2CR_DO 0x00400000 /* bit 9 - enable caching of instr. in L2 */ -#define L2CR_L2I 0x00200000 /* bit 10 - global invalidate bit */ -#define L2CR_L2CTL 0x00100000 /* bit 11 - l2 ram control */ -#define L2CR_L2WT 0x00080000 /* bit 12 - l2 write-through */ -#define L2CR_TS 0x00040000 /* bit 13 - test support on */ -#define L2CR_TS_OFF -L2CR_TS /* bit 13 - test support off */ -#define L2CR_L2OH_5 0x00000000 /* bits 14-15 - output hold time = short */ -#define L2CR_L2OH_1 0x00010000 /* bits 14-15 - output hold time = medium */ -#define L2CR_L2OH_INV 0x00020000 /* bits 14-15 - output hold time = long */ -#define L2CR_L2IP 0x00000001 /* global invalidate in progress */ - -/*---------------------------------------------------------------- - * BAT settings. Look in config_<BOARD>.h for the actual setup - */ - -#define BATU_BL_128K 0x00000000 -#define BATU_BL_256K 0x00000004 -#define BATU_BL_512K 0x0000000c -#define BATU_BL_1M 0x0000001c -#define BATU_BL_2M 0x0000003c -#define BATU_BL_4M 0x0000007c -#define BATU_BL_8M 0x000000fc -#define BATU_BL_16M 0x000001fc -#define BATU_BL_32M 0x000003fc -#define BATU_BL_64M 0x000007fc -#define BATU_BL_128M 0x00000ffc -#define BATU_BL_256M 0x00001ffc - -#define BATU_VS 0x00000002 -#define BATU_VP 0x00000001 -#define BATU_INVALID 0x00000000 - -#define BATL_WRITETHROUGH 0x00000040 /* W */ -#define BATL_CACHEINHIBIT 0x00000020 /* I */ -#define BATL_COHERENT 0x00000010 /* M */ -#define BATL_GUARDED 0x00000008 /* G */ - -#define BATL_NO_ACCESS 0x00000000 -#define BATL_RO 0x00000001 -#define BATL_RW 0x00000002 - -#endif /* __MPC74XX_H__ */ diff --git a/include/net.h b/include/net.h index d4985ca307..396f36e6df 100644 --- a/include/net.h +++ b/include/net.h @@ -27,7 +27,12 @@ * */ +#ifndef CONFIG_EEPRO100 #define PKTBUFSRX 4 +#else +#define PKTBUFSRX 8 +#endif + #define PKTALIGN 32 typedef ulong IPaddr_t; |
