December 2003 - U-Boot

[U-Boot-Users] Patch: MPC826xADS/PQ2FADS small fixes and clean-up
by Yuli Barcohen 07 Dec '03

07 Dec '03

This patch fixes the MPC826xADS/PQ2FADS port to run cleanly on MPC8266ADS. Also some defaults are changed to match Motorola shipping configuration. -- ======================================================================== Yuli Barcohen | Phone +972-9-765-1788 | Software Project Leader yuli(a)arabellasw.com | Fax +972-9-765-7494 | Arabella Software, Israel ======================================================================== Index: board/mpc8260ads/config.mk =================================================================== RCS file: /home/CVS/u-boot/u-boot/board/mpc8260ads/config.mk,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -p -u -r1.1.1.1 -r1.2 --- board/mpc8260ads/config.mk 10 Oct 2001 09:28:28 -0000 1.1.1.1 +++ board/mpc8260ads/config.mk 13 Nov 2003 17:15:22 -0000 1.2 @@ -4,6 +4,8 @@ # # Modified by, Stuart Hughes, Lineo Inc, stuarth(a)lineo.com # +# Modified by, Yuli Barcohen, Arabella Software Ltd., yuli(a)arabellasw.com +# # See file CREDITS for list of people who contributed to this # project. # @@ -24,9 +26,7 @@ # # -# mpc8260ads board +# MPC8260ADS, MPC8266ADS, and PQ2FADS-ZU/VR boards # TEXT_BASE = 0xfff00000 - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board Index: board/mpc8260ads/mpc8260ads.c =================================================================== RCS file: /home/CVS/u-boot/u-boot/board/mpc8260ads/mpc8260ads.c,v retrieving revision 1.1.1.6 retrieving revision 1.10 diff -p -u -r1.1.1.6 -r1.10 --- board/mpc8260ads/mpc8260ads.c 15 Sep 2003 20:30:40 -0000 1.1.1.6 +++ board/mpc8260ads/mpc8260ads.c 13 Nov 2003 17:15:22 -0000 1.10 @@ -231,6 +231,20 @@ int board_pre_init (void) bcsr[1] = ~FETHIEN1 & ~RS232EN_1; +#if CONFIG_ADSTYPE != CFG_8260ADS /* PCI mode can be selected */ +#if CONFIG_ADSTYPE == CFG_PQ2FADS + if ((bcsr[3] & BCSR_PCI_MODE) == 0) /* PCI mode selected by JP9 */ +#endif /* CONFIG_ADSTYPE == CFG_PQ2FADS */ + { + volatile immap_t *immap = (immap_t *) CFG_IMMR; + + immap->im_clkrst.car_sccr |= M826X_SCCR_PCI_MODE_EN; + immap->im_siu_conf.sc_siumcr = + (immap->im_siu_conf.sc_siumcr & ~SIUMCR_LBPC11) + | SIUMCR_LBPC01; + } +#endif /* CONFIG_ADSTYPE != CFG_8260ADS */ + return 0; } @@ -239,32 +253,25 @@ int board_pre_init (void) long int initdram (int board_type) { #if CONFIG_ADSTYPE == CFG_PQ2FADS - vu_long *bcsr = (vu_long *)CFG_BCSR; + long int msize = 32; +#else + long int msize = 16; #endif + +#ifndef CFG_RAMBOOT volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8260_t *memctl = &immap->im_memctl; volatile uchar *ramaddr, c = 0xff; - long int msize; uint or; uint psdmr; uint psrt; int i; -#ifndef CFG_RAMBOOT immap->im_siu_conf.sc_ppc_acr = 0x00000002; immap->im_siu_conf.sc_ppc_alrh = 0x01267893; immap->im_siu_conf.sc_tescr1 = 0x00004000; -#if CONFIG_ADSTYPE == CFG_PQ2FADS - if ((bcsr[3] & BCSR_PCI_MODE) == 0) { /* PCI mode selected by JP9 */ - immap->im_clkrst.car_sccr |= M826X_SCCR_PCI_MODE_EN; - immap->im_siu_conf.sc_siumcr = - (immap->im_siu_conf.sc_siumcr & ~SIUMCR_LBPC11) - | SIUMCR_LBPC01; - } -#endif /* CONFIG_ADSTYPE == CFG_PQ2FADS */ - memctl->memc_mptpr = CFG_MPTPR; #ifdef CFG_LSDRAM_BASE /* @@ -431,13 +438,7 @@ long int initdram (int board_type) #endif /* SPD_DEBUG */ } #else /* !CONFIG_SPD_EEPROM */ -#if CONFIG_ADSTYPE == CFG_PQ2FADS - msize = 32; - or = 0xFE002EC0; -#else - msize = 16; - or = 0xFF000CA0; -#endif /* CONFIG_ADSTYPE == CFG_PQ2FADS */ + or = CFG_OR2; psdmr = CFG_PSDMR; psrt = CFG_PSRT; #endif /* CONFIG_SPD_EEPROM */ @@ -455,7 +456,7 @@ long int initdram (int board_type) *ramaddr = c; memctl->memc_psdmr = psdmr | 0x40000000; /* Refresh enable */ *ramaddr = c; -#endif +#endif /* CFG_RAMBOOT */ /* return total 60x bus SDRAM size */ return (msize * 1024 * 1024); Index: board/mpc8260ads/u-boot.lds =================================================================== RCS file: /home/CVS/u-boot/u-boot/board/mpc8260ads/u-boot.lds,v retrieving revision 1.1.1.3 retrieving revision 1.2 diff -p -u -r1.1.1.3 -r1.2 --- board/mpc8260ads/u-boot.lds 16 Jul 2003 11:23:42 -0000 1.1.1.3 +++ board/mpc8260ads/u-boot.lds 13 Nov 2003 17:15:22 -0000 1.2 @@ -2,6 +2,8 @@ * (C) Copyright 2001 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. * + * Modified by Yuli Barcohen <yuli(a)arabellasw.com> + * * See file CREDITS for list of people who contributed to this * project. * @@ -22,9 +24,6 @@ */ OUTPUT_ARCH(powerpc) -SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/usr/local/powerpc-any-elf/lib); -/* Do we need any of these for elf? - __DYNAMIC = 0; */ SECTIONS { /* Read-only sections, merged into text segment: */ @@ -120,3 +119,4 @@ SECTIONS _end = . ; PROVIDE (end = .); } +ENTRY(_start) Index: include/configs/MPC8260ADS.h =================================================================== RCS file: /home/CVS/u-boot/u-boot/include/configs/MPC8260ADS.h,v retrieving revision 1.1.1.6 retrieving revision 1.14 diff -p -u -r1.1.1.6 -r1.14 --- include/configs/MPC8260ADS.h 15 Sep 2003 20:30:43 -0000 1.1.1.6 +++ include/configs/MPC8260ADS.h 13 Nov 2003 17:15:22 -0000 1.14 @@ -10,7 +10,7 @@ * (C) Copyright 2003 Arabella Software Ltd. * Yuli Barcohen <yuli(a)arabellasw.com> * Added support for SDRAM DIMMs SPD EEPROM, MII, JFFS2. - * Ported to PQ2FADS-ZU board. + * Ported to PQ2FADS-ZU and PQ2FADS-VR boards. * * See file CREDITS for list of people who contributed to this * project. @@ -45,7 +45,7 @@ /* ADS flavours */ #define CFG_8260ADS 1 /* MPC8260ADS */ #define CFG_8266ADS 2 /* MPC8266ADS */ -#define CFG_PQ2FADS 3 /* PQ2FADS-ZU */ +#define CFG_PQ2FADS 3 /* PQ2FADS-ZU or PQ2FADS-VR */ #ifndef CONFIG_ADSTYPE #define CONFIG_ADSTYPE CFG_8260ADS @@ -130,7 +130,7 @@ #undef CONFIG_SPD_EEPROM /* On PQ2FADS-ZU, SDRAM is soldered */ #else #define CONFIG_HARD_I2C 1 /* To enable I2C support */ -#define CFG_I2C_SPEED 400000 /* I2C speed and slave address */ +#define CFG_I2C_SPEED 100000 /* I2C speed and slave address */ #define CFG_I2C_SLAVE 0x7F #if defined(CONFIG_SPD_EEPROM) && !defined(CONFIG_SPD_ADDR) @@ -139,14 +139,14 @@ #endif /* CONFIG_ADSTYPE == CFG_PQ2FADS */ #ifndef CONFIG_SDRAM_PBI -#define CONFIG_SDRAM_PBI 1 /* By default, use page-based interleaving */ +#define CONFIG_SDRAM_PBI 0 /* By default, use bank-based interleaving */ #endif #ifndef CONFIG_8260_CLKIN #if CONFIG_ADSTYPE == CFG_PQ2FADS #define CONFIG_8260_CLKIN 100000000 /* in Hz */ #else -#define CONFIG_8260_CLKIN 66666666 /* in Hz */ +#define CONFIG_8260_CLKIN 66000000 /* in Hz */ #endif #endif @@ -188,7 +188,6 @@ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> - #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ #define CONFIG_BOOTCOMMAND "bootm 100000" /* autoboot command */ #define CONFIG_BOOTARGS "root=/dev/ram rw" @@ -201,7 +200,8 @@ #define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port at */ #endif -#undef CONFIG_WATCHDOG /* disable platform specific watchdog */ +#define CONFIG_BZIP2 /* include support for bzip2 compressed images */ +#undef CONFIG_WATCHDOG /* disable platform specific watchdog */ /* * Miscellaneous configurable options @@ -291,9 +291,14 @@ #endif #define CFG_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ -#define CFG_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc() */ #define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ +#ifdef CONFIG_BZIP2 +#define CFG_MALLOC_LEN (4096 << 10) /* Reserve 4 MB for malloc() */ +#else +#define CFG_MALLOC_LEN (128 << 10) /* Reserve 128 KB for malloc() */ +#endif /* CONFIG_BZIP2 */ + #ifndef CFG_RAMBOOT # define CFG_ENV_IS_IN_FLASH 1 # define CFG_ENV_SECT_SIZE 0x40000 @@ -335,12 +340,14 @@ #endif /* CONFIG_ADSTYPE == CFG_8266ADS */ #if CONFIG_ADSTYPE == CFG_PQ2FADS +#define CFG_OR2 0xFE002EC0 #define CFG_PSDMR 0x824B36A3 #define CFG_PSRT 0x13 #define CFG_LSDMR 0x828737A3 #define CFG_LSRT 0x13 #define CFG_MPTPR 0x2800 #else +#define CFG_OR2 0xFF000CA0 #define CFG_PSDMR 0x016EB452 #define CFG_PSRT 0x21 #define CFG_LSDMR 0x0086A522

2 1

[U-Boot-Users] [PATCH] declare portio-commands nonstd.
by Anders Larsen 07 Dec '03

07 Dec '03

Hi, my patch from 23. september neglected to mark the PORTIO commands non-standard in the README. The attached trivial patch fixes this. Cheers Anders

2 1

[U-Boot-Users] [PATCH] DataFlash for AT91RM9200DK board
by Nicolas Lacressonnière 07 Dec '03

07 Dec '03

Hi, Please find attached a patch applied against the 1.0.0 release. It implements some changes for Atmel AT91RM9200DK development kit. It adds: - the possibility to set the environment variables in DataFlash - Atmel DataFlash AT45DB1282 support Tell me if there is something wrong Nicolas. ----------------------------------------------------------------- LACRESSONNIERE Nicolas ARM-Based Products Application Group ATMEL Rousset Zone Industrielle 13106 Rousset Cedex FRANCE Tél: +33 (0)4 42 53 72 54 Fax: +33 (0)4 42 53 60 01 -----------------------------------------------------------------

2 1

[U-Boot-Users] patch for 8270 Rev 0.1 support
by Jeff Carr 07 Dec '03

07 Dec '03

This patch adds the needed define for the new version of 8270 processors. -Jeff

3 5

[U-Boot-Users] [PATCH] only setup arm linux initrd tag when initrd is present
by George G. Davis 07 Dec '03

07 Dec '03

Greetings, The attached is a small tweak to only pass the arm linux initrd tag to the kernel when an initrd is actually present. -- Regards, George Index: u-boot/lib_arm/armlinux.c =================================================================== RCS file: /cvsroot/u-boot/u-boot/lib_arm/armlinux.c,v retrieving revision 1.6 diff -u -r1.6 armlinux.c --- u-boot/lib_arm/armlinux.c 26 Jul 2003 08:08:21 -0000 1.6 +++ u-boot/lib_arm/armlinux.c 5 Nov 2003 18:37:46 -0000 @@ -189,14 +189,12 @@ */ SHOW_BOOT_PROGRESS (14); - data = 0; + len = data = 0; } -#ifdef DEBUG if (!data) { - printf ("No initrd\n"); + debug ("No initrd\n"); } -#endif if (data) { initrd_start = data; @@ -208,10 +206,8 @@ SHOW_BOOT_PROGRESS (15); -#ifdef DEBUG - printf ("## Transferring control to Linux (at address %08lx) ...\n", - (ulong)theKernel); -#endif + debug ("## Transferring control to Linux (at address %08lx) ...\n", + (ulong)theKernel); #if defined (CONFIG_SETUP_MEMORY_TAGS) || \ defined (CONFIG_CMDLINE_TAG) || \ @@ -225,7 +221,8 @@ setup_commandline_tag(bd, commandline); #endif #ifdef CONFIG_INITRD_TAG - setup_initrd_tag(bd, initrd_start, initrd_end); + if (initrd_start && initrd_end) + setup_initrd_tag(bd, initrd_start, initrd_end); #endif #if 0 setup_ramdisk_tag(bd);

2 1

[U-Boot-Users] [PATCH] tweak omap1510inn_config defaults
by George G. Davis 07 Dec '03

07 Dec '03

Greetings, The attached changes the omap1510inn build defaults to generic values and removes the hard coded IP values in the default build - that's what bootp is for. : ) -- Regards, George Index: u-boot/include/configs/omap1510inn.h =================================================================== RCS file: /cvsroot/u-boot/u-boot/include/configs/omap1510inn.h,v retrieving revision 1.1 diff -u -r1.1 omap1510inn.h --- u-boot/include/configs/omap1510inn.h 15 Jul 2003 20:04:06 -0000 1.1 +++ u-boot/include/configs/omap1510inn.h 5 Nov 2003 18:27:41 -0000 @@ -44,6 +44,7 @@ #define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS 1 +#define CONFIG_INITRD_TAG 1 /* * Size of malloc() pool @@ -92,12 +93,9 @@ #include <configs/omap1510.h> #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_ETHADDR 00:0B:36:00:05:25 */ -#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 "/tftpboot/uImage" /* file to load */ +#define CONFIG_BOOTARGS "console=ttyS0,115200n8 noinitrd 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 115200 /* speed to run kgdb serial port */

2 1

[U-Boot-Users] [PATCH-2/2] CFG_HZ at NIOS Cyclone
by Stephan Linz 07 Dec '03

07 Dec '03

Hi all, happy patching again ... In attatchment you will find a CFG_HZ configuration patch for NIOS Cyclone board. It's very important to ensure a proper higher lever operation (especially time-out controls). Wolfgang, could you put it into the CVS repository? FYIO: I'm working on a new board configuration for NIOS Strartix based on Cyclone. Patch will be coming soon. Best Regards, -- Mit freundlichen Gruessen Stephan Linz ====================================================================== Stephan Linz Softwareentwicklung MAZeT GmbH Email: mailto:linz@mazet.de Göschwitzer Str. 32 Tel. : (3641) 2809-55 D-07745 Jena Fax : (3641) 2809-12 Besuchen Sie bitte unsere Web-Seiten: http://www.MAZeT.de ======================================================================

2 1

[U-Boot-Users] [PATCH-1/2] LAN91C111
by Stephan Linz 07 Dec '03

07 Dec '03

Hi all, in context of one of my emails last week: http://sourceforge.net/mailarchive/forum.php?thread_id=3364771&forum_id=128… I'm wondering about how many people are using the LAN91C111 driver without significant problems. There is (just was :-) a fat signed/unsigned bug in drivers/smc91111.c which is significant at NIOS plattforms when you are using MAC addresses with address elements above 0x7f. Example: 00:07:ed:0a:a4:7b goes over to 00:07:ed:ff:a4:ff inside the chip. Simple solution: static char smc_mac_addr[] = { . . . }; have to be: static char unsigned smc_mac_addr[6] = { . . . }; In attatchment you will find my smc91111_fix patch. It includes some other minor fixes I've made. This patch has been working successful at NIOS Stratix and Cyclone boards. Please try out and patch CVS tree. Best Regards, -- Mit freundlichen Gruessen Stephan Linz ====================================================================== Stephan Linz Softwareentwicklung MAZeT GmbH Email: mailto:linz@mazet.de Göschwitzer Str. 32 Tel. : (3641) 2809-55 D-07745 Jena Fax : (3641) 2809-12 Besuchen Sie bitte unsere Web-Seiten: http://www.MAZeT.de ======================================================================

2 1

[U-Boot-Users] Fix for MII utils
by Steven Scholz 06 Dec '03

06 Dec '03

Hi there, the attached patch addresses two MII related issues: a) mii info <addr> ignored <addr> and always showed info for 32 PHYs b) The "Trick" mentioned in miiphy_info(): " * Trick: we are reading two 16 registers into a 32 bit variable * so we do a 16 read into the high order bits of the variable (big * endian, you know), shift it down 16 bits, and the read the rest." does obviously not work on little endian machines. * Patch by Steven Scholz, 20 Oct 2003 - "mii info <addr>" now only shows the info for PHY "addr" as the help message already suggests - Endian fix for miiphy_info() Thanks, Steven

2 5

[U-Boot-Users] Don't know where to __start in booting Linux 2.4.18 on MPC8260ADS board using u-boot 1.0.0
by Stan Partridge 05 Dec '03

05 Dec '03

To begin with, I think u-boot is great stuff. I have found u-boot to be well orgainized and easy to understand. I have resolved most of my specific board issues easily. However, I am having trouble booting linux 2.4.18 using u-boot 1.0.0 on my custom MPC8260ADS board. My target immediately halts at the entry point in linux. I have tried several entry point offsets. Of course, the first entry point I tried was load address of 0 and entry point of 0 like in the DULG documentation. My ICE immediately reports "Target stopped unknown reason; PC = 00000000". In fact, no matter where I set the TEXT_BASE, load address, and entry point I have the same problem. In my session below, I set the TEXT_BASE, KERNELLOAD, and PAGE_OFFSET address to 00100000. I am setting the makefile environment variable KERNELLOAD found in ./arch/ppc/Makefile as well as changing in the define directive PAGE_OFFSET found in ./include/asm-ppc/page.h to the same value of 00100000. I have tried the following 'start' symbol locations to no avail: 00100000 T _start 0010000c T __start 001036c0 t start_here Below is my u-boot session with some debugging statements turned on in the command cmd_bootm(). Thanks in advance for any tips or debugging suggestions. -Stan Partridge U-Boot 1.0.0 (Dec 5 2003 - 15:16:10) MPC8260 Reset Status: External Soft, External Hard MPC8260 Clock Configuration - Bus-to-Core Mult 2x, VCO Div 2, 60x Bus Freq 50-150, Core Freq 100-300 - dfbrg 1, corecnf 0x04, busdf 3, cpmdf 1, plldf 0, pllmf 1 - vco_out 266666664, scc_clk 66666666, brg_clk 16666666 - cpu_clk 133333332, cpm_clk 133333332, bus_clk 66666666 CPU: MPC8260 (HiP3 Rev 01, Mask B.3 3K23A) at 133.333 MHz Board: Motorola MPC8260ADS I2C: ready DRAM: 128 MB Now running in RAM - U-Boot at: 07fcb000 In: serial Out: serial Err: serial DOC: DiskOnChip Millennium @ 0xFC000000, 32 MB Net: FCC3 ETHERNET Hit any key to stop autoboot: 0 => tftpboot 300000 vmlinux.img TFTP from server 192.168.106.58; our IP address is 192.168.116.66; sending throu gh gateway 192.168.116.1 Filename 'vmlinux.img'. Load address: 0x300000 Loading: ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ############################# done Bytes transferred = 2143139 (20b3a3 hex) => imi 300000 ## Checking Image at 00300000 ... Image Name: 2.4.18 - Linux Kernel Image Type: PowerPC Linux Kernel Image (uncompressed) Data Size: 2143075 Bytes = 2 MB Load Address: 00100000 Entry Point: 0010000C Verifying Checksum ... OK => bootm 300000 ## Booting image at 00300000 ... Image Name: 2.4.18 - Linux Kernel Image Type: PowerPC Linux Kernel Image (uncompressed) Data Size: 2143075 Bytes = 2 MB Load Address: 00100000 Entry Point: 0010000C Verifying Checksum ... OK OK ## Current stack ends at 0x07FAA820 => set upper limit to 0x00800000 ## cmdline at 0x007FFF00 ... 0x007FFF88 ## Transferring control to Linux (at address 0010000C) ... args (kbd, initrd_start, initrd_end, cmd_start, cmd_end)=(007ffeb0, 00000000, 00 000000, 007fff00, 007fff88)

2 1