December 2008 - U-Boot

[U-Boot] [PATCH v2 2/2] ppc4xx: Add SPI helper routines for the 440EPX
by Steven A. Falco 09 Dec '08

09 Dec '08

This patch adds helper routines needed in support of the 440EPx SPI driver. Signed-off-by: Steven A. Falco <sfalco(a)harris.com> --- Regarding Wolfgang's comments: The style I saw in the existing code is to have these three functions in a board-specific file. That way, the routines can exclude any chip selects that are not applicable to a specific hardware platform. Also, the chip-selects could be on a GPIO expander, in which case the activate/deactivate routines might have to deal with the GPIO expander device. So, following the existing style, I think these routines should not be part of the generic driver. Otherwise, we could get into the situation where many ifdefs would be needed in the generic driver to handle the board-specific details. board/amcc/sequoia/sequoia.c | 20 ++++++++++++++++++++ include/configs/sequoia.h | 4 ++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/board/amcc/sequoia/sequoia.c b/board/amcc/sequoia/sequoia.c index d6668e2..cd08a77 100644 --- a/board/amcc/sequoia/sequoia.c +++ b/board/amcc/sequoia/sequoia.c @@ -26,6 +26,7 @@ #include <libfdt.h> #include <fdt_support.h> #include <ppc4xx.h> +#include <spi.h> #include <asm/gpio.h> #include <asm/processor.h> #include <asm/io.h> @@ -513,3 +514,22 @@ int post_hotkeys_pressed(void) return 0; /* No hotkeys supported */ } #endif /* CONFIG_POST */ + +#if defined(CONFIG_PPC440EPX_SPI) +int spi_cs_is_valid(unsigned int bus, unsigned int cs) +{ + return bus == 0 && cs >= 0 && cs < 64; +} + +void spi_cs_activate(struct spi_slave *slave) +{ + /* Assumes chip-selects are active-low. */ + gpio_write_bit(slave->cs, 0); +} + +void spi_cs_deactivate(struct spi_slave *slave) +{ + gpio_write_bit(slave->cs, 1); +} +#endif /* CONFIG_PPC440EPX_SPI */ + diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h index 9321bdc..551be98 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -236,6 +236,10 @@ #define CONFIG_SYS_DTT_LOW_TEMP -30 #define CONFIG_SYS_DTT_HYSTERESIS 3 +/* Define these if you are using the SPI port. */ +#undef CONFIG_HARD_SPI +#undef CONFIG_PPC440EPX_SPI + /* * Default environment variables */ -- 1.6.0.2

2 1

[U-Boot] [PPC4xx] Info about emac
by Salvatore Lionetti 09 Dec '08

09 Dec '08

Hi, Could someone explain me why 'ppc_4xx_eth_rx()' call 'NetReceive(...length-4)' Is it FCS, padding, VLAN tag? Thanks Salvatore

2 1

[U-Boot] Two confusing questions about relocation of code on MPC8548CDS board
by hank peng 09 Dec '08

09 Dec '08

After code is relocated, cpu jumped from flash to RAM, I have two questions I can't understand. Any help will be appreciated greatly. 1. Because TEXT_BASE=0xfff80000 which points to flash space, after code is copied from flash to RAM and start to run from RAM, how can u-boot make sure code is place independent? For example, what if I write such code as follows: <code> lis r0, LABEL@h ori r0, r0, LABEL@l mtlr r0 blr </code> Here, symbol "LABEL" must be a value which also points to flash space. After "blr" is executed, we go back to flash, right? 2. Similar as question 1, if I define a global variable like this in a C file: static int my_global = 1; powerpc-linux-readelf command shows that my_global located in .data section and its symbol value also points to flash space. When running in RAM, if I want to change its value: my_global = 2; I don't know how compilor translate this C code into assembly, if it uses absolute address to locate my_global, I think writing can't be operated, so does compilor use relative address to locate my_global? But how? -- The simplest is not all best but the best is surely the simplest!

1 0

[U-Boot] [PATCH] sh: Update sh2/sh2a timer
by Nobuhiro Iwamatsu 09 Dec '08

09 Dec '08

Renesas SH2/SH2A timer broken. This patch fix timer function. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro(a)renesas.com> --- lib_sh/time_sh2.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lib_sh/time_sh2.c b/lib_sh/time_sh2.c index fcbb921..4f893c8 100644 --- a/lib_sh/time_sh2.c +++ b/lib_sh/time_sh2.c @@ -65,8 +65,8 @@ unsigned long long get_ticks(void) return cmt0_timer; } -static vu_long cmcnt; -ulong get_timer(ulong base) +static vu_long cmcnt = 0; +static unsigned long get_usec (void) { ulong data = readw(CMCNT_0); @@ -81,7 +81,13 @@ ulong get_timer(ulong base) cmt0_timer += cmcnt; cmcnt = data; - return cmt0_timer - base; + return cmt0_timer; +} + +/* return msec */ +ulong get_timer(ulong base) +{ + return (get_usec()/1000) - base; } void set_timer(ulong t) @@ -99,9 +105,9 @@ void reset_timer(void) void udelay(unsigned long usec) { - unsigned int start = get_timer(0); + unsigned long end = get_usec() + usec; - while (get_timer((ulong) start) < (usec * (CONFIG_SYS_HZ / 1000000))) + while (get_usec() < end) continue; } -- 1.5.6.5

1 0

[U-Boot] [PPC4xx] Info about emac
by Salvatore Lionetti 09 Dec '08

09 Dec '08

Hi, Could someone explain me why 'ppc_4xx_eth_rx()' call 'NetReceive(...length-4)' Is it FCS, padding, VLAN tag? Thanks Salvatore --- Mar 9/12/08, u-boot-request(a)lists.denx.de <u-boot-request(a)lists.denx.de> ha scritto: > Da: u-boot-request(a)lists.denx.de <u-boot-request(a)lists.denx.de> > Oggetto: U-Boot Digest, Vol 7, Issue 67 > A: u-boot(a)lists.denx.de > Data: Martedì 9 dicembre 2008, 01:06 > Send U-Boot mailing list submissions to > u-boot(a)lists.denx.de > > To subscribe or unsubscribe via the World Wide Web, visit > http://lists.denx.de/mailman/listinfo/u-boot > or, via email, send a message with subject or body > 'help' to > u-boot-request(a)lists.denx.de > > You can reach the person managing the list at > u-boot-owner(a)lists.denx.de > > When replying, please edit your Subject line so it is more > specific > than "Re: Contents of U-Boot digest..." > > > Today's Topics: > > 1. Re: [PATCH 1/1] Make FAT code comply to coding rules. > (Wolfgang Denk) > 2. Re: [PATCH] OneNAND: Fix compiler warnings (Kyungmin > Park) > 3. Re: [PATCH 3/4]v2: Cleanup bootvx and handle new > CONFIG_SYS_VXWORKS parameters (Wolfgang Denk) > 4. [PATCH] vxworks.h: Fix build problem introduced by > commits > 29a4c24d/e9084b23 (Wolfgang Denk) > 5. [PATCH] MAKEALL: Automatically use parallel builds > (Wolfgang Denk) > 6. Re: [PATCH] Section name should be ".data" > not "data" > (Wolfgang Denk) > 7. Re: Pull request - net (Wolfgang Denk) > 8. Re: AT91 Pull request (Wolfgang Denk) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Mon, 08 Dec 2008 23:40:36 +0100 > From: Wolfgang Denk <wd(a)denx.de> > Subject: Re: [U-Boot] [PATCH 1/1] Make FAT code comply to > coding > rules. > To: Remy B?hmer <linux(a)bohmer.net> > Cc: u-boot(a)lists.denx.de > Message-ID: > <20081208224036.34716834B020(a)gemini.denx.de> > Content-Type: text/plain; charset=ISO-8859-1 > > Dear =?utf-8?q?Remy=20B=C3=B6hmer?=, > > In message > <1228772871-19776-1-git-send-email-linux(a)bohmer.net> > you wrote: > > Currently the fat code is messy related to Coding > rules. > > ...but your new code has new issues, too. > > > - if (cur_dev->block_read) { > > - return cur_dev->block_read (cur_dev->dev > > - , startblock, getsize, (unsigned long *)bufptr); > > - } > > + if (cur_dev->block_read) > > + return cur_dev->block_read(cur_dev->dev, > startblock, nofblocks, > > + (unsigned long *)bufptr); > > Multi-line statements do require the curly braces, and two > lines is > multi-line. > > And this... > > > - actsize=bytesperclust; > > - endclust=curclust; > > - do { > > + actsize = bytesperclust; > > + endclust = curclust; > > + for (;;) { > > /* search for consecutive clusters */ > > - while(actsize < filesize) { > > + while (actsize < filesize) { > > newclust = get_fatent(mydata, endclust); > > - if((newclust -1)!=endclust) > > - goto getit; > > + if ((newclust - 1) != endclust) { > > + if (get_cluster(mydata, curclust, buffer, > > + (int)actsize) != 0) { > > + FAT_ERROR("Error reading > cluster\n"); > > + return -1; > > + } > > + gotsize += (int)actsize; > > + filesize -= actsize; > > + buffer += actsize; > > + curclust = get_fatent(mydata, endclust); > > + if (CHECK_CLUST(curclust, mydata->fatsize)) { > > + FAT_DPRINT("curclust: 0x%x\n", > > + curclust); > > + FAT_ERROR("Invalid FAT entry\n"); > > + return gotsize; > > + } > > + actsize = bytesperclust; > > + endclust = curclust; > > + continue; > > + } > > ...looks like a massive code change, not only a coding > style cleanup. > Please submit as two separate patches. > > 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 > I'm a programmer: I don't buy software, I write it. > -- Tom > Christiansen > > > ------------------------------ > > Message: 2 > Date: Tue, 9 Dec 2008 08:17:32 +0900 > From: "Kyungmin Park" > <kmpark(a)infradead.org> > Subject: Re: [U-Boot] [PATCH] OneNAND: Fix compiler > warnings > To: "Wolfgang Denk" <wd(a)denx.de> > Cc: scottwood(a)freescale.com, u-boot(a)lists.denx.de, Stefan > Roese > <sr(a)denx.de> > Message-ID: > <9c9fda240812081517k6ffaa185p6aa483b9a86a653e(a)mail.gmail.com> > Content-Type: text/plain; charset=ISO-8859-1 > > On Tue, Dec 9, 2008 at 5:44 AM, Wolfgang Denk > <wd(a)denx.de> wrote: > > Hi all, > > > > In message > <1226395733-24610-1-git-send-email-sr(a)denx.de> you > wrote: > >> Signed-off-by: Stefan Roese <sr(a)denx.de> > >> --- > >> This patch has to be applied on top of the patch > submitted by Kyungmin Park > >> on 2008-11-04: > >> [PATCH] [OneNAND] Sync with 2.6.27 > > > > I have to admit that I completely lost track of all > the OneNAND > > patches floating around and being sent and resent and > resent again. > > > > This is especially the case since none of the boards I > am familiar > > with uses OneNAND, sso I have zero experience and > little ways to test > > anything. > > > > > > In short: we need a OneNAND custodian, and we need him > badly. > > > > Is any of you volunteering, or knows of a potential > candidate? > > > > Stefan, > > Even though It's some difficult to access the external > server, I can > access http protocol. So I can pull the git. So if you > control the git > then I generate and send a patch against the OneNAND tree. > > Or other ideas? > > Thank you, > Kyungmin Park > > > ------------------------------ > > Message: 3 > Date: Tue, 09 Dec 2008 00:28:45 +0100 > From: Wolfgang Denk <wd(a)denx.de> > Subject: Re: [U-Boot] [PATCH 3/4]v2: Cleanup bootvx and > handle new > CONFIG_SYS_VXWORKS parameters > To: Niklaus Giger <niklaus.giger(a)member.fsf.org> > Cc: u-boot(a)lists.denx.de > Message-ID: > <20081208232845.81CFF834B020(a)gemini.denx.de> > Content-Type: text/plain; charset=ISO-8859-1 > > Dear Niklaus Giger, > > In message > <200811032215.35182.niklaus.giger(a)member.fsf.org> you > wrote: > > Signed-off-by: Niklaus Giger > <niklaus.giger(a)member.fsf.org> > > --- > > common/cmd_elf.c | 81 > ++++++++++++++++++++---------------------------------- > > 1 files changed, 30 insertions(+), 51 deletions(-) > > Argh... > > This commit breaks building ofr a lot of boards: > > -> MAKEALL sequoia > Configuring for sequoia board... > cmd_elf.c: In function 'do_bootvx': > cmd_elf.c:170: error: 'srv' undeclared (first use > in this function) > cmd_elf.c:170: error: (Each undeclared identifier is > reported only once > cmd_elf.c:170: error: for each function it appears in.) > make[1]: *** [cmd_elf.o] Error 1 > > > > Will send a patch soon... > > 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 > "Today's robots are very primitive, capable of > understanding only a > few simple instructions such as 'go left', > 'go right', and 'build > car'." > - John Sladek > > > ------------------------------ > > Message: 4 > Date: Tue, 9 Dec 2008 00:28:48 +0100 > From: Wolfgang Denk <wd(a)denx.de> > Subject: [U-Boot] [PATCH] vxworks.h: Fix build problem > introduced by > commits 29a4c24d/e9084b23 > To: u-boot(a)lists.denx.de > Cc: niklaus.giger(a)member.fsf.org > Message-ID: > <1228778928-20916-1-git-send-email-wd(a)denx.de> > > Signed-off-by: Wolfgang Denk <wd(a)denx.de> > --- > include/vxworks.h | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/include/vxworks.h b/include/vxworks.h > index 548e8e8..1633904 100644 > --- a/include/vxworks.h > +++ b/include/vxworks.h > @@ -47,7 +47,7 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, > int argc, char *argv[]); > #endif > > #ifndef CONFIG_SYS_VXWORKS_SERVERNAME > -#define CONFIG_SYS_VXWORKS_SERVERNAME srv > +#define CONFIG_SYS_VXWORKS_SERVERNAME "srv" > #endif > > #endif > -- > 1.5.6.5 > > > > ------------------------------ > > Message: 5 > Date: Tue, 9 Dec 2008 00:41:25 +0100 > From: Wolfgang Denk <wd(a)denx.de> > Subject: [U-Boot] [PATCH] MAKEALL: Automatically use > parallel builds > To: u-boot(a)lists.denx.de > Message-ID: > <1228779685-21108-1-git-send-email-wd(a)denx.de> > > Add logic to the MAKEALL script to determine the number of > CPU cores > on the system, and run a parallel build if there is more > than one. > Usually this significantrly accelerates builds. > > Allow to manually adjust the number of parallel make jobs > by using > the "BUILD_NCPUS" environment variable. > > Signed-off-by: Wolfgang Denk <wd(a)denx.de> > --- > MAKEALL | 11 ++++++++++- > 1 files changed, 10 insertions(+), 1 deletions(-) > > diff --git a/MAKEALL b/MAKEALL > index dbed268..a16549c 100755 > --- a/MAKEALL > +++ b/MAKEALL > @@ -1,6 +1,15 @@ > #!/bin/sh > > -: ${JOBS:=} > +# Determine number of CPU cores if no default was set > +: ${BUILD_NCPUS:="`getconf _NPROCESSORS_ONLN`"} > + > +if [ "$BUILD_NCPUS" -gt 1 ] > +then > + JOBS=-j`expr "$BUILD_NCPUS" + 1` > +else > + JOBS="" > +fi > + > > if [ "${CROSS_COMPILE}" ] ; then > MAKE="make CROSS_COMPILE=${CROSS_COMPILE}" > -- > 1.5.6.5 > > > > ------------------------------ > > Message: 6 > Date: Tue, 09 Dec 2008 00:51:04 +0100 > From: Wolfgang Denk <wd(a)denx.de> > Subject: Re: [U-Boot] [PATCH] Section name should be > ".data" not > "data" > To: Trent Piepho <tpiepho(a)freescale.com> > Cc: u-boot(a)lists.denx.de > Message-ID: > <20081208235105.1B5D0834B020(a)gemini.denx.de> > Content-Type: text/plain; charset=ISO-8859-1 > > Dear Trent Piepho, > > In message > <1226539788-20929-1-git-send-email-tpiepho(a)freescale.com> > you wrote: > > Signed-off-by: Trent Piepho > <tpiepho(a)freescale.com> > > --- > > drivers/i2c/fsl_i2c.c | 7 +++---- > > 1 files changed, 3 insertions(+), 4 deletions(-) > > Ummm... cpu/mpc8260/i2c.c, cpu/ppc4xx/i2c.c, and > drivers/i2c/soft_i2c.c had the very same problem. > > I fixed these, too, and merged this into your commit. Hope > this is OK > with you. > > 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 > "How to make a million dollars: First, get a million > dollars." > - Steve Martin > > > ------------------------------ > > Message: 7 > Date: Tue, 09 Dec 2008 01:02:35 +0100 > From: Wolfgang Denk <wd(a)denx.de> > Subject: Re: [U-Boot] Pull request - net > To: Ben Warren <biggerbadderben(a)gmail.com> > Cc: U-Boot <u-boot(a)lists.denx.de> > Message-ID: > <20081209000235.8B6F5834B020(a)gemini.denx.de> > Content-Type: text/plain; charset=ISO-8859-1 > > Dear Ben Warren, > > In message <4938D2CF.5080708(a)gmail.com> you wrote: > > Wolfgang, > > > > The following changes since commit > 90665e3d97948000f98846ded37c921c7ae67dd7: > > Wolfgang Denk (1): > > Merge branch 'master' of > git://git.denx.de/u-boot-at91 > > > > are available in the git repository at: > > > > git://git.denx.de/u-boot-net.git master > > > > Anatolij Gustschin (1): > > net: tsec: Fix Marvell 88E1121R phy init > > > > Peter Tyser (4): > > net: Fix download command parsing > > net: Define IP flag field values > > net: Add additional IP fragmentation check > > net: Fix TftpStart() ip:filename bug > > > > common/cmd_net.c | 20 ++++++++++++-------- > > drivers/net/tsec.c | 3 +++ > > include/net.h | 6 ++++++ > > include/tsec.h | 4 ++++ > > net/net.c | 7 ++++--- > > net/tftp.c | 3 +-- > > 6 files changed, 30 insertions(+), 13 deletions(-) > > Applied, thanks. > > 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 > "There is such a fine line between genius and > stupidity." > - David St. Hubbins, "Spinal Tap" > > > ------------------------------ > > Message: 8 > Date: Tue, 09 Dec 2008 01:06:27 +0100 > From: Wolfgang Denk <wd(a)denx.de> > Subject: Re: [U-Boot] AT91 Pull request > To: Jean-Christophe PLAGNIOL-VILLARD > <plagnioj(a)jcrosoft.com> > Cc: U-Boot <u-boot(a)lists.denx.de> > Message-ID: > <20081209000627.E69FA834B020(a)gemini.denx.de> > Content-Type: text/plain; charset=ISO-8859-1 > > Dear Jean-Christophe PLAGNIOL-VILLARD, > > In message <20081206121309.GC2977(a)game.jcrosoft.org> > you wrote: > > Hi Wolfgang, > > Please pull The following changes since commit > 90665e3d97948000f98846ded37c921c7ae67dd7: > > Wolfgang Denk (1): > > Merge branch 'master' of > git://git.denx.de/u-boot-at91 > > > > are available in the git repository at: > > > > git://git.denx.de/u-boot-at91.git master > > > > Nicolas Ferre (1): > > at91: Choose environment variables location > within make config target > > > > Makefile | 60 > +++++++++++++++++++++++--- > > doc/README.at91 | 88 > +++++++++++++++++++++++++++++++++++++++ > > include/configs/at91sam9260ek.h | 4 -- > > include/configs/at91sam9261ek.h | 19 +++++++-- > > include/configs/at91sam9263ek.h | 3 - > > include/configs/at91sam9rlek.h | 3 - > > 6 files changed, 156 insertions(+), 21 deletions(-) > > create mode 100644 doc/README.at91 > > Applied, thanks. > > 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 > The management question ... is not _whether_ to build a > pilot system > and throw it away. You _will_ do that. The only question > is whether > to plan in advance to build a throwaway, or to promise to > deliver the > throwaway to customers. - Fred Brooks, "The > Mythical Man Month" > > > ------------------------------ > > _______________________________________________ > U-Boot mailing list > U-Boot(a)lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot > > > End of U-Boot Digest, Vol 7, Issue 67 > *************************************

1 0

[U-Boot] AT91 Pull request
by Jean-Christophe PLAGNIOL-VILLARD 09 Dec '08

09 Dec '08

Hi Wolfgang, Please pull The following changes since commit 90665e3d97948000f98846ded37c921c7ae67dd7: Wolfgang Denk (1): Merge branch 'master' of git://git.denx.de/u-boot-at91 are available in the git repository at: git://git.denx.de/u-boot-at91.git master Nicolas Ferre (1): at91: Choose environment variables location within make config target Makefile | 60 +++++++++++++++++++++++--- doc/README.at91 | 88 +++++++++++++++++++++++++++++++++++++++ include/configs/at91sam9260ek.h | 4 -- include/configs/at91sam9261ek.h | 19 +++++++-- include/configs/at91sam9263ek.h | 3 - include/configs/at91sam9rlek.h | 3 - 6 files changed, 156 insertions(+), 21 deletions(-) create mode 100644 doc/README.at91 Best Regards, J.

2 1

[U-Boot] Pull request - net
by Ben Warren 09 Dec '08

09 Dec '08

Wolfgang, The following changes since commit 90665e3d97948000f98846ded37c921c7ae67dd7: Wolfgang Denk (1): Merge branch 'master' of git://git.denx.de/u-boot-at91 are available in the git repository at: git://git.denx.de/u-boot-net.git master Anatolij Gustschin (1): net: tsec: Fix Marvell 88E1121R phy init Peter Tyser (4): net: Fix download command parsing net: Define IP flag field values net: Add additional IP fragmentation check net: Fix TftpStart() ip:filename bug common/cmd_net.c | 20 ++++++++++++-------- drivers/net/tsec.c | 3 +++ include/net.h | 6 ++++++ include/tsec.h | 4 ++++ net/net.c | 7 ++++--- net/tftp.c | 3 +-- 6 files changed, 30 insertions(+), 13 deletions(-) regards, Ben

2 1

[U-Boot] [PATCH] Section name should be ".data" not "data"
by Trent Piepho 09 Dec '08

09 Dec '08

Signed-off-by: Trent Piepho <tpiepho(a)freescale.com> --- drivers/i2c/fsl_i2c.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c index 281a88b..3b5c06b 100644 --- a/drivers/i2c/fsl_i2c.c +++ b/drivers/i2c/fsl_i2c.c @@ -38,11 +38,10 @@ DECLARE_GLOBAL_DATA_PTR; * runs from ROM, and we can't switch buses because we can't modify * the global variables. */ -#ifdef CONFIG_SYS_SPD_BUS_NUM -static unsigned int i2c_bus_num __attribute__ ((section ("data"))) = CONFIG_SYS_SPD_BUS_NUM; -#else -static unsigned int i2c_bus_num __attribute__ ((section ("data"))) = 0; +#ifndef CONFIG_SYS_SPD_BUS_NUM +#define CONFIG_SYS_SPD_BUS_NUM 0 #endif +static unsigned int i2c_bus_num __attribute__ ((section (".data"))) = CONFIG_SYS_SPD_BUS_NUM; static unsigned int i2c_bus_speed[2] = {CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SPEED}; -- 1.5.4.1

3 2

[U-Boot] [PATCH 3/4]v2: Cleanup bootvx and handle new CONFIG_SYS_VXWORKS parameters
by Niklaus Giger 09 Dec '08

09 Dec '08

Signed-off-by: Niklaus Giger <niklaus.giger(a)member.fsf.org> --- common/cmd_elf.c | 81 ++++++++++++++++++++---------------------------------- 1 files changed, 30 insertions(+), 51 deletions(-) diff --git a/common/cmd_elf.c b/common/cmd_elf.c index 3ebb6d9..27a4b73 100644 --- a/common/cmd_elf.c +++ b/common/cmd_elf.c @@ -18,15 +18,12 @@ #include <linux/ctype.h> #include <net.h> #include <elf.h> +#include <vxworks.h> #if defined(CONFIG_WALNUT) || defined(CONFIG_SYS_VXWORKS_MAC_PTR) DECLARE_GLOBAL_DATA_PTR; #endif -#ifndef MAX -#define MAX(a,b) ((a) > (b) ? (a) : (b)) -#endif - int valid_elf_image (unsigned long addr); unsigned long load_elf_image (unsigned long addr); @@ -102,13 +99,10 @@ int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) unsigned long bootaddr; /* Address to put the bootline */ char *bootline; /* Text of the bootline */ char *tmp; /* Temporary char pointer */ + char build_buf[128]; /* Buffer for building the bootline */ -#if defined(CONFIG_4xx) || defined(CONFIG_IOP480) - char build_buf[80]; /* Buffer for building the bootline */ -#endif - /* -------------------------------------------------- */ - - /* + /* --------------------------------------------------- + * * Check the loadaddr variable. * If we don't know where the image is then we're done. */ @@ -124,7 +118,8 @@ int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) if ((argc == 2) && (strcmp (argv[1], "tftp") == 0)) { if (NetLoop (TFTP) <= 0) return 1; - printf ("Automatic boot of VxWorks image at address 0x%08lx ... \n", addr); + printf ("Automatic boot of VxWorks image at address 0x%08lx ... \n", + addr); } #endif @@ -152,7 +147,7 @@ int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) */ if ((tmp = getenv ("bootaddr")) == NULL) - bootaddr = 0x4200; + bootaddr = CONFIG_SYS_VXWORKS_BOOT_ADDR; else bootaddr = simple_strtoul (tmp, NULL, 16); @@ -163,54 +158,40 @@ int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) */ if ((bootline = getenv ("bootargs")) != NULL) { - memcpy ((void *) bootaddr, bootline, MAX(strlen(bootline), 255)); - flush_cache (bootaddr, MAX(strlen(bootline), 255)); + memcpy ((void *) bootaddr, bootline, + max (strlen (bootline), 255)); + flush_cache (bootaddr, max (strlen (bootline), 255)); } else { -#if defined(CONFIG_4xx) - sprintf (build_buf, "ibmEmac(0,0)"); - if ((tmp = getenv ("hostname")) != NULL) { - sprintf (&build_buf[strlen (build_buf - 1)], - "host:%s ", tmp); + + sprintf (build_buf, CONFIG_SYS_VXWORKS_BOOT_DEVICE); + if ((tmp = getenv ("bootfile")) != NULL) { + sprintf (&build_buf[strlen (build_buf)], + "%s:%s ", CONFIG_SYS_VXWORKS_SERVERNAME, tmp); } else { - sprintf (&build_buf[strlen (build_buf - 1)], - ": "); + sprintf (&build_buf[strlen (build_buf)], + "%s:file ", CONFIG_SYS_VXWORKS_SERVERNAME); } if ((tmp = getenv ("ipaddr")) != NULL) { - sprintf (&build_buf[strlen (build_buf - 1)], - "e=%s ", tmp); + sprintf (&build_buf[strlen (build_buf)], "e=%s ", tmp); } - memcpy ((void *)bootaddr, build_buf, MAX(strlen(build_buf), 255)); - flush_cache (bootaddr, MAX(strlen(build_buf), 255)); -#elif defined(CONFIG_IOP480) - sprintf (build_buf, "dc(0,0)"); - if ((tmp = getenv ("hostname")) != NULL) { - sprintf (&build_buf[strlen (build_buf - 1)], - "host:%s ", tmp); - } else { - sprintf (&build_buf[strlen (build_buf - 1)], - ": "); + if ((tmp = getenv ("serverip")) != NULL) { + sprintf (&build_buf[strlen (build_buf)], "h=%s ", tmp); } - if ((tmp = getenv ("ipaddr")) != NULL) { - sprintf (&build_buf[strlen (build_buf - 1)], - "e=%s ", tmp); + if ((tmp = getenv ("hostname")) != NULL) { + sprintf (&build_buf[strlen (build_buf)], "tn=%s ", tmp); } - memcpy ((void *) bootaddr, build_buf, MAX(strlen(build_buf), 255)); - flush_cache (bootaddr, MAX(strlen(build_buf), 255)); -#else - - /* - * I'm not sure what the device should be for other - * PPC flavors, the hostname and ipaddr should be ok - * to just copy - */ - - puts ("No bootargs defined\n"); - return 1; +#ifdef CONFIG_SYS_VXWORKS_ADD_PARAMS + sprintf (&build_buf[strlen (build_buf)], + CONFIG_SYS_VXWORKS_ADD_PARAMS); #endif + + memcpy ((void *) bootaddr, build_buf, + max (strlen (build_buf), 255)); + flush_cache (bootaddr, max (strlen (build_buf), 255)); } /* @@ -255,8 +236,7 @@ int valid_elf_image (unsigned long addr) } if (ehdr->e_type != ET_EXEC) { - printf ("## Not a 32-bit elf image at address 0x%08lx\n", - addr); + printf ("## Not a 32-bit elf image at address 0x%08lx\n", addr); return 0; } @@ -271,7 +251,6 @@ int valid_elf_image (unsigned long addr) return 1; } - /* ====================================================================== * A very simple elf loader, assumes the image is valid, returns the * entry point address. -- 1.6.0.2

2 2

[U-Boot] [PATCH] avr32/bootm: remove unused variable 'ret'
by Jean-Christophe PLAGNIOL-VILLARD 08 Dec '08

08 Dec '08

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj(a)jcrosoft.com> diff --git a/lib_avr32/bootm.c b/lib_avr32/bootm.c index 556e3ea..03ab8d1 100644 --- a/lib_avr32/bootm.c +++ b/lib_avr32/bootm.c @@ -176,7 +176,6 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) void (*theKernel)(int magic, void *tagtable); struct tag *params, *params_start; char *commandline = getenv("bootargs"); - int ret; if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) return 1; -- 1.5.6.5

4 7