October 2006 - U-Boot

[U-Boot-Users] [PATCH] Fixed examples/Makefile to work with gmake 3.81
by John Rigby 04 Oct '06

04 Oct '06

Building u-boot with GNU make version 3.81 or greater gets an error when making the examples directory. GNU make version 3.81 and later seam to be sensitive to order of prereqs. Not sure if this is a bug or a feature but this patch fixes the problem. Now create the BIN target and a new DOTBIN target from the SREC target. Put BIN before SREC and DOTBIN in the list of dependencies for the all target. CHANGELOG: * Fix examples/Makefile to work with GNU Make version 3.81 Signed-off-by: John Rigby <jrigby(a)freescale.com)> --- examples/Makefile | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/examples/Makefile b/examples/Makefile index d7cd843..59b2237 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -1,4 +1,3 @@ -# # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. # @@ -60,50 +59,41 @@ endif include $(TOPDIR)/config.mk SREC = hello_world.srec -BIN = hello_world.bin hello_world ifeq ($(CPU),mpc8xx) SREC = test_burst.srec -BIN = test_burst.bin test_burst endif ifeq ($(ARCH),i386) SREC += 82559_eeprom.srec -BIN += 82559_eeprom.bin 82559_eeprom endif ifeq ($(ARCH),ppc) SREC += sched.srec -BIN += sched.bin sched endif ifeq ($(ARCH),blackfin) SREC += smc91111_eeprom.srec -BIN += smc91111_eeprom.bin smc91111_eeprom endif # The following example is pretty 8xx specific... ifeq ($(CPU),mpc8xx) SREC += timer.srec -BIN += timer.bin timer endif # The following example is 8260 specific... ifeq ($(CPU),mpc8260) SREC += mem_to_mem_idma2intr.srec -BIN += mem_to_mem_idma2intr.bin mem_to_mem_idma2intr endif # Demo for 52xx IRQs ifeq ($(CPU),mpc5xxx) SREC += interrupt.srec -BIN += interrupt.bin interrupt endif # Utility for resetting i82559 EEPROM ifeq ($(BOARD),oxc) SREC += eepro100_eeprom.srec -BIN += eepro100_eeprom.bin eepro100_eeprom endif ifeq ($(BIG_ENDIAN),y) @@ -111,6 +101,8 @@ EX_LDFLAGS += -EB endif COBJS := $(SREC:.srec=.o) +BIN := $(SREC:.srec=) +DOTBIN := $(SREC:.srec=.bin) LIB = $(obj)libstubs.a LIBAOBJS= @@ -128,13 +120,14 @@ SRCS := $(COBJS:.o=.c) $(LIBCOBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) BIN := $(addprefix $(obj),$(BIN)) SREC := $(addprefix $(obj),$(SREC)) +DOTBIN := $(addprefix $(obj),$(DOTBIN)) gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`) clibdir := $(shell dirname `$(CC) $(CFLAGS) -print-file-name=libc.a`) CPPFLAGS += -I.. -all: $(obj).depend $(OBJS) $(LIB) $(SREC) $(BIN) +all: $(obj).depend $(OBJS) $(LIB) $(BIN) $(SREC) $(DOTBIN) ######################################################################### $(LIB): $(obj).depend $(LIBOBJS) -

1 0

[U-Boot-Users] [PATCH] Fix PCI, USB, bootargs for MPC8349E-mITX
by timur＠freescale.com 04 Oct '06

04 Oct '06

From: Timur Tabi <timur(a)freescale.com> PREREQUISITE PATCHES: * This patch can only be applied after the following patches have been applied: 1) DNX#2006092142000015 "Add support for the MPC8349E-mITX 1/2" 2) DNX#2006092142000024 "Add support for the MPC8349E-mITX 2/2" CHANGELOG: * For the 8349E-mITX, fix some size values in pci_init_board(), enable the clock for the 2nd USB board (Linux kernel will hang otherwise), and fix the CONFIG_BOOTARGS macro. Signed-off-by: Timur Tabi <timur(a)freescale.com> --- board/mpc8349itx/pci.c | 14 +++++++------- include/configs/MPC8349ITX.h | 19 +++++++++++-------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/board/mpc8349itx/pci.c b/board/mpc8349itx/pci.c index 22ab736..c90ccc0 100644 --- a/board/mpc8349itx/pci.c +++ b/board/mpc8349itx/pci.c @@ -153,7 +153,7 @@ #endif pci_law[0].ar = LAWAR_EN | LAWAR_SIZE_1G; pci_law[1].bar = CFG_PCI1_IO_PHYS & LAWBAR_BAR; - pci_law[1].ar = LAWAR_EN | LAWAR_SIZE_4M; + pci_law[1].ar = LAWAR_EN | LAWAR_SIZE_32M; /* * Configure PCI Outbound Translation Windows @@ -162,17 +162,17 @@ #endif /* PCI1 mem space - prefetch */ pci_pot[0].potar = (CFG_PCI1_MEM_BASE >> 12) & POTAR_TA_MASK; pci_pot[0].pobar = (CFG_PCI1_MEM_PHYS >> 12) & POBAR_BA_MASK; - pci_pot[0].pocmr = POCMR_EN | POCMR_PREFETCH_EN | (POCMR_CM_256M & POCMR_CM_MASK); + pci_pot[0].pocmr = POCMR_EN | POCMR_PREFETCH_EN | POCMR_CM_256M; /* PCI1 IO space */ pci_pot[1].potar = (CFG_PCI1_IO_BASE >> 12) & POTAR_TA_MASK; pci_pot[1].pobar = (CFG_PCI1_IO_PHYS >> 12) & POBAR_BA_MASK; - pci_pot[1].pocmr = POCMR_EN | POCMR_IO | (POCMR_CM_1M & POCMR_CM_MASK); + pci_pot[1].pocmr = POCMR_EN | POCMR_IO | POCMR_CM_16M; /* PCI1 mmio - non-prefetch mem space */ pci_pot[2].potar = (CFG_PCI1_MMIO_BASE >> 12) & POTAR_TA_MASK; pci_pot[2].pobar = (CFG_PCI1_MMIO_PHYS >> 12) & POBAR_BA_MASK; - pci_pot[2].pocmr = POCMR_EN | (POCMR_CM_256M & POCMR_CM_MASK); + pci_pot[2].pocmr = POCMR_EN | POCMR_CM_256M; /* * Configure PCI Inbound Translation Windows @@ -259,17 +259,17 @@ #ifdef CONFIG_MPC83XX_PCI2 /* PCI2 mem space - prefetch */ pci_pot[3].potar = (CFG_PCI2_MEM_BASE >> 12) & POTAR_TA_MASK; pci_pot[3].pobar = (CFG_PCI2_MEM_PHYS >> 12) & POBAR_BA_MASK; - pci_pot[3].pocmr = POCMR_EN | POCMR_PCI2 | POCMR_PREFETCH_EN | (POCMR_CM_256M & POCMR_CM_MASK); + pci_pot[3].pocmr = POCMR_EN | POCMR_PCI2 | POCMR_PREFETCH_EN | POCMR_CM_256M; /* PCI2 IO space */ pci_pot[4].potar = (CFG_PCI2_IO_BASE >> 12) & POTAR_TA_MASK; pci_pot[4].pobar = (CFG_PCI2_IO_PHYS >> 12) & POBAR_BA_MASK; - pci_pot[4].pocmr = POCMR_EN | POCMR_PCI2 | POCMR_IO | (POCMR_CM_1M & POCMR_CM_MASK); + pci_pot[4].pocmr = POCMR_EN | POCMR_PCI2 | POCMR_IO | POCMR_CM_16M; /* PCI2 mmio - non-prefetch mem space */ pci_pot[5].potar = (CFG_PCI2_MMIO_BASE >> 12) & POTAR_TA_MASK; pci_pot[5].pobar = (CFG_PCI2_MMIO_PHYS >> 12) & POBAR_BA_MASK; - pci_pot[5].pocmr = POCMR_EN | POCMR_PCI2 | (POCMR_CM_256M & POCMR_CM_MASK); + pci_pot[5].pocmr = POCMR_EN | POCMR_PCI2 | POCMR_CM_256M; /* * Configure PCI Inbound Translation Windows diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index aed350f..20f3c6d 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -604,7 +604,7 @@ #define CFG_ACR_RPTCNT 3 /* Arbiter rep /* System IO Config */ #define CFG_SICRH SICRH_TSOBI1 /* Needed for gigabit to work on TSEC 1 */ -#define CFG_SICRL SICRL_LDP_A +#define CFG_SICRL (SICRL_LDP_A | SICRL_USB1) #define CFG_HID0_INIT 0x000000000 @@ -701,7 +701,7 @@ #define CONFIG_IPADDR 10.82.19.159 #define CONFIG_SERVERIP 10.82.48.106 #define CONFIG_GATEWAYIP 10.82.19.254 #define CONFIG_NETMASK 255.255.252.0 - +#define CONFIG_NETDEV eth0 #define CONFIG_HOSTNAME mpc8349emitx #define CONFIG_ROOTPATH /nfsroot0/u/timur/itx-ltib/rootfs @@ -722,16 +722,19 @@ #else #define CONFIG_BOOTDELAY -1 /* -1 disables auto-boot */ #endif -#define CONFIG_BOOTARGS \ - "root=/dev/nfs rw nfsroot=$serverip:$rootpath " \ - "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \ - "console=ttyS0,$baudrate $othbootargs" - #define XMK_STR(x) #x #define MK_STR(x) XMK_STR(x) +#define CONFIG_BOOTARGS \ + "root=/dev/nfs rw" \ + " nfsroot=" MK_STR(CONFIG_SERVERIP) ":" MK_STR(CONFIG_ROOTPATH) \ + " ip=" MK_STR(CONFIG_IPADDR) ":" MK_STR(CONFIG_SERVERIP) ":" \ + MK_STR(CONFIG_GATEWAYIP) ":" MK_STR(CONFIG_NETMASK) ":" \ + MK_STR(CONFIG_HOSTNAME) ":" MK_STR(CONFIG_NETDEV) ":off" \ + " console=ttyS0," MK_STR(CONFIG_BAUDRATE) + #define CONFIG_EXTRA_ENV_SETTINGS \ - "netdev=eth0\0" \ + "netdev=" MK_STR(CONFIG_NETDEV) "\0" \ "tftpflash=tftpboot $loadaddr " MK_STR(CONFIG_UBOOTPATH) "; " \ "erase " MK_STR(CONFIG_UBOOTSTART) " " MK_STR(CONFIG_UBOOTEND) "; " \ "cp.b $loadaddr " MK_STR(CONFIG_UBOOTSTART) " $filesize; " \ -- 1.4.2.1

1 0

Re: [U-Boot-Users] Hi
by Shikoba Wicks 04 Oct '06

04 Oct '06

Hi, VALvlUM ClAvLIS AMBvlEN VlAvGRA Economize 60% http://www.phlaprlapi.info _____ guys, that this is the warmest welcome we have ever received? and find out? was there in the cage; it wasnt a holoflic. He looked at me and

1 0

Re: [U-Boot-Users] 5235EVB
by Wilson Callan 04 Oct '06

04 Oct '06

that could very well be the error i get when i build with gcc version 3.4.0 if you can, try to build with gcc version 2.95.3 20010315 (coldfire patches - 20010318 from http://fiddes.net/coldfire/) i dont think its caused by anything i did, but maybe. do other coldfire targets like 5282 compile for you? i'd like you to be using 5235 u-boot along with me, so let me know if you can get the old compiler. if not, maybe we can figure out how to get the new one working. that wouldnt be a bad idea for me anyway. wilson On Oct 4, 2006, at 8:35 AM, Pradyumna Sampath wrote: > Hi Wilson, > > I was just going through some list archives for u-boot where I chanced > upon ur email http://comments.gmane.org/gmane.comp.boot-loaders.u- > boot/20593 > . I have a MCF5235 with me and u-boot seems to be the most popular > bootloader with ethernet and tftp support. I patched the u-boot-1.1.4 > with the patch that u sent out to the mailing list and I have > encountered a peculiar error. I will be very happy if u can give me > any pointers on this. > > Here is the error : > > Leaving directory `/home/rachana/u-boot-1.1.4/post/cpu' > m68k-elf-gcc -Wa,-gstabs -D__ASSEMBLY__ -g -Os -ffixed-d7 > -msep-data -D__KERNEL__ -DTEXT_BASE=0x20000 > -I/home/rachana/u-boot-1.1.4/include -fno-builtin -ffreestanding > -nostdinc -isystem /usr/lib/gcc/i386-redhat-linux/4.1.1/include -pipe > -DCONFIG_M68K -D__M68K__ -m5307 -c -o cpu/mcf52x2/start.o > /home/rachana/u-boot-1.1.4/cpu/mcf52x2/start.S > /home/rachana/u-boot-1.1.4/cpu/mcf52x2/start.S: Assembler messages: > /home/rachana/u-boot-1.1.4/cpu/mcf52x2/start.S:349: Fatal error: Tried > to convert PC relative conditional branch to absolute jump > make: *** [cpu/mcf52x2/start.o] Error 1 > > Thanks in advance, > Regards > Prady > > -- > http://prady.in

2 2

[U-Boot-Users] tftp error
by Srinivas rao 04 Oct '06

04 Oct '06

Hi, Iam trying tftp from linux server, but Iam getting below error. Loading: * TFTP error: 'Unsupported option(s) requested' (8) Starting again Pls give me the solution. Thanks & Regards Srinivas Rao.Ch __________________________________________________________ Yahoo! India Answers: Share what you know. Learn something new http://in.answers.yahoo.com/

1 0

[U-Boot-Users] AMD Geode LX800
by Oezguerbuez, Erol 04 Oct '06

04 Oct '06

Hello, I've heard from the U-boot just a few days before, so I don't know much about this bootloader. My problem is, if and how it is possible to run the U-boot on a X86 based system (AMD Geode LX800). Even though a bios is on the board one of our customer wants to use the U-boot, so I have to port it. I've seen that there is already a U-Boot Option for the SC520, perhaps i can start from this point ? It would be nice to get some help starting with this project. Thanks a lot, Erol ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- Diese e-mail ist von rein informativem Charakter und beinhaltet keinerlei vertragliche Bindung seitens der DEUTA Werke GmbH solange sie nicht durch eine schriftliche und im Auftrag von Deuta gezeichnete Mitteilung bestätigt wird. ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- Nothing in this e-mail may be construed as amounting to a contractual or other legal commitment on the part of DEUTA Werke GmbH unless confirmed by a letter, signed on behalf of the company. -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

1 0

[U-Boot-Users] linux kernel porting bug
by Piyush Khandelwal 04 Oct '06

04 Oct '06

Hi all, We are porting linux kernel for an ARM11 board. During the bootup process, it hangs in Calibrate_delay() specifically it hangs on the while(ticks == jiffies); wait loop. We are not able to find what interrupt changes jiffies. Can we know what could be the problem. Thanks in advance, Piyush --------------------------------- Find out what India is talking about on - Yahoo! Answers India Send FREE SMS to your friend's mobile from Yahoo! Messenger Version 8. Get it NOW

3 3

Re: [U-Boot-Users] Boot direct on SATA drive
by sebastien.douheret 03 Oct '06

03 Oct '06

I have a Intel 31244 (PCI-X to SATA). This component supports 2 modes : IDE or DPA (Direct Port Access) and we use it in DPA. It's work fine in DPA mode under Linux with driver Vitesse (sata_vsc.c). DPA mode seems to be like IDE unlike : - access type (memory instead of i/o) - registers offsets (4 independents ports instead of Master/Slave config). To boot with SII3112 in IDE mode, did you need to patch cmd_ide or standard code works ? > Depends on the SATA disk controller. I've booted a SII3112 directly > using the ATA driver sice that chip happens to have a IDE (PATA) > compatability layer. > Newer controllers use AHCI standard for the interface, and needs a > completely different driver. > I ended up just booting the kernel image from FLASH instead.... > Accédez au courrier électronique de La Poste sur www.laposte.net ou sur 3615 LAPOSTENET (0,34 TTC /mn) 1 Giga de stockage gratuit Antispam et antivirus intégrés

2 1

[U-Boot-Users] Boot direct on SATA drive
by sebastien.douheret 03 Oct '06

03 Oct '06

Hi all, Does anyone has successfuly boot directly on a SATA drive with U-Boot ? I'm planning to used bootdisk (ide command) and adapt cmd_ide.c with ATA layer to SATA drive. Do you think that is the right way ? Best regards, Sebastien D. Accédez au courrier électronique de La Poste sur www.laposte.net ou sur 3615 LAPOSTENET (0,34 TTC /mn) 1 Giga de stockage gratuit Antispam et antivirus intégrés

2 1

[U-Boot-Users] MPC5840 local bus speed
by Gerrit Van de Velde 02 Oct '06

02 Oct '06

Hi all, I'm not sure if it's entirely on topic but here we go: We've been trying to set the local bus speed of the MPC8540 to 82MHz without much success until now. We're using Uboot 1.1.4 with our own board.c code mostly ripped from the 8540ADS board. In the code there's some info about a workaround for the DLL of te cpu: /* * Errata LBC11. * Fix Local Bus clock glitch when DLL is enabled. * * If localbus freq is < 66Mhz, DLL bypass mode must be used. * If localbus freq is > 133Mhz, DLL can be safely enabled. * Between 66 and 133, the DLL is enabled with an override workaround. */ But actually, the 82Mhz is in between those values. In this code, the U-Boot stops working after the LCRR is assigned and doesn't even get to the udelay part (checked with printfs) lbc->lcrr = CFG_LBC_LCRR & (~0x80000000); /* DLL Enabled */ Udelay(200); Disabling or enabling has the same result, the clock speed of the bus has changed though to 82MHz (checked it with the scope). Has anyone of you some pointers on what to check or what to try out? Regards, Gerrit

2 1

[U-Boot-Users] Re : MV64460 Burst reads from BootCS
by sebastien.douheret 02 Oct '06

02 Oct '06

Hi, Marvell MV64460 only supports burst reads/writes on 32bits width peripherals ;-( I have the same issue with a Lauterbach probe. You must deny burst on BootCS if this peripheral is not 32bits width ! This restriction also penalize boot process ! If your boot flash is 16 or 8 bits witdh, you can't directly execute instructions in flash. Because CPU like MPC74xx always load instructions with burst reads. Regards. Sebastien. > ------------------------------ > > Message: 5 > Date: Sun, 1 Oct 2006 20:19:12 +0200 > From: "Roel Loeffen" <roel.loeffen(a)prodrive.nl> > Subject: [U-Boot-Users] MV64460 Burst reads from BootCS > To: <u-boot-users(a)lists.sourceforge.net> > Message-ID: > <7826EB01AD927140A1DCF898FE63325D0D91B1(a)ExchangeSrv.Prodrive.nl> > Content-Type: text/plain; charset="iso-8859-1" > > Hi all, > > We discover some serious problems accessing flash at BootCS > of the Marvell MV64460. It looks like burst reads make the > whole bridge hang. >From inside U-Boot as well as using only > the BDI2000 debugger. > > Reading the flash with bursts enabled (which is default), > makes it sometimes impossible to access any > registers/dram/devices anymore, only zeros can be read. > > It also freezes the CPU somehow the debugger cannot halt it > anymore with a normal halt (COP halt), it has to use COP > freeze to take over control again. > > I cannot say this problem does not occur accessing other > spaces, so it can also be a problem at the PPC60x bus. > > Has anyone over excpirianced this before? > > Thanks in advance! > > Roel Accédez au courrier électronique de La Poste sur www.laposte.net ou sur 3615 LAPOSTENET (0,34 TTC /mn) 1 Giga de stockage gratuit Antispam et antivirus intégrés

2 1

[U-Boot-Users] [PATCH] Support for Maxim DS1374 RTC/watchdog on Zefeer platform
by llandre 02 Oct '06

02 Oct '06

This patch adds support for Maxim DS1374 on Zefeer platform (RTC and watchdog functionalities). Please note that it has not been tested and generated against current repository. Signed-off-by: Andrea Marson <r&d2(a)dave-tech.it> -- llandre DAVE Electronics System House - R&D Department web: http://www.dave-tech.it email: r&d2(a)dave-tech.it diff --git a/Makefile b/Makefile index 9c5a5b0..f2513cb 100644 --- a/Makefile +++ b/Makefile @@ -120,6 +120,7 @@ LIBS += rtc/librtc.a LIBS += dtt/libdtt.a LIBS += drivers/libdrivers.a LIBS += drivers/sk98lin/libsk98lin.a +LIBS += drivers/watchdog/libwd.a LIBS += post/libpost.a post/cpu/libcpu.a LIBS += common/libcommon.a .PHONY : $(LIBS) diff --git a/board/dave/ZefeerEVB/zefeerevb.c b/board/dave/ZefeerEVB/zefeerevb.c index 6b61dc5..1ffd1f7 100644 --- a/board/dave/ZefeerEVB/zefeerevb.c +++ b/board/dave/ZefeerEVB/zefeerevb.c @@ -27,6 +27,7 @@ #include <configs/ZefeerEVB.h> #include "clocks.h" #include <asm/arch/ep93xx.h> #include <linux/byteorder/swab.h> +#include <ds1374.h> #define HAL_WRITE_UINT32( _register_, _value_ ) \ (*((volatile unsigned long *)(_register_)) = (_value_)) @@ -108,7 +109,7 @@ #endif /* We have a console */ gd->have_console = 1; - + return 0; } diff --git a/cpu/arm920t/cpu.c b/cpu/arm920t/cpu.c index 6abb3b0..539fb56 100644 --- a/cpu/arm920t/cpu.c +++ b/cpu/arm920t/cpu.c @@ -99,6 +99,11 @@ #ifdef CONFIG_USE_IRQ IRQ_STACK_START = _armboot_start - CFG_MALLOC_LEN - CFG_GBL_DATA_SIZE - 4; FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ; #endif + +#if defined (CONFIG_ZEFEER) && defined(CONFIG_WATCHDOG) + ds1374wd_init(5*1000000); +#endif + return 0; } diff --git a/cpu/arm920t/ep93xx/cpu.c b/cpu/arm920t/ep93xx/cpu.c index 00510a5..22ee7fd 100644 --- a/cpu/arm920t/ep93xx/cpu.c +++ b/cpu/arm920t/ep93xx/cpu.c @@ -132,10 +132,17 @@ extern void upmconfig(unsigned int upm, /* nop */ } - /* We reset the CPU by generating a 1-->0 transition on DeviceCfg bit 31. */ extern void reset_cpu(ulong addr) { + +#if defined(CONFIG_ZEFEER) && defined (CONFIG_RTC_DS1374) && defined (CONFIG_WATCHDOG) + /* If availbale we the DS1374 to reset the whole thing */ + ds1374wd_force_reset(); + printf("Warning! DS1374 system reset failed. Using EP93xx software reset ...\n"); +#endif + + /* This strategy uses the internal reset (reliable???) */ /* Unlock DeviceCfg and write '1' */ SYSCON_SW_UNCLOCK; SysconDEVCFG |= (1 << 31); diff --git a/cpu/arm920t/ep93xx/serial.c b/cpu/arm920t/ep93xx/serial.c index 8eb561a..a9ef654 100644 --- a/cpu/arm920t/ep93xx/serial.c +++ b/cpu/arm920t/ep93xx/serial.c @@ -19,8 +19,10 @@ */ #include <common.h> +#include <watchdog.h> #include <asm/arch/ep93xx.h> +int ep93xx_serial_initialized = 0; void serial_setbrg (void) { @@ -54,6 +56,8 @@ int serial_init (void) { serial_setbrg (); + ep93xx_serial_initialized = 1; + return (0); } @@ -65,7 +69,9 @@ int serial_init (void) int serial_getc (void) { - while (!(rUART1_IIR & 0x2)); + while (!(rUART1_IIR & 0x2)) { + WATCHDOG_RESET(); + }; return rUART1_DR & 0xff; } @@ -108,7 +114,9 @@ #endif void serial_putc (const char c) { /* wait for room in the tx FIFO */ - while(rUART1_FR & 0x20); + while(rUART1_FR & 0x20) { + WATCHDOG_RESET(); + }; rUART1_DR = c; /* If \n, also do \r */ diff --git a/drivers/Makefile b/drivers/Makefile index e6176ed..f0fd13d 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -25,6 +25,8 @@ include $(TOPDIR)/config.mk # CFLAGS += -DET_DEBUG -DDEBUG +SUBDIRS := watchdog + LIB = libdrivers.a OBJS = 3c589.o 5701rls.o ali512x.o \ @@ -59,6 +61,8 @@ ######################################## .depend: Makefile $(OBJS:.o=.c) $(CC) -M $(CFLAGS) $(OBJS:.o=.c) > $@ + @for dir in $(SUBDIRS) ; do \ + $(MAKE) -C $$dir $@ ; done sinclude .depend diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile new file mode 100644 index 0000000..ac5f761 --- /dev/null +++ b/drivers/watchdog/Makefile @@ -0,0 +1,16 @@ +include $(TOPDIR)/config.mk + +LIB := libwd.a + +OBJS := ds1374wd.o +all: $(LIB) + +$(LIB): $(OBJS) + $(AR) crv $@ $(OBJS) + +######################################################################### + +.depend: Makefile $(OBJS:.o=.c) + $(CC) -M $(CFLAGS) $(OBJS:.o=.c) > $@ + +sinclude .depend diff --git a/drivers/watchdog/ds1374wd.c b/drivers/watchdog/ds1374wd.c new file mode 100644 index 0000000..28286b7 --- /dev/null +++ b/drivers/watchdog/ds1374wd.c @@ -0,0 +1,96 @@ +/* + * (C) Copyright 2006 + * DAVE Srl <www.dave-tech.it> + * + * 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 + */ + +/* + * Watchdog support for Dallas Semiconductor (now Maxim) DS1374 + */ + +#include <common.h> +#include <command.h> +#include <i2c.h> +#include <ds1374.h> + +#if (defined(CONFIG_RTC_DS1374)) && defined(CONFIG_WATCHDOG) + +#ifdef CONFIG_ZEFEER +extern int ep93xx_serial_initialized; +#endif + +/* This will be invoked to retrigger counter */ +void watchdog_reset (void) +{ + ds1374_read(RTC_WD_ALM_CNT_BYTE0_ADDR); +} + +/* Initialize and start watchdog */ +void ds1374wd_init(u32 timeout) +{ + DECLARE_GLOBAL_DATA_PTR; + uchar tmp; + u32 ticks = (timeout / DS1374WD_MIN_TICK_US); + + tmp = 0; + ds1374_write_raw(RTC_CTL_ADDR, tmp); + + /* timeout programming */ + ds1374_write_raw(RTC_WD_ALM_CNT_BYTE2_ADDR, (u8)((ticks & 0x00FF0000) >> 16)); + ds1374_write_raw(RTC_WD_ALM_CNT_BYTE1_ADDR, (u8)((ticks & 0x0000FF00) >> 8)); + ds1374_write_raw(RTC_WD_ALM_CNT_BYTE0_ADDR, (u8)((ticks & 0x000000FF) >> 0)); + + +#ifdef CONFIG_ZEFEER + if (ep93xx_serial_initialized) { + debug("RTC_WD_ALM_CNT_BYTE2_ADDR = 0x%02X\n", ds1374_read(RTC_WD_ALM_CNT_BYTE2_ADDR)); + debug("RTC_WD_ALM_CNT_BYTE1_ADDR = 0x%02X\n", ds1374_read(RTC_WD_ALM_CNT_BYTE1_ADDR)); + debug("RTC_WD_ALM_CNT_BYTE0_ADDR = 0x%02X\n", ds1374_read(RTC_WD_ALM_CNT_BYTE0_ADDR)); + } +#endif + + /* + Control.WD/nALM = 1 + Control.WDSTR = 0 + Control.WACE = 1 + */ + tmp = 0; + tmp |= (RTC_CTL_BIT_WD_ALM | RTC_CTL_BIT_WACE); + tmp &= ~RTC_CTL_BIT_WDSTR; + ds1374_write_raw(RTC_CTL_ADDR, tmp); +#ifdef CONFIG_ZEFEER + if (ep93xx_serial_initialized) + debug("RTC_CTL_ADDR = 0x%02X\n", ds1374_read(RTC_CTL_ADDR)); +#endif +} + +/* Enables watchdog with shortest possible timeout and makes it expire */ +int ds1374wd_force_reset() +{ + /* Set minimal timeout */ + ds1374wd_init(1000000); + + /* We should die here ... */ + udelay(1000000 * 2); + + /* If we get here it did not work! */ + return -1; +} +#endif /* (CONFIG_RTC_DS1374) && (CONFIG_WATCHDOG) */ diff --git a/include/configs/ZefeerEVB.h b/include/configs/ZefeerEVB.h index f0d201f..a63e042 100644 --- a/include/configs/ZefeerEVB.h +++ b/include/configs/ZefeerEVB.h @@ -100,8 +100,6 @@ #define I2C_SCL(bit) GPIO_PGDDR |= GPIOG else GPIO_PGDR &= ~GPIOG_EECLK #define I2C_DELAY udelay(50) /* 1/4 I2C clock duration */ -#define CONFIG_RTC_DS1337 -#define CFG_I2C_RTC_ADDR 0x68 #endif /* CONFIG_SOFT_I2C */ @@ -133,6 +131,7 @@ #if defined(CONFIG_ZEFEER_DZN) || define CFG_CMD_NET | \ CFG_CMD_SPI | \ CFG_CMD_I2C | \ + CFG_CMD_DATE | \ CFG_CMD_BIN) #else #define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ @@ -150,11 +149,13 @@ #else CFG_CMD_NET | \ CFG_CMD_SPI | \ CFG_CMD_I2C | \ + CFG_CMD_DATE | \ CFG_CMD_PING) #else #define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ CFG_CMD_MII | \ CFG_CMD_NET | \ + CFG_CMD_DATE | \ CFG_CMD_PING) #endif #endif @@ -266,7 +267,6 @@ #define CFG_PBSIZE (CFG_CBSIZE+sizeof(CF #define CFG_MAXARGS 16 /* max number of command args */ #define CFG_BARGSIZE CFG_CBSIZE /* Boot Argument Buffer Size */ #define CFG_AUTO_COMPLETE -#undef CONFIG_WATCHDOG /* watchdog disabled */ #define CFG_MEMTEST_START 0x00000000 /* memtest works on */ #define CFG_MEMTEST_END 0x00f00000 /* MB in DRAM */ @@ -387,4 +387,10 @@ #define CFG_ENV_SECT_SIZE 0x20000 /* 128 #define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + 0x20000) #define CFG_ENV_SIZE_REDUND 0x20000 +/*----------------------------------------------------------------------- + * WDT/RTC + */ +#define CONFIG_RTC_DS1374 +#define CONFIG_WATCHDOG + #endif /* __CONFIG_H */ diff --git a/include/ds1374.h b/include/ds1374.h new file mode 100644 index 0000000..3436e0a --- /dev/null +++ b/include/ds1374.h @@ -0,0 +1,84 @@ +/* + * (C) Copyright 2001, 2002, 2003 + * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. + * Keith Outwater, keith_outwater(a)mvis.com` + * Steven Scholz, steven.scholz(a)imc-berlin.de + * (C) Copyright 2006 + * DAVE Srl <www.dave-tech.it> + * + * 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 + */ + +/* + * Common stuff dor DS1374 drivers + */ + +#ifndef _DS1374_H_ +#define _DS1374_H_ + +#ifndef CFG_I2C_RTC_ADDR +# define CFG_I2C_RTC_ADDR 0x68 +#endif + +#if defined(CONFIG_RTC_DS1374) && (CFG_I2C_SPEED > 400000) +# error The DS1374 is specified up to 400kHz in fast mode! +#endif + +/* + * RTC register addresses + */ +#define RTC_TOD_CNT_BYTE0_ADDR 0x00 /* TimeOfDay */ +#define RTC_TOD_CNT_BYTE1_ADDR 0x01 +#define RTC_TOD_CNT_BYTE2_ADDR 0x02 +#define RTC_TOD_CNT_BYTE3_ADDR 0x03 + +#define RTC_WD_ALM_CNT_BYTE0_ADDR 0x04 +#define RTC_WD_ALM_CNT_BYTE1_ADDR 0x05 +#define RTC_WD_ALM_CNT_BYTE2_ADDR 0x06 + +#define RTC_CTL_ADDR 0x07 /* RTC-CoNTrol-register */ +#define RTC_SR_ADDR 0x08 /* RTC-StatusRegister */ +#define RTC_TCS_DS_ADDR 0x09 /* RTC-TrickleChargeSelect DiodeSelect-register */ + +#define RTC_CTL_BIT_AIE (1<<0) /* Bit 0 - Alarm Interrupt enable */ +#define RTC_CTL_BIT_RS1 (1<<1) /* Bit 1/2 - Rate Select square wave output */ +#define RTC_CTL_BIT_RS2 (1<<2) /* Bit 2/2 - Rate Select square wave output */ +#define RTC_CTL_BIT_WDSTR (1<<3) /* Bit 3 - Watchdog Reset Steering */ +#define RTC_CTL_BIT_BBSQW (1<<4) /* Bit 4 - Battery-Backed Square-Wave */ +#define RTC_CTL_BIT_WD_ALM (1<<5) /* Bit 5 - Watchdoc/Alarm Counter Select */ +#define RTC_CTL_BIT_WACE (1<<6) /* Bit 6 - Watchdog/Alarm Counter Enable WACE*/ +#define RTC_CTL_BIT_EN_OSC (1<<7) /* Bit 7 - Enable Oscilator */ + +#define RTC_SR_BIT_AF 0x01 /* Bit 0 = Alarm Flag */ +#define RTC_SR_BIT_OSF 0x80 /* Bit 7 - Osc Stop Flag */ + +typedef unsigned char boolean_t; + +uchar ds1374_read (uchar reg); +void ds1374_write (uchar reg, uchar val, boolean_t set); +void ds1374_write_raw (uchar reg, uchar val); + +#ifdef CONFIG_WATCHDOG +/* Minimal watchdog tick */ +#define DS1374WD_MIN_TICK_US 244 +void ds1374wd_init(u32); +int ds1374wd_force_reset(); +#endif + +#endif /* _DS1374_H_ */ diff --git a/rtc/Makefile b/rtc/Makefile index 4ceac76..72a6ea9 100644 --- a/rtc/Makefile +++ b/rtc/Makefile @@ -28,8 +28,8 @@ #CFLAGS += -DDEBUG LIB = librtc.a OBJS = date.o \ - ds12887.o ds1302.o ds1306.o ds1307.o ds1337.o \ - ds1556.o ds164x.o ds174x.o \ + ds12887.o ds1302.o ds1306.o ds1307.o \ + ds1337.o ds1374.o ds1556.o ds164x.o ds174x.o \ m41t11.o max6900.o m48t35ax.o mc146818.o mk48t59.o \ mpc5xxx.o mpc8xx.o pcf8563.o s3c24x0_rtc.o rs5c372.o diff --git a/rtc/ds1374.c b/rtc/ds1374.c new file mode 100644 index 0000000..99e8646 --- /dev/null +++ b/rtc/ds1374.c @@ -0,0 +1,216 @@ +/* + * (C) Copyright 2001, 2002, 2003 + * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. + * Keith Outwater, keith_outwater(a)mvis.com` + * Steven Scholz, steven.scholz(a)imc-berlin.de + * + * 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 + */ + +/* + * Date & Time support (no alarms) for Dallas Semiconductor (now Maxim) + * DS1374 Real Time Clock (RTC). + * + * based on ds1337.c + */ + +#include <common.h> +#include <command.h> +#include <rtc.h> +#include <i2c.h> +#include <ds1374.h> + +#if defined(CONFIG_RTC_DS1374) + +/*---------------------------------------------------------------------*/ +#undef DEBUG_RTC +#define DEBUG_RTC + +#ifdef DEBUG_RTC +#define DEBUGR(fmt,args...) printf(fmt ,##args) +#else +#define DEBUGR(fmt,args...) +#endif +/*---------------------------------------------------------------------*/ + + +#ifndef TRUE +#define TRUE ((boolean_t)(0==0)) +#endif +#ifndef FALSE +#define FALSE (!TRUE) +#endif + +const char RtcTodAddr[] = { + RTC_TOD_CNT_BYTE0_ADDR, + RTC_TOD_CNT_BYTE1_ADDR, + RTC_TOD_CNT_BYTE2_ADDR, + RTC_TOD_CNT_BYTE3_ADDR +}; + +/* + * Helper functions + */ +uchar ds1374_read (uchar reg) +{ + return (i2c_reg_read (CFG_I2C_RTC_ADDR, reg)); +} + +void ds1374_write (uchar reg, uchar val, boolean_t set) +{ + if (set == TRUE) { + val |= i2c_reg_read (CFG_I2C_RTC_ADDR, reg); + i2c_reg_write (CFG_I2C_RTC_ADDR, reg, val); + } else { + val = i2c_reg_read (CFG_I2C_RTC_ADDR, reg) & ~val; + i2c_reg_write (CFG_I2C_RTC_ADDR, reg, val); + } +} + +void ds1374_write_raw (uchar reg, uchar val) +{ + i2c_reg_write (CFG_I2C_RTC_ADDR, reg, val); +} +#if (CONFIG_COMMANDS & CFG_CMD_DATE) + +/* + * Get the current time from the RTC + */ +void rtc_get (struct rtc_time *tm){ + + unsigned long time1, time2; + unsigned int limit; + unsigned char tmp; + unsigned int i; + + /* + * Since the reads are being performed one byte at a time, + * there is a chance that a carry will occur during the read. + * To detect this, 2 reads are performed and compared. + */ + limit = 10; + do { + i = 4; + time1 = 0; + while (i--) { + tmp = ds1374_read(RtcTodAddr[i]); + time1 = (time1 << 8) | (tmp & 0xff); + } + + i = 4; + time2 = 0; + while (i--) { + tmp = ds1374_read(RtcTodAddr[i]); + time2 = (time2 << 8) | (tmp & 0xff); + } + } while ((time1 != time2) && limit--); + + if (time1 != time2) { + printf("can't get consistent time from rtc chip\n"); + } + + DEBUGR ("Get RTC s since 1.1.1970: %d\n", time1); + + to_tm(time1, tm); /* To Gregorian Date */ + + if (ds1374_read(RTC_SR_ADDR) & RTC_SR_BIT_OSF) + printf ("### Warning: RTC oscillator has stopped\n"); + + DEBUGR ("Get DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n", + tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_wday, + tm->tm_hour, tm->tm_min, tm->tm_sec); +} + +/* + * Set the RTC + */ +void rtc_set (struct rtc_time *tmp){ + + unsigned long time; + unsigned i; + + DEBUGR ("Set DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n", + tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday, + tmp->tm_hour, tmp->tm_min, tmp->tm_sec); + + if (tmp->tm_year < 1970 || tmp->tm_year > 2069) + printf("WARNING: year should be between 1970 and 2069!\n"); + + time = mktime(tmp->tm_year, tmp->tm_mon, + tmp->tm_mday, tmp->tm_hour, + tmp->tm_min, tmp->tm_sec); + + DEBUGR ("Set RTC s since 1.1.1970: %d (0x%02x)\n", time, time); + + /* write to RTC_TOD_CNT_BYTEn_ADDR */ + for (i = 0; i <= 3; i++) { + ds1374_write_raw(RtcTodAddr[i], (unsigned char)(time & 0xff)); + time = time >> 8; + } + + /* Start clock */ + ds1374_write(RTC_CTL_ADDR, RTC_CTL_BIT_EN_OSC, FALSE); +} + +/* + * Reset the RTC. We setting the date back to 1970-01-01. + * We also enable the oscillator output on the SQW/OUT pin and program + * it for 32,768 Hz output. Note that according to the datasheet, turning + * on the square wave output increases the current drain on the backup + * battery to something between 480nA and 800nA. + */ +void rtc_reset (void){ + + struct rtc_time tmp; + + /* clear status flags */ + ds1374_write (RTC_SR_ADDR, (RTC_SR_BIT_AF|RTC_SR_BIT_OSF), FALSE); /* clearing OSF and AF */ + + /* Initialise DS1374 oriented to MPC8349E-ADS */ + ds1374_write (RTC_CTL_ADDR, (RTC_CTL_BIT_EN_OSC + |RTC_CTL_BIT_WACE + |RTC_CTL_BIT_AIE), FALSE);/* start osc, disable WACE, clear AIE + - set to 0 */ + ds1374_write (RTC_CTL_ADDR, (RTC_CTL_BIT_WD_ALM + |RTC_CTL_BIT_WDSTR + |RTC_CTL_BIT_RS1 + |RTC_CTL_BIT_RS2 + |RTC_CTL_BIT_BBSQW), TRUE);/* disable WD/ALM, WDSTR set to INT-pin, + set BBSQW and SQW to 32k + - set to 1 */ + tmp.tm_year = 1970; + tmp.tm_mon = 1; + tmp.tm_mday= 1; + tmp.tm_hour = 0; + tmp.tm_min = 0; + tmp.tm_sec = 0; + + rtc_set(&tmp); + + printf("RTC: %4d-%02d-%02d %2d:%02d:%02d UTC\n", + tmp.tm_year, tmp.tm_mon, tmp.tm_mday, + tmp.tm_hour, tmp.tm_min, tmp.tm_sec); + + ds1374_write(RTC_WD_ALM_CNT_BYTE2_ADDR,0xAC, TRUE); + ds1374_write(RTC_WD_ALM_CNT_BYTE1_ADDR,0xDE, TRUE); + ds1374_write(RTC_WD_ALM_CNT_BYTE2_ADDR,0xAD, TRUE); +} + +#endif /* (CFG_COMMANDS & CFG_CMD_DATE) */ +#endif /* (CONFIG_RTC_DS1374) */

1 0

[U-Boot-Users] MV64460 Burst reads from BootCS
by Roel Loeffen 01 Oct '06

01 Oct '06

Hi all, We discover some serious problems accessing flash at BootCS of the Marvell MV64460. It looks like burst reads make the whole bridge hang. >From inside U-Boot as well as using only the BDI2000 debugger. Reading the flash with bursts enabled (which is default), makes it sometimes impossible to access any registers/dram/devices anymore, only zeros can be read. It also freezes the CPU somehow the debugger cannot halt it anymore with a normal halt (COP halt), it has to use COP freeze to take over control again. I cannot say this problem does not occur accessing other spaces, so it can also be a problem at the PPC60x bus. Has anyone over excpirianced this before? Thanks in advance! Roel

1 0

[U-Boot-Users] IBM750GX with MV64460 bridge
by Roel Loeffen 01 Oct '06

01 Oct '06

Hello U-Boot users/porters, Has anyone already ported U-Boot for a board with a IBM750GX and a MV64460 bridge. We are doing this right now, but if anyone has already done this we'd like to start with this code. Besides to this, has anyone ever thought about making a clean driver of all the Marvell/Galileo stuff in U-Boot, it is now all over the board directories, which makes it very messy. We are planning to do this at least for our boards, but if someone already has done some effort hear please let me know. Thanks, Roel

1 0

[U-Boot-Users] AMCC 440SP PCIX Register access with BDI2000?
by Jeff Stevens 01 Oct '06

01 Oct '06

Is there any way to access the PCIX Registers using the BDI2000? I accidentally set the CPU wait bit for PCIX1, and now it won't boot. If I could access the PCIX registers (located and 0x91EC80044) I could clear the wait bit, and start U-Boot. However, it looks like the BDI2000 can only access 32-bit addresses, so when I have it dump 0x91ec80044 it dumps 0x1ec80044 instead. Is there an indirect access register set? Thanks, Jeff Stevens __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

2 1

Re: [U-Boot-Users] AMCC 440SP PCI Issue
by Jeff Stevens 01 Oct '06

01 Oct '06

I am using all three pci busses are host interfaces: PCIX0: PMC Slot PCIX1: Fiber Channel Controller PCIX2: USB Controller When linux does boot, it sees all of these devices just fine. However, when it doesn't, it hangs after it calls pciauto_bus_scan. Thanks, Jeff __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

1 0

[U-Boot-Users] AMCC 440SP PCI Issue
by Jeff Stevens 01 Oct '06

01 Oct '06

I am having an issue with my PCI configuration on a custom board based closely off of the AMCC Luan board (440SP processor). When I type "pci 1" or "pci 2" from the U-Boot prompt, I get a bunch of "pci_bus_to_hose() failed" messages ("pci 0" returns fine). What could cause this. I pretty much kept the PCI configuration settings (mmap, config.h, board.c) from the Luan port. I checked the bootstrap settings and all of the settings are identical. Does anyone have any idea what could cause this? I looked at the hoses structure, and it's empty. Thanks, Jeff Stevens __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

2 1