November 2003 - U-Boot

[U-Boot-Users] [PATCH] mismatched #ifdef/#endif
by Anders Larsen 07 Dec '03

07 Dec '03

Hi, the header include/asm-arm/arch-pxa/hardware.h contains mismatched #ifdef/#endif (more precisely, one #endif too many in line 88, which is "compensated for" farther below in line 99). The attached patch fixes this. CHANGELOG: Fix a mismatched #ifdef / #endif sequence Cheers Anders

2 1

[U-Boot-Users] [PATCH] (MIPS) Support for all dbau1x00 boards
by Thomas Lange 07 Dec '03

07 Dec '03

Use different configurations for the boards from AMD ( dbau1000, dbau1100 and dbau1500 ). Only tested for dbau1000, but compiles for all three. Users with dbau1100 and dbau1500 should check that the cpu is compatible with au1000. * Patch by Thomas Lange 14 Oct 2003 Split dbau1x00 into dbau1000, dbau1100 and dbau1500 configs /Thomas

3 2

[U-Boot-Users] [PATCH] (MIPS) Au1x00 phymem workaround
by Thomas Lange 07 Dec '03

07 Dec '03

Au1x00 uses a 36 bit bus internally and cannot access physical memory directly. Use the uncached sdram address instead of the physical one. * Patch by Thomas Lange 14 Nov 2003 Workaround for mips au1x00 physical memory accesses /Thomas

2 1

[U-Boot-Users] [PATCH][CFT] bring ARM memory layout in line with the documented behaviour
by Anders Larsen 07 Dec '03

07 Dec '03

Hi, here's a fairly lengthy patch against 0.4.8 that brings the memory layout of all supported ARM CPUs in line with the documentation. This has the positive side-effect of allowing U-Boot to actually run on PXA CPUs (the stock PXA implementation didn't set the start-address of the malloc pool at all!) The memory layout now more or less conforms to the standard as defined in the README (the absolute addresses are board-specific, of course). Since the stack and malloc-heap are now located below the U-Boot code, the TEXT_BASE of the supported ARM boards can be increased accordingly (for most (but not all) boards, the patch already does this). Memory layout example based on my PXA255 (TEXT_BASE = 0xA07E0000): 0xA079FF74 Monitor Stack (growing downwards) 0xA079FF80 Board Info Data and permanent copy of Global Data 0xA07A0000 Malloc Arena 0xA07E0000 RAM copy of Monitor Code ... optional: Frame Buffer 0xA07FFFFF [End of RAM] Since I only have access to PXA-based HW, I was only able to verify that U-Boot still *builds* for all supported ARMs; I have to rely on your help to see if it also *runs* correctly. CHANGELOG: Bring ARM memory layout in line with the documentation. Wolfgang: Please don't apply this patch until we have some feedback from the ARM maintainers. Robert: When/if this patch is eventually applied, you can probably push most of your PXA -ptx stuff without having it break things. Cheers Anders

5 16

[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