July 2008 - U-Boot

Re: [U-Boot-Users] PATCH for U-Boot 1.3.3 DHCP fails withnetgearWGR614v6
by Wolfgang Denk 12 Jul '08

12 Jul '08

In message <200807121116.09164.rgetz(a)blackfin.uclinux.org> you wrote: > > > This message came through without significant delay. > > I think that is because the message was send directly to you - I don't see my > response on gmane or sourceforge archives either. You are right. It came directly, not through the list. Not a single mail from you on the list. You probably want to ask SF support for help. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de A fail-safe circuit will destroy others. -- Klipstein

1 0

[U-Boot-Users] ARM tree
by Jean-Christophe PLAGNIOL-VILLARD 12 Jul '08

12 Jul '08

Hi all, For all arm user and developper, I've reset the master branch of u-boot-arm with Wolfgang master. All other branch is un-touched. Best Regards, J.

1 0

Re: [U-Boot-Users] PATCH for U-Boot 1.3.3 DHCP fails withnetgearWGR614v6
by Wolfgang Denk 12 Jul '08

12 Jul '08

In message <200807120112.18889.rgetz(a)blackfin.uclinux.org> you wrote: > > Hmm.. The list was copied every time But until now none of the messages made it to the list, it seems. > It looks like my mails take longer to get to sourceforge than it takes to go > somewhere specific (like Ben), but his responses hit the list before > mine .... weird - I'll have to check my mail logs... This message came through without significant delay. > I have a DHCP server (made by netgear) that does: > > U-Boot ---> DHCPDISCOVER ---> Server > \/ > U-Boot <--- DHCPOFFER <--- Server > \/ > U-Boot ---> DHCPREQUEST ---> Server > | > U-Boot <--- ARP <--- Server > | > U-Boot ---> I'm here ---> Server > | > U-Boot <--- DHCPNAK <--- Server > \/ > U-Boot not configured > > Before U-Boot receives a DHCPACK packet, it starts using the IP number in the > DHCPOFFER to respond to the ARP. It should not respond to the ARP, since it > has not received the DHCPACK packet yet. It also uses it when it sends the > DHCPREQUEST packet. > > I looked a few other dhcp clients, and they always leave the source IP as > 0.0.0.0 for the DHCPREQUEST packet, and do not listen/send that IP until they > receive a DHCPACK. > > This is what the patch I sent to Ben does - don't set the network up during > the DHCPREQUEST phase. > > --- net/bootp.c.new 2008-07-11 12:05:18.000000000 -0400 > +++ ./net/bootp.c 2008-07-11 18:58:15.000000000 -0400 > @@ -924,8 +924,6 @@ > if (NetReadLong((ulong*)&bp->bp_vend[0]) == htonl(BOOTP_VENDOR_MAGIC)) > DhcpOptionsProcess((u8 *)&bp->bp_vend[4], bp); > > - BootpCopyNetParams(bp); /* Store net params from reply */ > - > NetSetTimeout(TIMEOUT * CFG_HZ, BootpTimeout); > DhcpSendRequestPkt(bp); > #ifdef CFG_BOOTFILE_PREFIX Hm... the line in question is there right from the initial version of the file, i. e. it is not a spefic fix to any known issue. So: Acked-by: Wolfgang Denk <wd(a)denx.de> Ben: feel free to add this fix for the current release. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de One possible reason that things aren't going according to plan is that there never was a plan in the first place.

1 0

Re: [U-Boot-Users] PATCH for U-Boot 1.3.3 DHCP fails withnetgearWGR614v6
by Ben Warren 12 Jul '08

12 Jul '08

Robin Getz wrote: > On Fri 11 Jul 2008 18:05, Ben Warren pondered: > >> Hi Robin, >> >> Robin Getz wrote: >> >>> On Fri 11 Jul 2008 14:21, Ben Warren pondered: >>> >>> >>>> Robin Getz wrote: >>>> >>>> >>> [snip] >>> >>> >>>>> >>>>> >>>>> >>>> This seems goofy. Have you tried your fix with other DHCP servers to >>>> >>>> verify that it works? If so, which ones? I unfortunately can't try >>>> anything right now but will play around a bit tonight. >>>> >>>> >>> Some other random netgears that I have in my home, plus whatever is >>> attached to our corp network - it works on them all (but on those it >>> worked before as well). >>> >>> -Robin >>> >> While your fix works, wouldn't it be more correct to remove the call to >> BootpCopyNetParams() on line 927? >> > > That seems to work as well - but changes the operation a little. > > Before - the U-Boot had set source IP number to the IP number it had been > offered (my first patch leaves it that way). With the call to > BootpCopyNetParams() removed, it does a broadcast (Source IP is 0.0.0.0 - > just like the RFC says it should do). > > I have no idea if some other broken DHCP server historically needed that, or > what was going on - so that is why I only fixed the operation on the wire - > not changed it from it's existing state (which AFAICT - _is_ wrong). > > I'm more than happy to send the patch that remove the call (and makes things > more correct, fixes the bug, and makes things smaller) - but I'm also > hesitant since I don't want to break it for anyone else :) > > >> My understanding of the purpose of >> the DHCPDISCOVER state is for determining if there are reachable DHCP >> servers, not for actually acquiring an address. I'm a bit wary because >> I don't know why that call was put there in the first place. I guess in >> theory you could short-circuit the DHCPREQUEST state, but the code >> doesn't do that. >> > > The code does do that. The call to BootpCopyNetParams() sets up the network, > and allows the ARP code in ./net/net.c to respond (before it should) this is > what causes the problem I was/am having. > > Either fix is fine with me - let me know which one you want. > > -Robin > > I'm a bit of an idealist, so I say let's do it right (remove the call to BootpCopyNetParams()). Unless somebody with some historical perspective weighs in, we'll pull it in as soon as the next merge window opens and see what happens. thanks a lot, Ben

2 3

[U-Boot-Users] [PATCH 0/3] More net/eth.c cleanup
by Ben Warren 12 Jul '08

12 Jul '08

Hello, More cleanup of net/eth.c, this time taking care of the following: - Blackfin EMAC - ULi526x - SKGE I don't have any of this hardware, so testing consisted of compiling only. This patch is being staged in the 'testing' branch of the net repo. regards, Ben

1 3

[U-Boot-Users] [PATCH] Moved conditional compilation to Makefile for SK98 Ethernet driver
by Ben Warren 12 Jul '08

12 Jul '08

Brute-force removal of #ifdefs. Didn't touch the code. Signed-off-by: Ben Warren <biggerbadderben(a)gmail.com> --- drivers/net/sk98lin/Makefile | 20 ++++---------------- drivers/net/sk98lin/skaddr.c | 4 ---- drivers/net/sk98lin/skcsum.c | 4 ---- drivers/net/sk98lin/skge.c | 4 ---- drivers/net/sk98lin/skgehwt.c | 5 ----- drivers/net/sk98lin/skgeinit.c | 4 ---- drivers/net/sk98lin/skgemib.c | 4 ---- drivers/net/sk98lin/skgepnmi.c | 4 ---- drivers/net/sk98lin/skgesirq.c | 4 ---- drivers/net/sk98lin/ski2c.c | 4 ---- drivers/net/sk98lin/sklm80.c | 4 ---- drivers/net/sk98lin/skproc.c | 4 ---- drivers/net/sk98lin/skqueue.c | 4 ---- drivers/net/sk98lin/skrlmt.c | 4 ---- drivers/net/sk98lin/sktimer.c | 4 ---- drivers/net/sk98lin/skvpd.c | 4 ---- drivers/net/sk98lin/skxmac2.c | 4 ---- drivers/net/sk98lin/uboot_drv.c | 6 ------ drivers/net/sk98lin/uboot_skb.c | 5 ----- 19 files changed, 4 insertions(+), 92 deletions(-) diff --git a/drivers/net/sk98lin/Makefile b/drivers/net/sk98lin/Makefile index 8b83fae..f1bc4a7 100644 --- a/drivers/net/sk98lin/Makefile +++ b/drivers/net/sk98lin/Makefile @@ -29,24 +29,12 @@ include $(TOPDIR)/config.mk LIB := $(obj)libsk98lin.a -COBJS-y += skge.o -COBJS-y += skaddr.o -COBJS-y += skgehwt.o -COBJS-y += skgeinit.o -COBJS-y += skgepnmi.o -COBJS-y += skgesirq.o -COBJS-y += ski2c.o -COBJS-y += sklm80.o -COBJS-y += skqueue.o -COBJS-y += skrlmt.o -COBJS-y += sktimer.o -COBJS-y += skvpd.o -COBJS-y += skxmac2.o -COBJS-y += skcsum.o +COBJS-$(CONFIG_SK98) += skge.o skaddr.o skgehwt.o skgeinit.o skgepnmi.o \ + skgesirq.o ski2c.o sklm80.o skqueue.o skrlmt.o sktimer.o \ + skvpd.o skxmac2.o skcsum.o #COBJS-y += skproc.o -COBJS-y += uboot_skb.o -COBJS-y += uboot_drv.o +COBJS-$(CONFIG_SK98) += uboot_skb.o uboot_drv.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/net/sk98lin/skaddr.c b/drivers/net/sk98lin/skaddr.c index ed79c04..8d34f72 100644 --- a/drivers/net/sk98lin/skaddr.c +++ b/drivers/net/sk98lin/skaddr.c @@ -220,8 +220,6 @@ #include <config.h> -#ifdef CONFIG_SK98 - #ifndef lint static const char SysKonnectFileId[] = "@(#) $Id: skaddr.c,v 1.48 2003/02/12 17:09:37 tschilli Exp $ (C) SysKonnect."; @@ -1875,5 +1873,3 @@ SK_U32 ToPortNumber) /* Port2 Index */ #ifdef __cplusplus } #endif /* __cplusplus */ - -#endif /* CONFIG_SK98 */ diff --git a/drivers/net/sk98lin/skcsum.c b/drivers/net/sk98lin/skcsum.c index a5dc572..162b67d 100644 --- a/drivers/net/sk98lin/skcsum.c +++ b/drivers/net/sk98lin/skcsum.c @@ -72,8 +72,6 @@ #include <config.h> -#ifdef CONFIG_SK98 - #ifdef SK_USE_CSUM /* Check if CSUM is to be used. */ #ifndef lint @@ -925,5 +923,3 @@ SK_EVPARA Param) /* Event dependent parameter. */ } /* SkCsEvent */ #endif /* SK_USE_CSUM */ - -#endif /* CONFIG_SK98 */ diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c index e1d7e87..c815480 100644 --- a/drivers/net/sk98lin/skge.c +++ b/drivers/net/sk98lin/skge.c @@ -342,8 +342,6 @@ #include <config.h> -#ifdef CONFIG_SK98 - #include "h/skversion.h" #if 0 #include <linux/module.h> @@ -4860,5 +4858,3 @@ int l; } /* DumpLong */ #endif - -#endif /* CONFIG_SK98 */ diff --git a/drivers/net/sk98lin/skgehwt.c b/drivers/net/sk98lin/skgehwt.c index f8681a8..ca08eb1 100644 --- a/drivers/net/sk98lin/skgehwt.c +++ b/drivers/net/sk98lin/skgehwt.c @@ -75,8 +75,6 @@ #include <config.h> -#ifdef CONFIG_SK98 - /* Event queue and dispatcher */ @@ -214,7 +212,4 @@ SK_IOC Ioc) /* IoContext */ pAC->Hwt.TStop = pAC->Hwt.TStart; SkTimerDone(pAC,Ioc) ; } - -#endif /* CONFIG_SK98 */ - /* End of file */ diff --git a/drivers/net/sk98lin/skgeinit.c b/drivers/net/sk98lin/skgeinit.c index e49685b..ab740c7 100644 --- a/drivers/net/sk98lin/skgeinit.c +++ b/drivers/net/sk98lin/skgeinit.c @@ -395,8 +395,6 @@ #include <config.h> -#ifdef CONFIG_SK98 - #include "h/skdrv1st.h" #include "h/skdrv2nd.h" @@ -2367,5 +2365,3 @@ int Port) /* Port to configure */ return(0); } /* SkGeInitPort */ - -#endif /* CONFIG_SK98 */ diff --git a/drivers/net/sk98lin/skgemib.c b/drivers/net/sk98lin/skgemib.c index 4a9e9e6..7f62e9c 100644 --- a/drivers/net/sk98lin/skgemib.c +++ b/drivers/net/sk98lin/skgemib.c @@ -52,8 +52,6 @@ #include <config.h> -#ifdef CONFIG_SK98 - /* * PRIVATE OID handler function prototypes */ @@ -1056,5 +1054,3 @@ PNMI_STATIC const SK_PNMI_TAB_ENTRY IdTable[] = { 0, SK_PNMI_RO, Vct, 0}, }; - -#endif /* CONFIG_SK98 */ diff --git a/drivers/net/sk98lin/skgepnmi.c b/drivers/net/sk98lin/skgepnmi.c index 16fa352..d0e33cb 100644 --- a/drivers/net/sk98lin/skgepnmi.c +++ b/drivers/net/sk98lin/skgepnmi.c @@ -434,8 +434,6 @@ #include <config.h> -#ifdef CONFIG_SK98 - static const char SysKonnectFileId[] = "@(#) $Id: skgepnmi.c,v 1.102 2002/12/16 14:03:24 tschilli Exp $" " (C) SysKonnect."; @@ -8306,5 +8304,3 @@ SK_U32 PhysPortIndex) } } /* CheckVctStatus */ - -#endif /* CONFIG_SK98 */ diff --git a/drivers/net/sk98lin/skgesirq.c b/drivers/net/sk98lin/skgesirq.c index c9763e7..106fe48 100644 --- a/drivers/net/sk98lin/skgesirq.c +++ b/drivers/net/sk98lin/skgesirq.c @@ -339,8 +339,6 @@ #include <config.h> -#ifdef CONFIG_SK98 - /* * Special Interrupt handler * @@ -2412,6 +2410,4 @@ SK_U16 IStatus) /* Interrupt Status */ } /* SkPhyIsrLone */ #endif /* OTHER_PHY */ -#endif /* CONFIG_SK98 */ - /* End of File */ diff --git a/drivers/net/sk98lin/ski2c.c b/drivers/net/sk98lin/ski2c.c index 0c5d9b4..894cc67 100644 --- a/drivers/net/sk98lin/ski2c.c +++ b/drivers/net/sk98lin/ski2c.c @@ -230,8 +230,6 @@ #include <config.h> -#ifdef CONFIG_SK98 - /* * I2C Protocol */ @@ -1501,5 +1499,3 @@ SK_EVPARA Para) /* Event specific Parameter */ } /* SkI2cEvent*/ #endif /* !SK_DIAG */ - -#endif /* CONFIG_SK98 */ diff --git a/drivers/net/sk98lin/sklm80.c b/drivers/net/sk98lin/sklm80.c index 0229877..9f455f7 100644 --- a/drivers/net/sk98lin/sklm80.c +++ b/drivers/net/sk98lin/sklm80.c @@ -100,8 +100,6 @@ #include <config.h> -#ifdef CONFIG_SK98 - /* LM80 functions */ @@ -288,5 +286,3 @@ SK_SENSOR *pSen) /* Sensor to be read */ /* Not completed */ return(0); } - -#endif /* CONFIG_SK98 */ diff --git a/drivers/net/sk98lin/skproc.c b/drivers/net/sk98lin/skproc.c index 94a6a56..9325ee7 100644 --- a/drivers/net/sk98lin/skproc.c +++ b/drivers/net/sk98lin/skproc.c @@ -72,8 +72,6 @@ #include <config.h> -#ifdef CONFIG_SK98 - #include <linux/proc_fs.h> #include "h/skdrv1st.h" @@ -510,5 +508,3 @@ char * SkNumber(char * str, long long num, int base, int size, int precision return strorg; } - -#endif /* CONFIG_SK98 */ diff --git a/drivers/net/sk98lin/skqueue.c b/drivers/net/sk98lin/skqueue.c index c49baed..de7441e 100644 --- a/drivers/net/sk98lin/skqueue.c +++ b/drivers/net/sk98lin/skqueue.c @@ -89,8 +89,6 @@ #include <config.h> -#ifdef CONFIG_SK98 - /* Event queue and dispatcher */ @@ -237,6 +235,4 @@ SK_IOC Ioc) /* Io context */ return(0) ; } -#endif /* CONFIG_SK98 */ - /* End of file */ diff --git a/drivers/net/sk98lin/skrlmt.c b/drivers/net/sk98lin/skrlmt.c index 14a6f40..2e7924d 100644 --- a/drivers/net/sk98lin/skrlmt.c +++ b/drivers/net/sk98lin/skrlmt.c @@ -282,8 +282,6 @@ #include <config.h> -#ifdef CONFIG_SK98 - #ifndef lint static const char SysKonnectFileId[] = "@(#) $Id: skrlmt.c,v 1.68 2003/01/31 15:26:56 rschmidt Exp $ (C) SysKonnect."; @@ -3504,5 +3502,3 @@ SK_EVPARA Para) /* Event-specific parameter */ #ifdef __cplusplus } #endif /* __cplusplus */ - -#endif /* CONFIG_SK98 */ diff --git a/drivers/net/sk98lin/sktimer.c b/drivers/net/sk98lin/sktimer.c index 37cd4c9..8363ce4 100644 --- a/drivers/net/sk98lin/sktimer.c +++ b/drivers/net/sk98lin/sktimer.c @@ -74,8 +74,6 @@ #include <config.h> -#ifdef CONFIG_SK98 - /* Event queue and dispatcher */ @@ -292,6 +290,4 @@ int Restart) /* Do we need to restart the Hardware timer ? */ } } -#endif /* CONFIG_SK98 */ - /* End of file */ diff --git a/drivers/net/sk98lin/skvpd.c b/drivers/net/sk98lin/skvpd.c index 429da82..7935195 100644 --- a/drivers/net/sk98lin/skvpd.c +++ b/drivers/net/sk98lin/skvpd.c @@ -162,8 +162,6 @@ #include <config.h> -#ifdef CONFIG_SK98 - /* Please refer skvpd.txt for infomation how to include this module */ @@ -1325,5 +1323,3 @@ char *msg) /* error log message */ (void)VpdUpdate(pAC, IoC); } - -#endif /* CONFIG_SK98 */ diff --git a/drivers/net/sk98lin/skxmac2.c b/drivers/net/sk98lin/skxmac2.c index 7946000..e0ded42 100644 --- a/drivers/net/sk98lin/skxmac2.c +++ b/drivers/net/sk98lin/skxmac2.c @@ -412,8 +412,6 @@ #include <config.h> -#ifdef CONFIG_SK98 - #include "h/skdrv1st.h" #include "h/skdrv2nd.h" @@ -4391,6 +4389,4 @@ SK_BOOL StartTest) /* flag for start / get result */ return(0); } /* SkGmCableDiagStatus */ -#endif /* CONFIG_SK98 */ - /* End of file */ diff --git a/drivers/net/sk98lin/uboot_drv.c b/drivers/net/sk98lin/uboot_drv.c index d02cd1b..8b04842 100644 --- a/drivers/net/sk98lin/uboot_drv.c +++ b/drivers/net/sk98lin/uboot_drv.c @@ -25,9 +25,6 @@ #include <common.h> -#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) && \ - defined(CONFIG_SK98) - #include "h/skdrv1st.h" #include "h/skdrv2nd.h" #include "u-boot_compat.h" @@ -138,6 +135,3 @@ static int skge_recv(struct eth_device *dev) return 0; } - - -#endif /* CONFIG_SK98 */ diff --git a/drivers/net/sk98lin/uboot_skb.c b/drivers/net/sk98lin/uboot_skb.c index 3a487a8..487f01e 100644 --- a/drivers/net/sk98lin/uboot_skb.c +++ b/drivers/net/sk98lin/uboot_skb.c @@ -24,9 +24,6 @@ */ #include <config.h> - -#ifdef CONFIG_SK98 - #include <common.h> #include "u-boot_compat.h" @@ -118,5 +115,3 @@ void skb_put(struct sk_buff *skb, unsigned int len) { skb->len+=len; } - -#endif /* CONFIG_SK98 */ -- 1.5.4.3

1 0

[U-Boot-Users] [Invitation] (No Subject) @ Sat Jul 12 11am – 12pm ()
by Kyungmin Park 12 Jul '08

12 Jul '08

u-boot-users(a)lists.sourceforge.net, you are invited to Title: (No Subject) Time: Sat Jul 12 11am – 12pm (Timezone: Seoul) Calendar: Description: On Sat, Jul 12, 2008 at 6:43 AM, Scott Wood wrote: > On Mon, Jul 07, 2008 at 11:22:56AM +0900, Kyungmin Park wrote: >> +static int part_validate_onenand(struct mtdids *id, struct part_info *part) >> +{ >> +#if defined(CONFIG_CMD_ONENAND) >> + /* info for OneNAND chips */ >> + struct mtd_info *mtd; >> + >> + mtd = &onenand_mtd; >> + >> + if ((unsigned long)(part->offset) % mtd->erasesize) { >> + printf("%s%d: partition (%s) start offset" >> + "alignment incorrect\n", >> + MTD_DEV_TYPE(id->type), id->num, part->name); >> + return 1; >> + } >> + >> + if (part->size % mtd->erasesize) { >> + printf("%s%d: partition (%s) size alignment incorrect\n", >> + MTD_DEV_TYPE(id->type), id->num, part->name); >> + return 1; >> + } >> + >> + return 0; >> +#else >> + return 1; >> +#endif >> +} > > This looks like a duplicate of part_validate_nand (note that nand_info_t > is just an obfuscatory alias of struct mtd_info). > >> +static int read_onenand_cached(u32 off, u32 size, u_char *buf) >> +{ >> + u32 bytes_read = 0; >> + size_t retlen; >> + int cpy_bytes; >> + >> + while (bytes_read < size) { >> + if ((off + bytes_read < onenand_cache_off) || >> + (off + bytes_read >= onenand_cache_off + ONENAND_CACHE_SIZE)) { >> + onenand_cache_off = (off + bytes_read) & ONENAND_PAGE_MASK; >> + if (!onenand_cache) { >> + /* This memory never gets freed but 'cause >> + it's a bootloader, nobody cares */ >> + onenand_cache = malloc(ONENAND_CACHE_SIZE); >> + if (!onenand_cache) { >> + printf("read_onenand_cached: can't alloc cache size %d bytes\n", >> + ONENAND_CACHE_SIZE); >> + return -1; >> + } >> + } >> + >> + retlen = ONENAND_CACHE_SIZE; >> + if (onenand_read(&onenand_mtd, onenand_cache_off, retlen, >> + &retlen, onenand_cache) != 0 || >> + retlen != ONENAND_CACHE_SIZE) { >> + printf("read_onenand_cached: error reading nand off %#x size %d bytes\n", >> + onenand_cache_off, ONENAND_CACHE_SIZE); >> + return -1; >> + } >> + } >> + cpy_bytes = onenand_cache_off + ONENAND_CACHE_SIZE - (off + bytes_read); >> + if (cpy_bytes > size - bytes_read) >> + cpy_bytes = size - bytes_read; >> + memcpy(buf + bytes_read, >> + onenand_cache + off + bytes_read - onenand_cache_off, >> + cpy_bytes); >> + bytes_read += cpy_bytes; >> + } >> + return bytes_read; >> +} > > I really would rather not duplicate all of this, which looks extremely > similar to regular NAND. Is there reason why we don't use the mtd_info > function pointer interface? Agreed, It's almost same as NAND code. Now nand code uses two modes, legacy and mtd. Because I don't want to break the NAND code , I used the duplicated code. Basically it should be used the common mtd style code except legacy. So first it added the current code, next time it tries to use the common interface and some code clean up. Thank you, Kyungmin Park You can view this event at http://www.google.com/calendar/event?action=VIEW&eid=NDlrY25wdnZubGJwdTRtdH… You are receiving this courtesy email at the account u-boot-users(a)lists.sourceforge.net because you are an attendee of this event. To stop receiving future notifications for this event, decline this event. Alternatively you can sign up for a Google account at http://www.google.com/calendar/ and control your notification settings for your entire calendar.

1 0

Re: [U-Boot-Users] PATCH for U-Boot 1.3.3 DHCP fails with netgearWGR614v6
by Ben Warren 12 Jul '08

12 Jul '08

Hi Robin, Robin Getz wrote: > On Fri 11 Jul 2008 14:21, Ben Warren pondered: > >> Robin Getz wrote: >> > [snip] > >>> >>> >> This seems goofy. Have you tried your fix with other DHCP servers to >> verify that it works? If so, which ones? I unfortunately can't try >> anything right now but will play around a bit tonight. >> > > Some other random netgears that I have in my home, plus whatever is attached > to our corp network - it works on them all (but on those it worked before as > well). > > -Robin While your fix works, wouldn't it be more correct to remove the call to BootpCopyNetParams() on line 927? My understanding of the purpose of the DHCPDISCOVER state is for determining if there are reachable DHCP servers, not for actually acquiring an address. I'm a bit wary because I don't know why that call was put there in the first place. I guess in theory you could short-circuit the DHCPREQUEST state, but the code doesn't do that. thanks, Ben

1 0

[U-Boot-Users] [PATCH] ADS5121 cleanup compile warnings
by John Rigby 11 Jul '08

11 Jul '08

board/ads5121/iopin.c Replace bit fields in struct iopin_t with a single field and intialize it via plain old macros. This fixes the type pun warnings and makes the code more readable. board/ads5121/ads5121.c Add include iopin.h to ads5121.c for the iopin_initialize prototype. Remove unused variables from board_early_init_f Add an extern void ads5121_diu_init(void) Signed-off-by: John Rigby <jrigby(a)freescale.com> --- board/ads5121/ads5121.c | 6 ++- board/ads5121/iopin.c | 111 +++++++++++++++++++++++++++------------------- 2 files changed, 69 insertions(+), 48 deletions(-) diff --git a/board/ads5121/ads5121.c b/board/ads5121/ads5121.c index de59991..e622e35 100644 --- a/board/ads5121/ads5121.c +++ b/board/ads5121/ads5121.c @@ -23,6 +23,7 @@ #include <common.h> #include <mpc512x.h> +#include "iopin.h" #include <asm/bitops.h> #include <command.h> #include <fdt_support.h> @@ -47,13 +48,14 @@ #define CSAW_START(start) ((start) & 0xFFFF0000) #define CSAW_STOP(start, size) (((start) + (size) - 1) >> 16) +extern void ads5121_diu_init(void); + long int fixed_sdram(void); int board_early_init_f (void) { volatile immap_t *im = (immap_t *) CFG_IMMR; - u32 lpcaw, tmp32; - int i; + u32 lpcaw; /* * Initialize Local Window for the CPLD registers access (CS2 selects diff --git a/board/ads5121/iopin.c b/board/ads5121/iopin.c index 6a35c81..a6792a0 100644 --- a/board/ads5121/iopin.c +++ b/board/ads5121/iopin.c @@ -25,71 +25,90 @@ #include <linux/types.h> #include "iopin.h" -/* - * IO PAD TYPES - * for all types fmux is used to select the funtion - * ds sets the slew rate - * STD pins nothing extra (can set ds & fmux only) - * STD_PU pue=1 to enable pull & pud sets whether up or down resistors - * STD_ST st sets the Schmitt trigger - * STD_PU_ST pue & pud sets pull-up/down resistors as in STD_PU - * st sets the Schmitt trigger - * PCI hold sets output delay - * PCI_ST hold sets output delay and st sets the Schmitt trigger - */ +/* IO pin fields */ +#define IO_PIN_FMUX(v) ((v) << 7) /* pin function */ +#define IO_PIN_HOLD(v) ((v) << 5) /* hold time, pci only */ +#define IO_PIN_PUD(v) ((v) << 4) /* if PUE, 0=pull-down, 1=pull-up */ +#define IO_PIN_PUE(v) ((v) << 3) /* pull up/down enable */ +#define IO_PIN_ST(v) ((v) << 2) /* schmitt trigger */ +#define IO_PIN_DS(v) ((v)) /* slew rate */ static struct iopin_t { - u_short p_offset; /* offset from IOCTL_MEM_OFFSET */ - u_short p_no; /* number of pins to set this way */ - u_short bit_or:7; /* Do bitwise OR instead of setting */ - u_short fmux:2; /* pad function select 0-3 */ - u_short hold:2; /* PCI pad types only; */ - u_short pud:1; /* pull resistor; PU types only; */ - /* if pue=1 then 0=pull-down, 1=pull-up */ - u_short pue:1; /* Pull resistor enable; _PU types only */ - u_short st:1; /* Schmitt trigger enable; _ST types only */ - u_short ds:2; /* Slew rate class, 0=class1, ..., 3=class4 */ + int p_offset; /* offset from IOCTL_MEM_OFFSET */ + int nr_pins; /* number of pins to set this way */ + int bit_or; /* or in the value instead of overwrite */ + u_long val; /* value to write or or */ } ioregs_init[] = { -/* FUNC1=FEC_RX_DV Sets Next 3 to FEC pads */ - {IOCTL_SPDIF_TXCLK, 3, 0, 1, 0, 0, 0, 0, 3}, -/* Set highest Slew on 9 PATA pins */ - {IOCTL_PATA_CE1, 9, 1, 0, 0, 0, 0, 0, 3}, -/* FUNC1=FEC_COL Sets Next 15 to FEC pads */ - {IOCTL_PSC0_0, 15, 0, 1, 0, 0, 0, 0, 3}, -/* FUNC1=SPDIF_TXCLK */ - {IOCTL_LPC_CS1, 1, 0, 1, 0, 0, 0, 1, 3}, -/* FUNC2=SPDIF_TX and sets Next pin to SPDIF_RX */ - {IOCTL_I2C1_SCL, 2, 0, 2, 0, 0, 0, 1, 3}, -/* FUNC2=DIU CLK */ - {IOCTL_PSC6_0, 1, 0, 2, 0, 0, 0, 1, 3}, -/* FUNC2=DIU_HSYNC */ - {IOCTL_PSC6_1, 1, 0, 2, 0, 0, 0, 0, 3}, -/* FUNC2=DIUVSYNC Sets Next 26 to DIU Pads */ - {IOCTL_PSC6_4, 26, 0, 2, 0, 0, 0, 0, 3} + /* FUNC1=FEC_RX_DV Sets Next 3 to FEC pads */ + { + IOCTL_SPDIF_TXCLK, 3, 0, + IO_PIN_FMUX(1) | IO_PIN_HOLD(0) | IO_PIN_PUD(0) | + IO_PIN_PUE(0) | IO_PIN_ST(0) | IO_PIN_DS(3) + }, + /* Set highest Slew on 9 PATA pins */ + { + IOCTL_PATA_CE1, 9, 1, + IO_PIN_FMUX(0) | IO_PIN_HOLD(0) | IO_PIN_PUD(0) | + IO_PIN_PUE(0) | IO_PIN_ST(0) | IO_PIN_DS(3) + }, + /* FUNC1=FEC_COL Sets Next 15 to FEC pads */ + { + IOCTL_PSC0_0, 15, 0, + IO_PIN_FMUX(1) | IO_PIN_HOLD(0) | IO_PIN_PUD(0) | + IO_PIN_PUE(0) | IO_PIN_ST(0) | IO_PIN_DS(3) + }, + /* FUNC1=SPDIF_TXCLK */ + { + IOCTL_LPC_CS1, 1, 0, + IO_PIN_FMUX(1) | IO_PIN_HOLD(0) | IO_PIN_PUD(0) | + IO_PIN_PUE(0) | IO_PIN_ST(1) | IO_PIN_DS(3) + }, + /* FUNC2=SPDIF_TX and sets Next pin to SPDIF_RX */ + { + IOCTL_I2C1_SCL, 2, 0, + IO_PIN_FMUX(2) | IO_PIN_HOLD(0) | IO_PIN_PUD(0) | + IO_PIN_PUE(0) | IO_PIN_ST(1) | IO_PIN_DS(3) + }, + /* FUNC2=DIU CLK */ + { + IOCTL_PSC6_0, 1, 0, + IO_PIN_FMUX(2) | IO_PIN_HOLD(0) | IO_PIN_PUD(0) | + IO_PIN_PUE(0) | IO_PIN_ST(1) | IO_PIN_DS(3) + }, + /* FUNC2=DIU_HSYNC */ + { + IOCTL_PSC6_1, 1, 0, + IO_PIN_FMUX(2) | IO_PIN_HOLD(0) | IO_PIN_PUD(0) | + IO_PIN_PUE(0) | IO_PIN_ST(0) | IO_PIN_DS(3) + }, + /* FUNC2=DIUVSYNC Sets Next 26 to DIU Pads */ + { + IOCTL_PSC6_4, 26, 0, + IO_PIN_FMUX(2) | IO_PIN_HOLD(0) | IO_PIN_PUD(0) | + IO_PIN_PUE(0) | IO_PIN_ST(0) | IO_PIN_DS(3) + } }; void iopin_initialize(void) { short i, j, n, p; u_long *reg; + immap_t *im = (immap_t *)CFG_IMMR; + + reg = (u_long *)&(im->io_ctrl.regs[0]); if (sizeof(ioregs_init) == 0) return; - immap_t *im = (immap_t *)CFG_IMMR; - reg = (u_long *)&(im->io_ctrl.regs[0]); n = sizeof(ioregs_init) / sizeof(ioregs_init[0]); for (i = 0; i < n; i++) { for (p = 0, j = ioregs_init[i].p_offset / sizeof(u_long); - p < ioregs_init[i].p_no; p++, j++) { - /* lowest 9 bits sets the register */ + p < ioregs_init[i].nr_pins; p++, j++) { if (ioregs_init[i].bit_or) - reg[j] |= *((u_long *) &ioregs_init[i].p_no) - & 0x000001ff; + reg[j] |= ioregs_init[i].val; else - reg[j] = *((u_long *) &ioregs_init[i].p_no) - & 0x000001ff; + reg[j] = ioregs_init[i].val; } } return; --

1 0

[U-Boot-Users] [PATCH] Fixed some out-of-tree build issues
by Wolfgang Denk 11 Jul '08

11 Jul '08

Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- board/freescale/m5275evb/Makefile | 2 +- tools/gdb/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/freescale/m5275evb/Makefile b/board/freescale/m5275evb/Makefile index ef0b19e..f337a75 100644 --- a/board/freescale/m5275evb/Makefile +++ b/board/freescale/m5275evb/Makefile @@ -31,7 +31,7 @@ SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) SOBJS := $(addprefix $(obj),$(SOBJS)) -$(LIB): .depend $(OBJS) +$(LIB): $(obj).depend $(OBJS) $(AR) $(ARFLAGS) $@ $(OBJS) ######################################################################### diff --git a/tools/gdb/Makefile b/tools/gdb/Makefile index 632103d..c44cc8a 100644 --- a/tools/gdb/Makefile +++ b/tools/gdb/Makefile @@ -47,7 +47,7 @@ HOSTOS := $(shell uname -s | sed -e 's/$[Cc][Yy][Gg][Ww][Ii][Nn]$.*/cygwin/') ifeq ($(HOSTOS),cygwin) all: -.depend: +$(obj).depend: else # ! CYGWIN -- 1.5.6.1

1 1