March 2004 - U-Boot

[U-Boot-Users] loading linux in FADS860T board through u-boot-1.0.0
by RamanaYV 17 Mar '04

17 Mar '04

I was trying to load linux-2.4.4 in FADS860T board using u-boot-1.0.0. I have settted environment variables like ipaddr,serverip,ethaddr,bootargs bootfile and saved the environment. Then,i typed tftpboot to download image from server. Then,i typed bootm to start the booting process. System is stucked by showing "Uncompressing Kernel Image ... OK" sequence of these events r given below.can u please suggest, what i need to do to come out from this. Thank you. U-Boot 1.0.0 (Mar 17 2004 - 14:06:16) CPU: XPC86xxxZPnnD4 at 40 MHz: 4 kB I-Cache 4 kB D-Cache FEC present Board: FADS with db MPC821, MPC860 / MPC860SAR / MPC860T rev PILOT DRAM: (4 MB SDRAM) 4M 60ns DRAM: 8 MB FLASH: 2 MB In: serial Out: serial Err: serial Net: FEC ETHERNET =>printenv stdin=serial stdout=serial stderr=serial Environment size: 41/16380 bytes =>setenv ipaddr 192.168.1.115 =>setenv serverip 192.168.1.87 =>setenv ip 192.168.1.115 =>setenv ethaddr 00:30:bf:01:02:d0 =>setenv bootargs "root=/dev/nfs rw nfsroot=192.168.1.87:/opt/eldk/ppc8xx ip=192 .168.1.115:192.168.1.87:192.168.1.115:255.255.255.0:ppc::off" =>setenv bootfile "pImage_fads_fec" =>saveenv Saving Environment to Flash... Un-Protected 1 sectors Erasing Flash... . done Erased 1 sectors Writing to Flash... done Protected 1 sectors =>printenv stdin=serial stdout=serial stderr=serial ipaddr=192.168.1.115 serverip=192.168.1.87 ip=192.168.1.115 ethaddr=00:30:bf:01:02:d0 bootargs="root=/dev/nfs rw nfsroot=192.168.1.87:/opt/eldk/ppc8xx ip=192.168 1.11 5:192.168.1.87:192.168.1.115:255.255.255.0:ppc::off" bootfile="pImage_fads_fec" Environment size: 287/16380 bytes =>tftpboot TFTP from server 192.168.1.87; our IP address is 192.168.1.115 Filename 'pImage_fads_fec'. Load address: 0x100000 Loading: T invalid RARP header #####################################################TX timeout ############ ####################### done Bytes transferred = 448321 (6d741 hex) =>bootm ## Booting image at 00100000 . Image Name: Linux-2.4.4 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 448257 Bytes = 437.8 kB Load Address: 00000000 Entry Point: 00000000 Verifying Checksum ... OK Uncompressing Kernel Image ... OK

3 2

[U-Boot-Users] v2p4 porting troubles
by Joshua Lamorie 17 Mar '04

17 Mar '04

Gidday there, We have a custom made board containing not much more than a Virtex-II Pro (v2p4) and 16 Megs of Mobile SDRAM. We are trying to port Linux, and in preparing we've successfully built kernels and code for a development board from Amirix. But... We have had a series of problems with getting u-boot to work. Firstly, this is a small Virtex-II, so we are unable to put everything into BRAM. So we've made a stripped down version of Amirix's ppcboot-lite, that is supposed to load u-boot, which then will load Linux. Ppcboot-lite runs fine out of BRAM. However we've had several problems with executing from SDRAM. With various versions of the IPIF interface we have gone through the various Machine Check Exceptions problems with jumps to 0x700 and 0x200. Now, it seems that we have found a working configuration (ipif v1.0.d) that lets us run code compiled by EDK (on WinXP under VMWare), but there is an odd problem with the same code compiled by our Linux cross-compiler. We have some LEDs connected to memory mapped I/O, and our test code writes to it. The EDK compiled binary makes the following assembly for the output part. stw r0,0(r9) This works fine, and the LEDs blink all pretty and flashy like. The Linux tools compile... stw r9,0(r0) However, the LEDs respond with blankity nothingness. Using XMD, we swap around these general purpose (according to how we read the docs) registers (r8,r10, r1 etc.) , and sometimes it works and sometimes it doesn't. In the mailing-list archive, I've seen mention of a common SDRAM problem with u-boot, but it wasn't clear if this was just for Virtex-IIs or what. Has anyone seen a problem like this? Is it our toolchain? Could it be signal integrity on our board? (we have slowed things on the bus down to 16MHz, just in case) We are using crosstools-0.26, with gcc-3.3-20040112 and glibc-2.3.2. Questions for clarification are welcome. Pointers, smack-up-side-the-heads, hints, cajoles, rants are also welcome. Joshua Lamorie Department of Random Walks Xiphos Technologies Inc.

5 9

[U-Boot-Users] FADS860T board
by RamanaYV 17 Mar '04

17 Mar '04

I was trying to load linux-2.4.4 in FADS860T board using u-boot-1.0.0. i am getting the followin symptom, can anyone suggest to come out from this problem.. U-Boot 1.0.0 (Mar 17 2004 - 14:06:16) CPU: XPC86xxxZPnnD4 at 40 MHz: 4 kB I-Cache 4 kB D-Cache FEC present Board: FADS with db MPC821, MPC860 / MPC860SAR / MPC860T rev PILOT DRAM: (4 MB SDRAM) 4M 60ns DRAM: 8 MB FLASH: 2 MB In: serial Out: serial Err: serial Net: FEC ETHERNET =>printenv stdin=serial stdout=serial stderr=serial Environment size: 41/16380 bytes =>setenv ipaddr 192.168.1.115 =>setenv serverip 192.168.1.87 =>setenv ip 192.168.1.115 =>setenv ethaddr 00:30:bf:01:02:d0 =>setenv bootargs "root=/dev/nfs rw nfsroot=192.168.1.87:/opt/eldk/ppc8xx ip=192 .168.1.115:192.168.1.87:192.168.1.115:255.255.255.0:ppc::off" =>setenv bootfile "pImage_fads_fec" =>saveenv Saving Environment to Flash... Un-Protected 1 sectors Erasing Flash... . done Erased 1 sectors Writing to Flash... done Protected 1 sectors =>printenv stdin=serial stdout=serial stderr=serial ipaddr=192.168.1.115 serverip=192.168.1.87 ip=192.168.1.115 ethaddr=00:30:bf:01:02:d0 bootargs="root=/dev/nfs rw nfsroot=192.168.1.87:/opt/eldk/ppc8xx ip=192.168.1.11 5:192.168.1.87:192.168.1.115:255.255.255.0:ppc::off" bootfile="pImage_fads_fec" Environment size: 287/16380 bytes =>tftpboot TFTP from server 192.168.1.87; our IP address is 192.168.1.115 Filename 'pImage_fads_fec'. Load address: 0x100000 Loading: T invalid RARP header #####################################################TX timeout ############ ####################### done Bytes transferred = 448321 (6d741 hex) =>bootm ## Booting image at 00100000 ... Image Name: Linux-2.4.4 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 448257 Bytes = 437.8 kB Load Address: 00000000 Entry Point: 00000000 Verifying Checksum ... OK Uncompressing Kernel Image ... OK Thanks to all.

2 1

[U-Boot-Users] Booting from ext2 partition
by Jerry Walden 17 Mar '04

17 Mar '04

Hello - I've seen the fsload command for jffs2 and fat filesystems. Recently a few of the folks on my team have asked me to implement a loader that can load the kernel from an ext2 partition. They say they want this because they claim it would be easier to "upgrade" the kernel from a linux app - although I don't see much of a difference between adding a script that does a copy vs. adding a script that uses dd to copy the kernel image. The other reason given is that they do not want to dedicate a block on the CompactFlash IDE drive to a "raw" partition (creating an ext2 partition, and then write over it with the kernel make the ext2 partition unusable for anything but uboot). Again - I don't see the issue, it's not like you are wasting space on the drive. In any case, I need to get an idea of how much time such a modification would take. Has anyone attempted such a mod (I scanned the archives and did not find anything). Thanks

3 2

[U-Boot-Users] Trouble with U-Boot on M5282EVB
by Stuart Wood 17 Mar '04

17 Mar '04

I've been struggling with getting u-boot up and running on the Motorola M5282EVB for a month now. What I want to do: Load u-boot onto the internal flash of the processor. Then have the board boot from internal flash. I also want to be able to access the monitor from the serial port. My tools are: OS - Mandrake 9.2 Tool Chain - m68k-elf-tools-20030314 tool chain Debugger: - gdb-5.2.1 with "gdb-bdm-20020210.tar.gz" and "gdb-5.2.1.patch" from Cybertec. P&E BDM Interface I can also use CFFlasher from Motorola on a separate Windows machine. What I've done: I've down loaded U-BOOT from the CVS Tree (I know it needs a pre loader) I'm using Bernhard Kuhn "bdm-m5282evb.tgz" and "loader-m5282evb.tgzr" files for the Pre-Loader. I've down loaded and compiled Motorola's sample initialization code with GCC. I wrote and ran a SDRAM memory test program based on that code. I've tried to use Bernhard's BDM code with U-Boot but I get a bus fault after it tries to loading/run u-boot. What I don't understand: Other than initializing the processor what does the pre-loader need to do? What is the function of Bernhard's "Loader" Code? Why does the output need to be loaded into /tftpboot, per his instructions? I think the steps that need to be done are this; 1) using the bdm initialize the board with the preloaded code, and then halt. 2) Load U-Boot code over the bdm. ( How do I know the address that it will be going to?) 3) set the program counter to the 0x20000 4) start executing the monitor code of U-Boot 5) using the u-boot monitor over the serial interface, load u-boot to the flash. Is this correct? Any help is appreciated, and I'm willing to update Bernhard's HOW-TO if this works. Stuart Wood -------------------------------------------------------

1 0

RE: [U-Boot-Users] YOUR OPINION PLEASE: u-boot-users added to Gmane
by Rod Boyce 16 Mar '04

16 Mar '04

Wolfgang, I know we have exchanged personal e-mails and I my permission for them being searched and indexed by anybody. Regards, Rod Boyce -----Original Message----- From: u-boot-users-admin(a)lists.sourceforge.net [mailto:u-boot-users-admin@lists.sourceforge.net]On Behalf Of Vladimir A. Gurevich Sent: Tuesday, March 16, 2004 6:07 PM To: Wolfgang Denk Cc: u-boot-users(a)lists.sourceforge.net Subject: Re: [U-Boot-Users] YOUR OPINION PLEASE: u-boot-users added to Gmane Hello Wolfgang, Wolfgang Denk wrote: >However, my archives include not only postings sent through the >mailing lists, but also some messages that were sent directly to my >address. I am certain that they do not include any confidential >information, and that they are all U-Boot related. > > I remember we had exchanged a couple of private emails. They DO NOT contain any confidential information and you DO have my permission to use them. Thanks for everything you had done. I really hope other people will find a couple of minutes to send similar mesages. Vladimir Gurevich ------------------------------------------------------- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click _______________________________________________ U-Boot-Users mailing list U-Boot-Users(a)lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users

2 1

[U-Boot-Users] YOUR OPINION PLEASE: u-boot-users added to Gmane
by Wolfgang Denk 16 Mar '04

16 Mar '04

In message <m365dc1px2.fsf(a)quimbies.gnus.org> the Gmane Administrator wrote: > > We have received a request for adding the > u-boot-users(a)lists.sourceforge.net mailing list to the Gmane > mail-to-news gateway/archive. A subscription request message has been > sent. If this is contrary to your wishes, please send a mail to > admin(a)gmane.org saying so, and the list will be removed from Gmane. ... > If you wish to import older archives into Gmane, send a message to > the Gmane administrators with the URL of a Unix mbox archive of the > mailing list. I can provide complete logs of the ppcboot-users and the u-boot-users mailing lists. I think this is an excellent chance to get a seachable archive of both. However, my archives include not only postings sent through the mailing lists, but also some messages that were sent directly to my address. I am certain that they do not include any confidential information, and that they are all U-Boot related. Is there anybody who sent me such "private" communication who objects against putting these messages into a public archive? Best regards, Wolfgang Denk -- Software Engineering: Embedded and Realtime Systems, Embedded Linux Phone: (+49)-8142-4596-87 Fax: (+49)-8142-4596-88 Email: wd(a)denx.de A right is not what someone gives you; it's what no one can take from you. - Ramsey Clark

4 4

[U-Boot-Users] Porting Problems :: PPC8270
by uboot＠sundmangroup.com 16 Mar '04

16 Mar '04

Hello, We have now managed to partly port U-boot1.0.2 to our custom board. What we can see, with BDI2000 and printf:s, is that the code always reaches board_init_r i.e. We are in RAM. I am using the PQ2FADS code as base since we are using a Motorola PPC8270. Now the problems start. I have encountered some strange things: 1. Variable flash_info[], introduced in file flash.c is pointing to flash! Some other variables are also pointing to either flash or 0xffffffff, they should point to some address in RAM. 2. If I run the code on the board without BDI2000, it always crashes sometime after flash_init... 3. If I run the code on the board with BDI2000 along with breakpoints in say board_init_r, cpu_init_r, console_init_r, main_loop I can get all the way to the main_loop and the "CLI"... Can anybody give me a hint where to look for broken code... Thanks // Matias

2 1

[U-Boot-Users] board.c patch got undone
by Stephen Williams 16 Mar '04

16 Mar '04

It looks like in the last wave of changes, a patch got undone: wing % cvs diff -r1.35 board.c Index: board.c =================================================================== RCS file: /cvsroot/u-boot/u-boot/lib_ppc/board.c,v retrieving revision 1.35 retrieving revision 1.36 diff -r1.35 -r1.36 877c877 < #if CONFIG_SERIAL_SOFTWARE_FIFO --- > #ifdef CONFIG_SERIAL_SOFTWARE_FIFO The "#if CONFIG_SERIAL_SOFTWARE_FIFO" is the right version, if one assumes the documentation is correct that setting CONFIG_SERIAL_SOFTWARE_FIFO=0 causes the serial port to become insensitive to CTS. Perhaps it would be even better to change it to: #if defined(CONFIG_SERIAL_SOFTWARE_FIFO) && CONFIG_SOFTWARE_FIFO>0 ... #endif -- Steve Williams "The woods are lovely, dark and deep. steve at XXXXXXXXXX But I have promises to keep, http://www.XXXXXXXXXX and lines to code before I sleep, http://www.picturel.com And lines to code before I sleep."

1 0

[U-Boot-Users] IDE Boot
by sudhakar rajashekhara 15 Mar '04

15 Mar '04

Hi All, We have ported U-Boot and Linux-2.4.22 on to a custom MPC8280 board. Now we are trying to boot linux from IDE. We were able to configure the IDE from U-Boot and copy the Linux image to one of the IDE partition. If we boot from the image copied from the hard disk, we observed that the kernel command line is empty and board doesn't boot properly. Earlier we were booting the board through NFS using a ramdisk image. Now If we have to boot from the hard disk, how to copy the file system onto the hard disk? Linux kernel recognizes the hard disk as a scsi device (/dev/sda). regards, Sudhakar. __________________________________ Do you Yahoo!? Yahoo! Mail - More reliable, more storage, less spam http://mail.yahoo.com

2 1

[U-Boot-Users] BOOTP timeouts
by himbA 15 Mar '04

15 Mar '04

Hi, I've been debugging smc91c111 lan driver in u-boot for several days now and found the fix that eliminates (at least on my board) the need to have debugging enabled on the driver and still run OK. The routines for send and recieve were lacking save/restore of PTR and PNR regs on start and end of routine, respectively. I will post a patch as soon I clean up the code. I have another question - has anybody experienced BOOTP timeouts using smc91111 driver ? To me it happens once in ~50-100 reboots of the board and after that the systems keeps on trying to send BOOTP requests but it doesn't leave the chip (tcpdump is not showing any packets on the wire). This would be output on console: [...] SMC91111 MAC addr from EEPROM: 00:c4:0e:43:36:68 BOOTP broadcast 1 BOOTP broadcast 2 BOOTP broadcast 3 BOOTP broadcast 4 BOOTP broadcast 5 SMC91111: memory allocation, try 1 failed ... SMC91111: memory allocation, try 2 failed ... SMC91111: memory allocation, try 3 failed ... SMC91111: memory allocation, try 4 failed ... SMC91111: memory allocation, try 5 failed ... SMC91111: memory allocation, try 6 failed ... SMC91111: memory allocation, try 7 failed ... SMC91111: memory allocation, try 8 failed ... SMC91111: memory allocation, try 9 failed ... SMC91111: memory allocation, try 10 failed ... Retry count exceeded; starting again BOOTP broadcast 1 [...] regards, himba -- ..because under Linux "if something is possible in principle, then it is already implemented or somebody is working on it". --LKI

1 0

[U-Boot-Users] PATCH: GbE support for 440GX
by Travis Sawyer 15 Mar '04

15 Mar '04

This patch fixes GbE support for the 440GX. It also cleans up the ethernet group selection. CHANGELOG Travis Sawyer 12 Mar 2004 Fix Gigabit Ethernet support for 440GX the patch is attached -travis

3 4

[U-Boot-Users] PATCH - add CMD_BMP and SPLASH_SCREEN support in cfb_console
by Pierre AUBERT 15 Mar '04

15 Mar '04

Hi everybody, The attached patch add bitmap (8bpp and 24bpp) support on cfb_console. This patch has been tested on a Lite5200 board with a smiLynxEM+ evaluation board on PCI. Be carefull: this patch moves the environment location in flash for the Lite5200 board. U-boot room became too small ... CHANGELOG * Pierre AUBERT 11 Mar 2004 - add bitmap command and splash screen support in cfb console. - add [optional] origin in the bitmap display command. - move the environment location in flash for the Lite5200 board. diff -Naur u-boot/common/cmd_bmp.c u-boot-paub/common/cmd_bmp.c --- u-boot/common/cmd_bmp.c 2003-07-01 23:07:07.000000000 +0200 +++ u-boot-paub/common/cmd_bmp.c 2004-03-11 16:48:01.000000000 +0100 @@ -32,7 +32,7 @@ #if (CONFIG_COMMANDS & CFG_CMD_BMP) static int bmp_info (ulong addr); -static int bmp_display (ulong addr); +static int bmp_display (ulong addr, int x, int y); /* * Subroutine: do_bmp @@ -47,6 +47,7 @@ int do_bmp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { ulong addr; + int x = 0, y = 0; switch (argc) { case 2: /* use load_addr as default address */ @@ -55,6 +56,11 @@ case 3: /* use argument */ addr = simple_strtoul(argv[2], NULL, 16); break; + case 5: + addr = simple_strtoul(argv[2], NULL, 16); + x = simple_strtoul(argv[3], NULL, 10); + y = simple_strtoul(argv[4], NULL, 10); + break; default: printf ("Usage:\n%s\n", cmdtp->usage); return 1; @@ -66,7 +72,7 @@ if (strncmp(argv[1],"info",1) == 0) { return (bmp_info(addr)); } else if (strncmp(argv[1],"display",1) == 0) { - return (bmp_display(addr)); + return (bmp_display(addr, x, y)); } else { printf ("Usage:\n%s\n", cmdtp->usage); return 1; @@ -74,10 +80,10 @@ } U_BOOT_CMD( - bmp, 3, 1, do_bmp, + bmp, 5, 1, do_bmp, "bmp - manipulate BMP image data\n", - "info <imageAddr> - display image info\n" - "bmp display <imageAddr> - display image\n" + "info <imageAddr> - display image info\n" + "bmp display <imageAddr> [x y] - display image at x,y\n" ); /* @@ -115,11 +121,17 @@ * Return: None * */ -static int bmp_display(ulong addr) +static int bmp_display(ulong addr, int x, int y) { - extern int lcd_display_bitmap (ulong); +#ifdef CONFIG_LCD + extern int lcd_display_bitmap (ulong, int, int); - return (lcd_display_bitmap (addr)); + return (lcd_display_bitmap (addr, x, y)); +#endif +#ifdef CONFIG_VIDEO + extern int video_display_bitmap (ulong, int, int); + return (video_display_bitmap (addr, x, y)); +#endif } #endif /* (CONFIG_COMMANDS & CFG_CMD_BMP) */ diff -Naur u-boot/cpu/mpc8xx/lcd.c u-boot-paub/cpu/mpc8xx/lcd.c --- u-boot/cpu/mpc8xx/lcd.c 2003-11-25 17:55:19.000000000 +0100 +++ u-boot-paub/cpu/mpc8xx/lcd.c 2004-03-11 16:51:36.000000000 +0100 @@ -1205,7 +1205,7 @@ * Display the BMP file located at address bmp_image. * Only uncompressed */ -int lcd_display_bitmap(ulong bmp_image) +int lcd_display_bitmap(ulong bmp_image, int x, int y) { volatile immap_t *immr = (immap_t *) CFG_IMMR; volatile cpm8xx_t *cp = &(immr->im_cpm); @@ -1277,16 +1277,14 @@ } padded_line = (width&0x3) ? ((width&~0x3)+4) : (width); - if (width>panel_info.vl_col) - width = panel_info.vl_col; - if (height>panel_info.vl_row) - height = panel_info.vl_row; + if ((x + width)>panel_info.vl_col) + width = panel_info.vl_col - x; + if ((y + height)>panel_info.vl_row) + height = panel_info.vl_row - y; bmap = (uchar *)bmp + le32_to_cpu (bmp->header.data_offset); - fb = (uchar *) - (lcd_base + - (((height>=panel_info.vl_row) ? panel_info.vl_row : height)-1) - * lcd_line_length); + fb = (uchar *) (lcd_base + + (y + height - 1) * lcd_line_length + x); for (i = 0; i < height; ++i) { WATCHDOG_RESET(); for (j = 0; j < width ; j++) @@ -1317,7 +1315,7 @@ if ((s = getenv("splashimage")) != NULL) { addr = simple_strtoul(s, NULL, 16); - if (lcd_display_bitmap (addr) == 0) { + if (lcd_display_bitmap (addr, 0, 0) == 0) { return ((void *)lcd_base); } } diff -Naur u-boot/drivers/cfb_console.c u-boot-paub/drivers/cfb_console.c --- u-boot/drivers/cfb_console.c 2003-06-27 23:32:37.000000000 +0200 +++ u-boot-paub/drivers/cfb_console.c 2004-03-11 16:33:13.000000000 +0100 @@ -127,7 +127,6 @@ #define VIDEO_HW_RECTFILL #define VIDEO_HW_BITBLT #endif - /*****************************************************************************/ /* Include video_fb.h after definitions of VIDEO_HW_RECTFILL etc */ /*****************************************************************************/ @@ -168,6 +167,11 @@ #endif +#if (CONFIG_COMMANDS & CFG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN) +#include <watchdog.h> +#include <bmp_layout.h> +#endif /* (CONFIG_COMMANDS & CFG_CMD_BMP) || CONFIG_SPLASH_SCREEN */ + /*****************************************************************************/ /* Cursor definition: */ /* CONFIG_CONSOLE_CURSOR: Uses a timer function (see drivers/i8042.c) to */ @@ -691,6 +695,269 @@ /*****************************************************************************/ +#if (CONFIG_COMMANDS & CFG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN) + +#define FILL_8BIT_332RGB(r,g,b) \ + { \ + *fb = ((r>>5)<<5) | ((g>>5)<<2) | (b>>6); \ + fb ++; \ + } + +#define FILL_15BIT_555RGB(r,g,b) \ + { \ + *(unsigned short *)fb = SWAP16((unsigned short)(((r>>3)<<10) | ((g>>3)<<5) | (b>>3))); \ + fb += 2; \ + } + +#define FILL_16BIT_565RGB(r,g,b) \ + { \ + *(unsigned short *)fb = SWAP16((unsigned short)((((r)>>3)<<11) | (((g)>>2)<<5) | ((b)>>3))); \ + fb += 2; \ + } + +#define FILL_32BIT_X888RGB(r,g,b) \ + { \ + *(unsigned long *)fb = SWAP32((unsigned long)(((r<<16) | (g<<8) | b))); \ + fb += 4; \ + } + +#ifdef VIDEO_FB_LITTLE_ENDIAN +#define FILL_24BIT_888RGB(r,g,b) \ + { \ + fb[0] = b; \ + fb[1] = g; \ + fb[2] = r; \ + fb += 3; \ + } + +#else +#define FILL_24BIT_888RGB(r,g,b) \ + { \ + fb[0] = r; \ + fb[1] = g; \ + fb[2] = b; \ + fb += 3; \ + } +#endif + + +/* + * Display the BMP file located at address bmp_image. + * Only uncompressed + */ +int video_display_bitmap(ulong bmp_image, int x, int y) +{ + ushort xcount, ycount; + uchar *fb; + bmp_image_t *bmp=(bmp_image_t *)bmp_image; + uchar *bmap; + ushort padded_line; + unsigned long width, height, bpp; + unsigned colors; + unsigned long compression; + bmp_color_table_entry_t cte; + + WATCHDOG_RESET(); + + if (!((bmp->header.signature[0]=='B') && + (bmp->header.signature[1]=='M'))) { + printf ("Error: no valid bmp image at %lx\n", bmp_image); + return 1; + } + + width = le32_to_cpu (bmp->header.width); + height = le32_to_cpu (bmp->header.height); + bpp = le16_to_cpu (bmp->header.bit_count); + colors = le32_to_cpu (bmp->header.colors_used); + compression = le32_to_cpu (bmp->header.compression); + + debug ("Display-bmp: %d x %d with %d colors\n", + width, height, colors); + + if (compression!=BMP_BI_RGB) { + printf ("Error: compression type %ld not supported\n", + compression); + return 1; + } + + padded_line = (((width * bpp + 7) / 8) + 3) & ~0x3; + + if ((x + width) > VIDEO_VISIBLE_COLS) + width = VIDEO_VISIBLE_COLS - x; + if ((y + height) > VIDEO_VISIBLE_ROWS) + height = VIDEO_VISIBLE_ROWS - y; + + bmap = (uchar *)bmp + le32_to_cpu (bmp->header.data_offset); + fb = (uchar *)(video_fb_address + + ((y + height - 1) * VIDEO_COLS * VIDEO_PIXEL_SIZE) + + x * VIDEO_PIXEL_SIZE); + + /* We handle only 8bpp or 24 bpp bitmap */ + switch (le16_to_cpu(bmp->header.bit_count)) { + case 8: + padded_line -= width; + if (VIDEO_DATA_FORMAT == GDF__8BIT_INDEX) { + /* Copy colormap */ + for (xcount = 0; xcount < colors; ++xcount) { + cte = bmp->color_table[xcount]; + video_set_lut (xcount, cte.red, cte.green, cte.blue); + } + } + ycount = height; + switch (VIDEO_DATA_FORMAT) { + case GDF__8BIT_INDEX: + while (ycount--) { + WATCHDOG_RESET(); + xcount = width; + while (xcount --) { + *fb ++ = *bmap ++; + } + bmap += padded_line; + fb -= (VIDEO_VISIBLE_COLS + width) * VIDEO_PIXEL_SIZE; + } + break; + case GDF__8BIT_332RGB: + while (ycount--) { + WATCHDOG_RESET(); + xcount = width; + while (xcount --) { + cte = bmp->color_table [*bmap ++]; + FILL_8BIT_332RGB (cte.red, cte.green, cte.blue); + } + bmap += padded_line; + fb -= (VIDEO_VISIBLE_COLS + width) * VIDEO_PIXEL_SIZE; + } + break; + case GDF_15BIT_555RGB: + while (ycount--) { + WATCHDOG_RESET(); + xcount = width; + while (xcount --) { + cte = bmp->color_table [*bmap ++]; + FILL_15BIT_555RGB (cte.red, cte.green, cte.blue); + } + bmap += padded_line; + fb -= (VIDEO_VISIBLE_COLS + width) * VIDEO_PIXEL_SIZE; + } + break; + case GDF_16BIT_565RGB: + while (ycount--) { + WATCHDOG_RESET(); + xcount = width; + while (xcount --) { + cte = bmp->color_table [*bmap ++]; + FILL_16BIT_565RGB (cte.red, cte.green, cte.blue); + } + bmap += padded_line; + fb -= (VIDEO_VISIBLE_COLS + width) * VIDEO_PIXEL_SIZE; + } + break; + case GDF_32BIT_X888RGB: + while (ycount--) { + WATCHDOG_RESET(); + xcount = width; + while (xcount --) { + cte = bmp->color_table [*bmap ++]; + FILL_32BIT_X888RGB (cte.red, cte.green, cte.blue); + } + bmap += padded_line; + fb -= (VIDEO_VISIBLE_COLS + width) * VIDEO_PIXEL_SIZE; + } + break; + case GDF_24BIT_888RGB: + while (ycount--) { + WATCHDOG_RESET(); + xcount = width; + while (xcount --) { + cte = bmp->color_table [*bmap ++]; + FILL_24BIT_888RGB (cte.red, cte.green, cte.blue); + } + bmap += padded_line; + fb -= (VIDEO_VISIBLE_COLS + width) * VIDEO_PIXEL_SIZE; + } + break; + } + break; + case 24: + padded_line -= 3 * width; + ycount = height; + switch (VIDEO_DATA_FORMAT) { + case GDF__8BIT_332RGB: + while (ycount--) { + WATCHDOG_RESET(); + xcount = width; + while (xcount --) { + FILL_8BIT_332RGB (bmap [2], bmap [1], bmap [0]); + bmap += 3; + } + bmap += padded_line; + fb -= (VIDEO_VISIBLE_COLS + width) * VIDEO_PIXEL_SIZE; + } + break; + case GDF_15BIT_555RGB: + while (ycount--) { + WATCHDOG_RESET(); + xcount = width; + while (xcount --) { + FILL_15BIT_555RGB (bmap [2], bmap [1], bmap [0]); + bmap += 3; + } + bmap += padded_line; + fb -= (VIDEO_VISIBLE_COLS + width) * VIDEO_PIXEL_SIZE; + } + break; + case GDF_16BIT_565RGB: + while (ycount--) { + WATCHDOG_RESET(); + xcount = width; + while (xcount --) { + FILL_16BIT_565RGB (bmap [2], bmap [1], bmap [0]); + bmap += 3; + } + bmap += padded_line; + fb -= (VIDEO_VISIBLE_COLS + width) * VIDEO_PIXEL_SIZE; + } + break; + case GDF_32BIT_X888RGB: + while (ycount--) { + WATCHDOG_RESET(); + xcount = width; + while (xcount --) { + FILL_32BIT_X888RGB (bmap [2], bmap [1], bmap [0]); + bmap += 3; + } + bmap += padded_line; + fb -= (VIDEO_VISIBLE_COLS + width) * VIDEO_PIXEL_SIZE; + } + break; + case GDF_24BIT_888RGB: + while (ycount--) { + WATCHDOG_RESET(); + xcount = width; + while (xcount --) { + FILL_24BIT_888RGB (bmap [2], bmap [1], bmap [0]); + bmap += 3; + } + bmap += padded_line; + fb -= (VIDEO_VISIBLE_COLS + width) * VIDEO_PIXEL_SIZE; + } + break; + default : + printf ("Error: 24 bits/pixel bitmap incompatible with current video mode\n"); + break; + } + break; + default: + printf ("Error: %d bit/pixel bitmaps not supported by U-Boot\n", + le16_to_cpu(bmp->header.bit_count)); + break; + } + return (0); +} +#endif /* (CONFIG_COMMANDS & CFG_CMD_BMP) || CONFIG_SPLASH_SCREEN */ + +/*****************************************************************************/ + #ifdef CONFIG_VIDEO_LOGO void logo_plot (void *screen, int width, int x, int y) { @@ -792,6 +1059,20 @@ char info[128]; extern char version_string; +#ifdef CONFIG_SPLASH_SCREEN + char *s; + ulong addr; + + if ((s = getenv("splashimage")) != NULL) { + addr = simple_strtoul(s, NULL, 16); + + if (video_display_bitmap (addr, 0, 0) == 0) { + return ((void *)(video_fb_address)); + } + } +#endif /* CONFIG_SPLASH_SCREEN */ + + logo_plot (video_fb_address, VIDEO_COLS, 0, 0); sprintf(info, " %s", &version_string); diff -Naur u-boot/include/configs/IceCube.h u-boot-paub/include/configs/IceCube.h --- u-boot/include/configs/IceCube.h 2004-02-27 09:20:55.000000000 +0100 +++ u-boot-paub/include/configs/IceCube.h 2004-03-11 17:42:57.000000000 +0100 @@ -50,6 +50,24 @@ #define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } +/* Video config - use SMI LynxEM+ evaluation board on PCI */ +#if 1 +#define CONFIG_VIDEO +#define CONFIG_CFB_CONSOLE +#define VIDEO_KBD_INIT_FCT (simple_strtol (getenv("console"), NULL, 10)) +#define VIDEO_TSTC_FCT serial_tstc +#define VIDEO_GETC_FCT serial_getc + +#define CONFIG_VIDEO_SMI_LYNXEM + +#define CONFIG_VIDEO_LOGO +#define CONFIG_VIDEO_BMP_LOGO +#undef CONFIG_CONSOLE_EXTRA_INFO + +#define CONFIG_SPLASH_SCREEN +#define CFG_CONSOLE_IS_IN_ENV +#endif + #ifdef CONFIG_MPC5200 /* MPC5100 PCI is not supported yet. */ /* * PCI Mapping: @@ -68,6 +86,9 @@ #define CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_BUS #define CONFIG_PCI_IO_SIZE 0x01000000 +/* IO access for the LynxEM+ */ +#define CFG_ISA_IO (pci_mem_base + CONFIG_PCI_IO_BUS - CONFIG_PCI_MEM_BUS) + #define CONFIG_NET_MULTI 1 #define CONFIG_EEPRO100 1 #define CFG_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */ @@ -89,7 +110,6 @@ #if 1 #define CONFIG_USB_OHCI #define ADD_USB_CMD CFG_CMD_USB | CFG_CMD_FAT -#define CONFIG_DOS_PARTITION #define CONFIG_USB_STORAGE #else #define ADD_USB_CMD 0 @@ -103,6 +123,7 @@ CFG_CMD_FAT | \ CFG_CMD_I2C | \ CFG_CMD_IDE | \ + CFG_CMD_BMP | \ ADD_PCI_CMD | \ ADD_USB_CMD) @@ -183,7 +204,7 @@ #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x30000 + 0x800000) #endif #if defined(CFG_LOWBOOT16) -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x30000) +#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x80000) #endif #endif /* CFG_LOWBOOT */ #define CFG_MAX_FLASH_BANKS 2 /* max num of memory banks */

2 3

[U-Boot-Users] small AT91RM9200 patch
by Steven Scholz 15 Mar '04

15 Mar '04

Hi there, to make porting U-Boot to new AT91RM9200 based boards easier I suggest the small attached patch. * Patch by Steven Scholz, 20 Feb 2004: - some cleanup in AT91RM9200 related code PS: a) The patch adds the configuration setting "CFG_AT91C_BRGR_DIVISOR" which is only AT91RM9200 specific. Should I provide a patch for README or rather create a doc/README.at91rm9200? b) Should we do some white space cleanings REDAME's "Directory Hierarchy" section? Thanks. -- Steven Scholz imc Measurement & Control imc Meßsysteme GmbH Voltastr. 5 Voltastr. 5 13355 Berlin 13355 Berlin Germany Deutschland Index: Makefile =================================================================== RCS file: /cvsroot/u-boot/u-boot/Makefile,v retrieving revision 1.84 diff -p -u -r1.84 Makefile --- Makefile 12 Feb 2004 00:47:09 -0000 1.84 +++ Makefile 20 Feb 2004 13:21:08 -0000 @@ -891,9 +891,6 @@ ZUMA_config: unconfig ## StrongARM Systems ######################################################################### -at91rm9200dk_config : unconfig - @./mkconfig $(@:_config=) arm at91rm9200 at91rm9200dk - lart_config : unconfig @./mkconfig $(@:_config=) arm sa1100 lart @@ -958,6 +955,13 @@ impa7_config : unconfig ep7312_config : unconfig @./mkconfig $(@:_config=) arm arm720t ep7312 + +######################################################################### +## AT91RM9200 Systems +######################################################################### + +at91rm9200dk_config : unconfig + @./mkconfig $(@:_config=) arm at91rm9200 at91rm9200dk ######################################################################### ## XScale Systems Index: README =================================================================== RCS file: /cvsroot/u-boot/u-boot/README,v retrieving revision 1.72 diff -p -u -r1.72 README --- README 8 Feb 2004 22:55:39 -0000 1.72 +++ README 20 Feb 2004 13:21:09 -0000 @@ -142,6 +142,7 @@ Directory Hierarchy: - cpu/74xx_7xx Files specific to Motorola MPC74xx and 7xx CPUs - cpu/arm925t Files specific to ARM 925 CPUs - cpu/arm926ejs Files specific to ARM 926 CPUs +- cpu/at91rm9200 Files specific to Atmel AT91RM9200 CPUs - cpu/mpc5xx Files specific to Motorola MPC5xx CPUs - cpu/mpc8xx Files specific to Motorola MPC8xx CPUs - cpu/mpc824x Files specific to Motorola MPC824x CPUs Index: cpu/at91rm9200/serial.c =================================================================== RCS file: /cvsroot/u-boot/u-boot/cpu/at91rm9200/serial.c,v retrieving revision 1.3 diff -p -u -r1.3 serial.c --- cpu/at91rm9200/serial.c 25 Jun 2003 22:26:36 -0000 1.3 +++ cpu/at91rm9200/serial.c 20 Feb 2004 13:21:10 -0000 @@ -43,7 +43,7 @@ void serial_setbrg(void) if ((baudrate = gd->bd->bi_baudrate) <= 0) baudrate = CONFIG_BAUDRATE; - us->US_BRGR = 33 /* AT91C_MASTER_CLOCK / baudrate / 16 */; /* hardcode so no __divsi3 */ + us->US_BRGR = CFG_AT91C_BRGR_DIVISOR; /* hardcode so no __divsi3 */ } int serial_init(void) Index: include/asm-arm/arch-at91rm9200/hardware.h =================================================================== RCS file: /cvsroot/u-boot/u-boot/include/asm-arm/arch-at91rm9200/hardware.h,v retrieving revision 1.1 diff -p -u -r1.1 hardware.h --- include/asm-arm/arch-at91rm9200/hardware.h 31 Mar 2003 16:35:03 -0000 1.1 +++ include/asm-arm/arch-at91rm9200/hardware.h 20 Feb 2004 13:21:11 -0000 @@ -28,11 +28,6 @@ #include "AT91RM9200_inc.h" #endif -/* AT91RM92000 clocks */ -#define AT91_MAIN_CLOCK 179712000 /* from 18.432 MHz crystal (18432000 / 4 * 39) */ -#define AT91_MASTER_CLOCK 59904000 /* peripheral clock (AT91C_MASTER_CLOCK / 3) */ -#define AT91_SLOW_CLOCK 32768 /* slow clock */ - /* Virtual and Physical base address for system peripherals */ #define AT91_SYS_BASE 0xFFFFF000 /*4K */ Index: include/configs/at91rm9200dk.h =================================================================== RCS file: /cvsroot/u-boot/u-boot/include/configs/at91rm9200dk.h,v retrieving revision 1.5 diff -p -u -r1.5 at91rm9200dk.h --- include/configs/at91rm9200dk.h 6 Dec 2003 23:55:11 -0000 1.5 +++ include/configs/at91rm9200dk.h 20 Feb 2004 13:21:11 -0000 @@ -36,6 +36,8 @@ #define AT91C_MASTER_CLOCK 59904000 /* peripheral clock (AT91C_MASTER_CLOCK / 3) */ /* #define AT91C_MASTER_CLOCK 44928000 */ /* peripheral clock (AT91C_MASTER_CLOCK / 4) */ +#define AT91_SLOW_CLOCK 32768 /* slow clock */ + #define CONFIG_AT91RM9200DK 1 /* on an AT91RM9200DK Board */ #undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ #define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ @@ -49,6 +51,8 @@ #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ #define CONFIG_BAUDRATE 115200 + +#define CFG_AT91C_BRGR_DIVISOR 33 /* hardcode so no __divsi3 : AT91C_MASTER_CLOCK / baudrate / 16 */ /* * Hardware drivers

2 3

[U-Boot-Users] get_ticks() for AT91RM9200
by Steven Scholz 15 Mar '04

15 Mar '04

Hi there, as mentioned before the AT91RM9200 port was missing a get_ticks() function. I made a lot of white space fixes as well because now the similarities _and_ differences with other ARM implementations are more obvious when doing a "diff". I added get_ticks() because it was needed by the NFS implementation. However it looks like get_ticks() is hardly use in U-Boot. I think get_timer() is used in most cases... CHANGELOG: * Patch by Steven Scholz, 27 Feb 2004: - Adding get_ticks() and get_tbclk() for AT91RM9200 - Many white space fixes in cpu/at91rm9200/interrupts.c Thanks, -- Steven Scholz imc Measurement & Control imc Meßsysteme GmbH Voltastr. 5 Voltastr. 5 13355 Berlin 13355 Berlin Germany Deutschland

3 3

[U-Boot-Users] Preparing for release 1.1
by Wolfgang Denk 14 Mar '04

14 Mar '04

Hi, I think I have now merged all patches that were sent to me so far. I will now try stabilizing the code for the release of version 1.0. Please check if I should have forgotten any stuff you sent, or if there are any unexpected problems with the current version.

1 0

[U-Boot-Users] MPC5200LITE saveenv issue
by Tord Andersson 14 Mar '04

14 Mar '04

Hi, I did a download of the latest u-boot from the SourceForge CVS 2004-03-10. After building u-boot with MPC5200LITE_LOWBOOT_config, I downloaded it with DBUG, moved the L/H jumper jumper to low boot, performed reset and u-boot was up. Unfortunately, u-boot didn't went up again after doing saveenv. I found that the binary was 209192 bytes and that the environment was located at 0xff030000 so I reckoned that the application used part of the environment area. I modified IceCube.h to have the environment start at 0xff040000 and changed the monitor length to 256 kB (see diff at end of mail). This seems to work and I was able to save the environment and boot Linux. Is there something which I have missed? I am using ELDK 2.0 and I am not sure if the newer gcc of ELDK 3.0 might generate more optimized code, which might fit into the original setup. Any feedback would be appreciated. Note! I have only changed the lowboot code. If the same size issue also affects high boot, this might also have to be changed. Kind regards, Tord Andersson --- IceCube_old.h Thu Mar 11 23:16:12 2004 +++ IceCube.h Sun Mar 14 20:04:15 2004 @@ -180,10 +180,10 @@ #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x740000 + 0x800000) #else /* CFG_LOWBOOT */ #if defined(CFG_LOWBOOT08) -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x30000 + 0x800000) +#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x40000 + 0x800000) #endif #if defined(CFG_LOWBOOT16) -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x30000) +#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x40000) #endif #endif /* CFG_LOWBOOT */ #define CFG_MAX_FLASH_BANKS 2 /* max num of memory banks */ @@ -225,7 +225,7 @@ # define CFG_RAMBOOT 1 #endif -#define CFG_MONITOR_LEN (192 << 10) /* Reserve 192 kB for Moni tor */ +#define CFG_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Moni tor */ #define CFG_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc() */ #define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */

2 1

[U-Boot-Users] PATCH: Add support for GbE in phy utils
by Travis Sawyer 14 Mar '04

14 Mar '04

Greetings: The IEEE now has free access to their specs ( http://standards.ieee.org/getieee802/ ) In the 802.3-2002, Section 22.2.4.3: <paraphrase> Any attempts to read a register in the extended register set, and the PHY does not implement that register, the phy shall not drive the MDIO line. Any attempts for a write of said register will be ignored </paraphrase> I've implemented and tested a patch for the mii phy utils: common/cmd_mii.c common/miiphyutil.c include/miiphy.c I tested on the ocotea board that has phy's that do and do not implement register 0x0A (master-slave status register) The patch is attached. CHANGELOG Travis Sawyer 12 Mar 2004 Add Gigabit Ethernet Support to MII PHY utilities A subsequent patch for the 440GX ethernet will follow. -travis

2 1

[U-Boot-Users] PATCH: get_dentfromdir (FAT)
by Leon KUKOVEC 14 Mar '04

14 Mar '04

Fixes: o 'fatls' no longer lists deleted files as "/" Changes: o get_dentfromdir correctly handles deleted dentries Any issues, let me know. -- Best Regards, Leon.

2 1

[U-Boot-Users] [PATCH] TI OMAP1610 H2 config update
by George G. Davis 14 Mar '04

14 Mar '04

Greetings, Remove hard coded network settings in TI OMAP1610 H2 default board config: Index: u-boot/include/configs/omap1610h2.h =================================================================== RCS file: /cvsroot/u-boot/u-boot/include/configs/omap1610h2.h,v retrieving revision 1.2 diff -u -r1.2 omap1610h2.h --- u-boot/include/configs/omap1610h2.h 23 Feb 2004 23:54:52 -0000 1.2 +++ u-boot/include/configs/omap1610h2.h 11 Mar 2004 19:02:42 -0000 @@ -94,12 +94,9 @@ #define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTARGS "mem=32M console=ttyS0,115200n8 noinitrd \ - root=/dev/nfs rw nfsroot=157.87.82.48:\ - /home/a0875451/mwd/myfs/target ip=dhcp" -#define CONFIG_NETMASK 255.255.254.0 /* talk on MY local net */ -#define CONFIG_IPADDR 156.117.97.156 /* static IP I currently own */ -#define CONFIG_SERVERIP 156.117.97.139 /* current IP of my dev pc */ -#define CONFIG_BOOTFILE "uImage" /* file to load */ + root=/dev/nfs ip=dhcp" +#define CONFIG_BOOTCOMMAND "bootp;tftp;bootm" +#define CFG_AUTOLOAD "n" /* No autoload */ #if (CONFIG_COMMANDS & CFG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */ That can all be obtained automagically from the bootp/dhcp server or via setenv. I've tested U-Boot on the OMAP1610 H2 with the above default configs. Works for me... -- Regards, George

2 1

[U-Boot-Users] [PATCH] New ADS GraphicsClient+ board port
by George G. Davis 14 Mar '04

14 Mar '04

Greetings, I humbly submit this trivial board port for the ADS GraphicsClient+. This SA-1110 based board is actually EOL but it's still useful to me for Linux development/testing. I'll eventually make this thing use the common CFI flash support instead of the flash.c included here. But for now I was unable to get the CFI flash support working on this target. This patch is based on latest CVS HEAD +/- a few hours. Thanks! -- Regards, George diff -x CVS -ruN u-boot.orig/board/gcplus/config.mk u-boot.new/board/gcplus/config.mk --- u-boot.orig/board/gcplus/config.mk 1969-12-31 19:00:00.000000000 -0500 +++ u-boot.new/board/gcplus/config.mk 2003-11-06 00:36:23.000000000 -0500 @@ -0,0 +1,13 @@ +# +# ADS GCPlus board with SA1110 cpu +# +# The ADS GCPlus has 2 banks of 16 MiB SDRAM +# +# We use the ADS GCPlus Linux boot ROM to load U-Boot into SDRAM +# at c020'0000 and then move ourself to c8f0'0000. Basically, just +# install the U-Boot binary as you would the Linux zImage and then +# reap the benfits of more convenient Linux development cycles, i.e. +# bootp;tftp;bootm, repeat, etc.,. +# + +TEXT_BASE = 0xc8f00000 diff -x CVS -ruN u-boot.orig/board/gcplus/flash.c u-boot.new/board/gcplus/flash.c --- u-boot.orig/board/gcplus/flash.c 1969-12-31 19:00:00.000000000 -0500 +++ u-boot.new/board/gcplus/flash.c 2003-12-09 11:29:34.000000000 -0500 @@ -0,0 +1,440 @@ +/* + * (C) Copyright 2001 + * Kyle Harris, Nexus Technologies, Inc. kharris(a)nexus-tech.net + * + * (C) Copyright 2001 + * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. + * + * 2003 (c) MontaVista Software, Inc. + * + * 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 <linux/byteorder/swab.h> + +flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ + +/* Board support for 1 or 2 flash devices */ +#define FLASH_PORT_WIDTH32 +#undef FLASH_PORT_WIDTH16 + +#ifdef FLASH_PORT_WIDTH16 +#define FLASH_PORT_WIDTH ushort +#define FLASH_PORT_WIDTHV vu_short +#define SWAP(x) __swab16(x) +#else +#define FLASH_PORT_WIDTH ulong +#define FLASH_PORT_WIDTHV vu_long +#define SWAP(x) __swab32(x) +#endif + +#define FPW FLASH_PORT_WIDTH +#define FPWV FLASH_PORT_WIDTHV + +#define mb() __asm__ __volatile__ ("" : : : "memory") + +/*----------------------------------------------------------------------- + * Functions + */ +static ulong flash_get_size(FPW * addr, flash_info_t * info); +static int write_data(flash_info_t * info, ulong dest, FPW data); +static void flash_get_offsets(ulong base, flash_info_t * info); +void inline spin_wheel(void); + +/*----------------------------------------------------------------------- + */ + +unsigned long +flash_init(void) +{ + int i; + ulong size = 0; + + for (i = 0; i < CFG_MAX_FLASH_BANKS; i++) { + switch (i) { + case 0: + flash_get_size((FPW *) PHYS_FLASH_1, &flash_info[i]); + flash_get_offsets(PHYS_FLASH_1, &flash_info[i]); + break; + default: + panic("configured too many flash banks!\n"); + break; + } + size += flash_info[i].size; + } + + /* Protect monitor and environment sectors + */ + flash_protect(FLAG_PROTECT_SET, + CFG_FLASH_BASE, + CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]); + + flash_protect(FLAG_PROTECT_SET, + CFG_ENV_ADDR, + CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); + + return size; +} + +/*----------------------------------------------------------------------- + */ +static void +flash_get_offsets(ulong base, flash_info_t * info) +{ + int i; + + if (info->flash_id == FLASH_UNKNOWN) { + return; + } + + if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL) { + for (i = 0; i < info->sector_count; i++) { + info->start[i] = base + (i * PHYS_FLASH_SECT_SIZE); + info->protect[i] = 0; + } + } +} + +/*----------------------------------------------------------------------- + */ +void +flash_print_info(flash_info_t * info) +{ + int i; + + if (info->flash_id == FLASH_UNKNOWN) { + printf("missing or unknown FLASH type\n"); + return; + } + + switch (info->flash_id & FLASH_VENDMASK) { + case FLASH_MAN_INTEL: + printf("INTEL "); + break; + default: + printf("Unknown Vendor "); + break; + } + + switch (info->flash_id & FLASH_TYPEMASK) { + case FLASH_28F128J3A: + printf("28F128J3A\n"); + break; + case FLASH_28F640J5: + printf("28F640J5\n"); + break; + default: + printf("Unknown Chip Type\n"); + break; + } + + printf(" Size: %ld MB in %d Sectors\n", + info->size >> 20, info->sector_count); + + printf(" Sector Start Addresses:"); + for (i = 0; i < info->sector_count; ++i) { + if ((i % 5) == 0) + printf("\n "); + printf(" %08lX%s", + info->start[i], info->protect[i] ? " (RO)" : " "); + } + printf("\n"); + return; +} + +/* + * The following code cannot be run from FLASH! + */ +static ulong +flash_get_size(FPW * addr, flash_info_t * info) +{ + volatile FPW value; + /* Write auto select command: read Manufacturer ID */ + addr[0x5555] = (FPW) 0x00AA00AA; + addr[0x2AAA] = (FPW) 0x00550055; + addr[0x5555] = (FPW) 0x00900090; + + mb(); + value = addr[0]; + + switch (value) { + + case (FPW) INTEL_MANUFACT: + info->flash_id = FLASH_MAN_INTEL; + break; + + default: + info->flash_id = FLASH_UNKNOWN; + info->sector_count = 0; + info->size = 0; + addr[0] = (FPW) 0x00FF00FF; /* restore read mode */ + return (0); /* no or unknown flash */ + } + + mb(); + value = addr[1]; /* device ID */ + switch (value) { + case (FPW) INTEL_ID_28F128J3A: + info->flash_id += FLASH_28F128J3A; + info->sector_count = 128; + info->size = 0x02000000; + break; /* => 16 MB */ + case (FPW) INTEL_ID_28F640J5: + info->flash_id += FLASH_28F640J5; + info->sector_count = 64; + info->size = 0x01000000; + break; /* => 16 MB */ + + default: + info->flash_id = FLASH_UNKNOWN; + break; + } + + if (info->sector_count > CFG_MAX_FLASH_SECT) { + printf("** ERROR: sector count %d > max (%d) **\n", + info->sector_count, CFG_MAX_FLASH_SECT); + info->sector_count = CFG_MAX_FLASH_SECT; + } + + addr[0] = (FPW) 0x00FF00FF; /* restore read mode */ + + return (info->size); +} + +/*----------------------------------------------------------------------- + */ + +int +flash_erase(flash_info_t * info, int s_first, int s_last) +{ + int flag, prot, sect; + ulong type, start, last; + int rcode = 0; + + if ((s_first < 0) || (s_first > s_last)) { + if (info->flash_id == FLASH_UNKNOWN) { + printf("- missing\n"); + } else { + printf("- no sectors to erase\n"); + } + return 1; + } + + type = (info->flash_id & FLASH_VENDMASK); + if ((type != FLASH_MAN_INTEL)) { + printf("Can't erase unknown flash type %08lx - aborted\n", + info->flash_id); + return 1; + } + + prot = 0; + for (sect = s_first; sect <= s_last; ++sect) { + if (info->protect[sect]) { + prot++; + } + } + + if (prot) { + printf("- Warning: %d protected sectors will not be erased!\n", + prot); + } else { + printf("\n"); + } + + start = get_timer(0); + last = start; + + /* Disable interrupts which might cause a timeout here */ + flag = disable_interrupts(); + + /* Start erase on unprotected sectors */ + for (sect = s_first; sect <= s_last; sect++) { + if (info->protect[sect] == 0) { /* not protected */ + FPWV *addr = (FPWV *) (info->start[sect]); + FPW status; + + printf("Erasing sector %2d ... ", sect); + + /* arm simple, non interrupt dependent timer */ + reset_timer_masked(); + + *addr = (FPW) 0x00500050; /* clear status register */ + *addr = (FPW) 0x00200020; /* erase setup */ + *addr = (FPW) 0x00D000D0; /* erase confirm */ + + while (((status = + *addr) & (FPW) 0x00800080) != + (FPW) 0x00800080) { + if (get_timer_masked() > CFG_FLASH_ERASE_TOUT) { + printf("Timeout\n"); + *addr = (FPW) 0x00B000B0; /* suspend erase */ + *addr = (FPW) 0x00FF00FF; /* reset to read mode */ + rcode = 1; + break; + } + } + + *addr = (FPW) 0x00500050; /* clear status register cmd. */ + *addr = (FPW) 0x00FF00FF; /* resest to read mode */ + + printf(" done\n"); + } + } + return rcode; +} + +/*----------------------------------------------------------------------- + * Copy memory to flash, returns: + * 0 - OK + * 1 - write timeout + * 2 - Flash not erased + * 4 - Flash not identified + */ + +int +write_buff(flash_info_t * info, uchar * src, ulong addr, ulong cnt) +{ + ulong cp, wp; + FPW data; + int count, i, l, rc, port_width; + + if (info->flash_id == FLASH_UNKNOWN) { + return 4; + } +/* get lower word aligned address */ +#ifdef FLASH_PORT_WIDTH16 + wp = (addr & ~1); + port_width = 2; +#else + wp = (addr & ~3); + port_width = 4; +#endif + + /* + * handle unaligned start bytes + */ + if ((l = addr - wp) != 0) { + data = 0; + for (i = 0, cp = wp; i < l; ++i, ++cp) { + data = (data << 8) | (*(uchar *) cp); + } + for (; i < port_width && cnt > 0; ++i) { + data = (data << 8) | *src++; + --cnt; + ++cp; + } + for (; cnt == 0 && i < port_width; ++i, ++cp) { + data = (data << 8) | (*(uchar *) cp); + } + + if ((rc = write_data(info, wp, SWAP(data))) != 0) { + return (rc); + } + wp += port_width; + } + + /* + * handle word aligned part + */ + count = 0; + while (cnt >= port_width) { + data = 0; + for (i = 0; i < port_width; ++i) { + data = (data << 8) | *src++; + } + if ((rc = write_data(info, wp, SWAP(data))) != 0) { + return (rc); + } + wp += port_width; + cnt -= port_width; + if (count++ > 0x800) { + spin_wheel(); + count = 0; + } + } + + if (cnt == 0) { + return (0); + } + + /* + * handle unaligned tail bytes + */ + data = 0; + for (i = 0, cp = wp; i < port_width && cnt > 0; ++i, ++cp) { + data = (data << 8) | *src++; + --cnt; + } + for (; i < port_width; ++i, ++cp) { + data = (data << 8) | (*(uchar *) cp); + } + + return (write_data(info, wp, SWAP(data))); +} + +/*----------------------------------------------------------------------- + * Write a word or halfword to Flash, returns: + * 0 - OK + * 1 - write timeout + * 2 - Flash not erased + */ +static int +write_data(flash_info_t * info, ulong dest, FPW data) +{ + FPWV *addr = (FPWV *) dest; + ulong status; + int flag; + + /* Check if Flash is (sufficiently) erased */ + if ((*addr & data) != data) { + printf("not erased at %08lx (%x)\n", (ulong) addr, *addr); + return (2); + } + /* Disable interrupts which might cause a timeout here */ + flag = disable_interrupts(); + + *addr = (FPW) 0x00400040; /* write setup */ + *addr = data; + + /* arm simple, non interrupt dependent timer */ + reset_timer_masked(); + + /* wait while polling the status register */ + while (((status = *addr) & (FPW) 0x00800080) != (FPW) 0x00800080) { + if (get_timer_masked() > CFG_FLASH_WRITE_TOUT) { + *addr = (FPW) 0x00FF00FF; /* restore read mode */ + return (1); + } + } + + *addr = (FPW) 0x00FF00FF; /* restore read mode */ + + return (0); +} + +void inline +spin_wheel(void) +{ + static int p = 0; + static char w[] = "\\/-"; + + printf("\010%c", w[p]); + (++p == 3) ? (p = 0) : 0; +} diff -x CVS -ruN u-boot.orig/board/gcplus/gcplus.c u-boot.new/board/gcplus/gcplus.c --- u-boot.orig/board/gcplus/gcplus.c 1969-12-31 19:00:00.000000000 -0500 +++ u-boot.new/board/gcplus/gcplus.c 2004-03-09 21:52:57.000000000 -0500 @@ -0,0 +1,73 @@ +/* + * (C) Copyright 2002 + * Sysgo Real-Time Solutions, GmbH <www.elinos.com> + * Marius Groeger <mgroeger(a)sysgo.de> + * + * 2003-2004 (c) MontaVista Software, Inc. + * + * 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 <SA-1100.h> +/* ------------------------------------------------------------------------- */ + +/* + * Miscelaneous platform dependent initialisations + */ + +int +board_init(void) +{ + DECLARE_GLOBAL_DATA_PTR; + + gd->bd->bi_arch_number = 29; /* ADS GraphicsClientPlus Board */ + + gd->bd->bi_boot_params = 0xc000003c; /* Weird address? */ + + /* Most of the ADS GCPlus I/O is connected to Static nCS2. + * So I'm brute forcing nCS2 timiming here for worst case. + */ + MSC1 &= ~0xFFFF; + MSC1 |= 0x8649; + + /* Nothing is connected to Static nCS4 or nCS5. But I'm using + * nCS4 as a paranoia safe guard to force nCS2, nOE; nWE high + * after accessing I/O via (non-VLIO) nCS2. What can I say, I'm + * paranoid and lack decent tools to alleviate my fear. I sure + * do wish I had a logic analyzer. : ( + */ + + MSC2 = 0xfff9fff9; + + return 0; +} + +int +dram_init(void) +{ + DECLARE_GLOBAL_DATA_PTR; + + gd->bd->bi_dram[0].start = PHYS_SDRAM_1; + gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; + gd->bd->bi_dram[1].start = PHYS_SDRAM_2; + gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE; + + return (0); +} diff -x CVS -ruN u-boot.orig/board/gcplus/Makefile u-boot.new/board/gcplus/Makefile --- u-boot.orig/board/gcplus/Makefile 1969-12-31 19:00:00.000000000 -0500 +++ u-boot.new/board/gcplus/Makefile 2004-03-09 21:50:31.000000000 -0500 @@ -0,0 +1,49 @@ +# +# (C) Copyright 2000 +# Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. +# +# 2003 (c) MontaVista Software, Inc. +# +# 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 $(TOPDIR)/config.mk + +LIB = lib$(BOARD).a + +OBJS := gcplus.o flash.o +SOBJS := memsetup.o + +$(LIB): $(OBJS) $(SOBJS) + $(AR) crv $@ $(OBJS) $(SOBJS) + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak .depend + +######################################################################### + +.depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c) + $(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@ + +-include .depend + +######################################################################### diff -x CVS -ruN u-boot.orig/board/gcplus/memsetup.S u-boot.new/board/gcplus/memsetup.S --- u-boot.orig/board/gcplus/memsetup.S 1969-12-31 19:00:00.000000000 -0500 +++ u-boot.new/board/gcplus/memsetup.S 2004-03-09 23:12:53.000000000 -0500 @@ -0,0 +1,77 @@ +/* + * Memory Setup stuff - taken from blob memsetup.S + * + * Copyright (C) 1999 2000 2001 Erik Mouw (J.A.K.Mouw(a)its.tudelft.nl) and + * Jan-Derk Bakker (J.D.Bakker(a)its.tudelft.nl) + * 2003-2004 (c) MontaVista Software, Inc. + * + * 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 "config.h" +#include "version.h" + + + .globl memsetup +memsetup: + /* The ADS GC+ for Linux Boot Rom Ver. 1.73 does memory init for us. + * However the darn thing leaves the MMU enabled before handing control + * over to us. So we need to disable the MMU and we use memsetup + * to do it. + */ + +@ The following code segment was borrowed with gratitude from: +@ linux-2.4.19-rmk7/arch/arm/boot/compressed/head-sa1100.S + + @ Data cache might be active. + @ Be sure to flush kernel binary out of the cache, + @ whatever state it is, before it is turned off. + @ This is done by fetching through currently executed + @ memory to be sure we hit the same cache. + bic r2, pc, #0x1f + add r3, r2, #0x4000 @ 16 kb is quite enough... +1: ldr r0, [r2], #32 + teq r2, r3 + bne 1b + mcr p15, 0, r0, c7, c10, 4 @ drain WB + mcr p15, 0, r0, c7, c7, 0 @ flush I & D caches + + @ disabling MMU and caches + mrc p15, 0, r0, c1, c0, 0 @ read control reg + bic r0, r0, #0x0d @ clear WB, DC, MMU + bic r0, r0, #0x1000 @ clear Icache + mcr p15, 0, r0, c1, c0, 0 + + nop + nop + nop + nop + nop + + b 2f +2: + nop + nop + nop + nop + nop + + + mov pc, lr diff -x CVS -ruN u-boot.orig/board/gcplus/u-boot.lds u-boot.new/board/gcplus/u-boot.lds --- u-boot.orig/board/gcplus/u-boot.lds 1969-12-31 19:00:00.000000000 -0500 +++ u-boot.new/board/gcplus/u-boot.lds 2004-03-06 16:03:44.000000000 -0500 @@ -0,0 +1,57 @@ +/* + * (C) Copyright 2000 + * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. + * 2003 (c) MontaVista Software, Inc. + * + * 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 + */ + +OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") +OUTPUT_ARCH(arm) +ENTRY(_start) +SECTIONS +{ + . = 0x00000000; + + . = ALIGN(4); + .text : + { + cpu/sa1100/start.o (.text) + *(.text) + } + + . = ALIGN(4); + .rodata : { *(.rodata) } + + . = ALIGN(4); + .data : { *(.data) } + + . = ALIGN(4); + .got : { *(.got) } + + + __u_boot_cmd_start = .; + .u_boot_cmd : { *(.u_boot_cmd) } + __u_boot_cmd_end = .; + + . = ALIGN(4); + __bss_start = .; + .bss : { *(.bss) } + _end = .; +} diff -x CVS -ruN u-boot.orig/include/configs/gcplus.h u-boot.new/include/configs/gcplus.h --- u-boot.orig/include/configs/gcplus.h 1969-12-31 19:00:00.000000000 -0500 +++ u-boot.new/include/configs/gcplus.h 2004-03-11 09:41:31.000000000 -0500 @@ -0,0 +1,174 @@ +/* + * (C) Copyright 2002 + * Sysgo Real-Time Solutions, GmbH <www.elinos.com> + * Marius Groeger <mgroeger(a)sysgo.de> + * + * 2003-2004 (c) MontaVista Software, Inc. + * + * Configuation settings for the ADS GraphicsClient+ board. + * + * 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 + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#undef DEBUG + +/* + * The ADS GCPlus Linux boot ROM loads U-Boot into RAM at 0xc0200000. + * We don't actually init RAM in this case since we're using U-Boot as + * an secondary boot loader during Linux kernel development and testing, + * e.g. bootp/tftp download of the kernel is a far more convenient + * when testing new kernels on this target. However the ADS GCPlus Linux + * boot ROM leaves the MMU enabled when it passes control to U-Boot. So + * we use memsetup (CONFIG_INIT_CRITICAL) to remedy that problem. + */ +#define CONFIG_INIT_CRITICAL + +/* + * High Level Configuration Options + * (easy to change) + */ +#define CONFIG_SA1110 1 /* This is an SA1100 CPU */ +#define CONFIG_GCPLUS 1 /* on an ADS GCPlus Board */ + +#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ + +#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ +#define CONFIG_SETUP_MEMORY_TAGS 1 +#define CONFIG_INITRD_TAG 1 + +/* + * Size of malloc() pool + */ +#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_GBL_DATA_SIZE 128 /* size rsrvd for initial data */ + + +/* + * Hardware drivers + */ +#define CONFIG_DRIVER_LAN91C96 /* we have an SMC9194 on-board */ +#define CONFIG_LAN91C96_BASE 0x100e0000 + +/* + * select serial console configuration + */ +#define CONFIG_SERIAL3 1 /* we use SERIAL 3 on ADS GCPlus */ + +/* allow to overwrite serial and ethaddr */ +#define CONFIG_ENV_OVERWRITE + +#define CONFIG_BAUDRATE 38400 + +#define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_DHCP) +#define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT + +/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ +#include <cmd_confdefs.h> + +#define CONFIG_BOOTDELAY 3 +#define CONFIG_BOOTARGS "console=ttySA0,38400n8 mtdparts=sa1100-flash:1m@0(zImage),3m@1m(ramdisk.gz),12m@4m(userfs) root=/dev/nfs ip=bootp" +#define CONFIG_BOOTCOMMAND "bootp;tftp;bootm" +#define CFG_AUTOLOAD "n" /* No autoload */ + +#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#define CONFIG_KGDB_BAUDRATE 38400 /* speed to run kgdb serial port */ +#define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ +#endif + +/* + * Miscellaneous configurable options + */ +#define CFG_LONGHELP /* undef to save memory */ +#define CFG_PROMPT "ADS GCPlus # " /* Monitor Command Prompt */ +#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ +#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */ +#define CFG_MAXARGS 16 /* max number of command args */ +#define CFG_BARGSIZE CFG_CBSIZE /* Boot Argument Buffer Size */ + +#define CFG_MEMTEST_START 0xc0400000 /* memtest works on */ +#define CFG_MEMTEST_END 0xc0800000 /* 4 ... 8 MB in DRAM */ + +#undef CFG_CLKS_IN_HZ /* everything, incl board info, in Hz */ + +#define CFG_LOAD_ADDR 0xc0000000 /* default load address */ + +#define CFG_HZ 3686400 /* incrementer freq: 3.6864 MHz */ +#define CFG_CPUSPEED 0x0a /* set core clock to 206MHz */ + + /* valid baudrates */ +#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } + +/*----------------------------------------------------------------------- + * Stack sizes + * + * The stack sizes are set up in start.S using the settings below + */ +#define CONFIG_STACKSIZE (128*1024) /* regular stack */ +#ifdef CONFIG_USE_IRQ +#define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ +#define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ +#endif + +/*----------------------------------------------------------------------- + * Physical Memory Map + */ +#define CONFIG_NR_DRAM_BANKS 2 /* we have 2 banks of DRAM */ +#define PHYS_SDRAM_1 0xc0000000 /* SDRAM Bank #1 */ +#define PHYS_SDRAM_1_SIZE 0x01000000 /* 16 MB */ +#define PHYS_SDRAM_2 0xc8000000 /* SDRAM Bank #2 */ +#define PHYS_SDRAM_2_SIZE 0x01000000 /* 16 MB */ + + +#define PHYS_FLASH_1 0x08000000 /* Flash Bank #1 */ +#define PHYS_FLASH_SIZE 0x00800000 /* 8 MB */ +#define PHYS_FLASH_BANK_SIZE 0x01000000 /* 16 MB Banks */ +#define PHYS_FLASH_SECT_SIZE 0x00040000 /* 256 KB sectors (x2) */ + +#define CFG_FLASH_BASE PHYS_FLASH_1 + +/*----------------------------------------------------------------------- + * FLASH and environment organization + */ +#if 1 +#define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */ +#define CFG_MAX_FLASH_SECT 128 /* max number of sectors on one chip */ + +/* timeout values are in ticks */ +#define CFG_FLASH_ERASE_TOUT (2*CFG_HZ) /* Timeout for Flash Erase */ +#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */ +#else +/* REVISIT: This doesn't work on ADS GCPlus just yet: +#define CFG_FLASH_CFI 1 /* flash is CFI conformant */ +#define CFG_FLASH_CFI_DRIVER 1 /* use common cfi driver */ +#define CFG_FLASH_USE_BUFFER_WRITE 1 /* use buffered writes (20x faster) */ +#define CFG_MAX_FLASH_BANKS 1 /* max # of memory banks */ +#define CFG_FLASH_INCREMENT 0 /* there is only one bank */ +#define CFG_MAX_FLASH_SECT 128 /* max # of sectors on one chip */ +//#define CFG_FLASH_PROTECTION 1 /* hardware flash protection */ +#define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE } +#endif + +#define CFG_ENV_IS_IN_FLASH 1 +#define CFG_ENV_ADDR (PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE) /* Addr of Environment Sector */ +#define CFG_ENV_SIZE PHYS_FLASH_SECT_SIZE + +#endif /* __CONFIG_H */ diff -x CVS -ruN u-boot.orig/Makefile u-boot.new/Makefile --- u-boot.orig/Makefile 2004-03-11 14:00:20.000000000 -0500 +++ u-boot.new/Makefile 2004-03-09 23:16:52.000000000 -0500 @@ -912,6 +912,9 @@ shannon_config : unconfig @./mkconfig $(@:_config=) arm sa1100 shannon +gcplus_config : unconfig + @./mkconfig $(@:_config=) arm sa1100 gcplus + ######################################################################### ## ARM92xT Systems #########################################################################

2 1

[U-Boot-Users] PATCH: IBM440Ref Platform (Ocotea) interrupt
by Travis Sawyer 14 Mar '04

14 Mar '04

PATCH: This patch brings the ocotea port up to date with the recent patch for 440GX native interrupt mode. CHANGELOG * Travis Sawyer 11Mar2004 Fix ocotea board early init interrupt setup. Patch is attached. Travis

6 12

[U-Boot-Users] [PATCH] new Nios target support: SSV ADNP/ESC1
by Stephan Linz 14 Mar '04

14 Mar '04

- Add support for the SSV ADNP/ESC1 (Nios Softcore) Best regards, Stephan

2 1

[U-Boot-Users] [PATCH] net/bootp.c more conform to CFG_CMD_NFS
by Stephan Linz 14 Mar '04

14 Mar '04

- avoid unresolved symbol of NfsStart() in net/bootp.c for each target without NFS download support Best regards, Stephan

2 1

[U-Boot-Users] [PATCH] avoid trigraph warnings for Nios gcc run
by Stephan Linz 14 Mar '04

14 Mar '04

- expand config.mk to avoid trigraph warnings (only for nios-elf-gcc version 2.95) Best regards, Stephan

2 1