[U-Boot] Compilation warning: MSR_RI redefined
Hi Detlev, your patch 7b5611cdd12ca0cc33f994f0d4a4454788fc3124 [inka4x0: Add hardware diagnosis functions for inka4x0] introduced all kind of new defines in the ns16550.h header resulting in a warning on some 4xx platforms: [ste...@kubuntu u-boot (master)]$ ./MAKEALL ml300 Configuring for ml300 board... In file included from serial.c:53: /home/stefan/git/u-boot/u-boot/include/ns16550.h:151:1: warning: MSR_RI redefined In file included from serial.c:41: /home/stefan/git/u-boot/u-boot/include/asm/processor.h:48:1: warning: this is the location of the previous definition I suggest to either remove this MSI_RI from the header again (it doesn't seem to be used here) or rename it. Thanks. Best regards, Stefan = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: off...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] U-boot initialization test
Dear eija_flight, In message 22840615.p...@talk.nabble.com you wrote: During above initialization process of u-boot, 1. Does it conduct a test to all board hardware listed? No. In general, there is no testing performed. Minor exceptions from this rule exist, for example the RAM auto-sizing code also performas a minimal non-destructive memory test, but this is not strong enough to be called serious testing. If you need real Power-On Self Tests (POST), then you must enable POST in your board configuration and configure it according to your needs. 2. If above answer is yes, what method is used to do the test? If you need such tests, then use the code in post/, see doc/README.POST 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: w...@denx.de In the face of entropy and nothingness, you kind of have to pretend it's not there if you want to keep writing good code. - Karl Lehenbauer ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 8/8] ZOOM2: rename timer divisor
Dear Jean-Christophe PLAGNIOL-VILLARD, In message 20090402053526.gn14...@game.jcrosoft.org you wrote: On 22:02 Wed 01 Apr , Tom Rix wrote: Divisor field is called PTV not PVT. This change is needed because of earlier OMAP commit 81472d893fa565c9d300928a40e504a689bde131 of the same name please do this at the same time you add the board This request makes no sense. It is a clearly isolated bug fix and it is good to split this off into a separate comit. Jean-Christophe, please apply as is. 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: w...@denx.de The night sky over the planet Krikkit is the least interesting sight in the entire Universe. - Douglas Adams _Life, the Universe, and Everything_ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] [ARM] Move machine specific code to board at s3c64xx (v2)
On Thu, Apr 2, 2009 at 2:18 PM, Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com wrote: On 13:43 Thu 02 Apr , Kyungmin Park wrote: Hi, If there's no objection, could you apply this patch to ARM git tree? Just one question is the OneNand always 16bits? Sure as I know, there's no exception. Thank you, Kyungmin Park ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] netconsole in u-boot
Dear support, Am trying to configure out how to change my u-boot to be netconsole from serial console. When i key in help in my u-boot start-up, i didnt seen any nc command. U-Boot help May i know how to enable netconsole. By adding following in u-boot/include/configs/at91sam9260ek.h #define CONFIG_NETCONSOLE 1 and then with the following command, make distclean make at91sam9263ek_config make CROSS_COMPILE=arm-linux- I get error a compile error drivers/libdrivers.a(netconsole.o): In function `nc_tstc':/home/linux4sam/linux-2.6.24/u-boot-1.1.5/drivers/netconsole.c:233: undefined reference to `eth_get_dev'drivers/libdrivers.a(netconsole.o): In function `nc_send_packet':/home/linux4sam/linux-2.6.24/u-boot-1.1.5/drivers/netconsole.c:116: undefined reference to `eth_get_dev'make: *** [u-boot] Error 1/Ong ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] netconsole in u-boot
Dear ong, In message 200904021526134849...@free2move.us you wrote: Am trying to configure out how to change my u-boot to be netconsole from serial console. I recomment to start by reading the documentation. When i key in help in my u-boot start-up, i didnt seen any nc command. This is to be expected. Read the docs. I get error a compile error drivers/libdrivers.a(netconsole.o): In function `nc_tstc':/home/linux4sam/linux-2.6.24/u-boot-1.1.5/drivers/netconsole.c:233: undefined reference to `eth_get_dev'drivers/libdrivers.a(netconsole.o): In function `nc_send_packet':/home/linux4sam/linux-2.6. 24/u-boot-1.1.5/drivers/netconsole.c:116: undefined reference to `eth_get_dev'make: *** [u-boot] Error 1/Ong U-Boot 1.1.5 is extremely old and unsupported here. Please use current code. 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: w...@denx.de There is enough for the need of everyone in this world, but not for the greed of everyone. - Mahatma Gandhi ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] U-boot initialization test
Dear eija_flight, In message 22840615.p...@talk.nabble.com you wrote: During above initialization process of u-boot, 1. Does it conduct a test to all board hardware listed? No. In general, there is no testing performed. Minor exceptions from this rule exist, for example the RAM auto-sizing code also performas a minimal non-destructive memory test, but this is not strong enough to be called serious testing. If you need real Power-On Self Tests (POST), then you must enable POST in your board configuration and configure it according to your needs. 2. If above answer is yes, what method is used to do the test? If you need such tests, then use the code in post/, see doc/README.POST I've read through the README.post, and I can see that there's many implemented test feature built in U-boot. I find it very useful. Using U-boot 1.3.1 version, It is possible (as a user) to apply all of these test feature into a standalone applications? because I need to log the result using standalone app. Regards, Eija_flight -- View this message in context: http://www.nabble.com/U-boot-initialization-test-tp22840615p22843365.html Sent from the Uboot - Users mailing list archive at Nabble.com. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] OMAP3: Fix timer handling to 1ms and CONFIG_SYS_HZ to 1000.
On Thu, Apr 02, 2009 at 12:43:53AM +0200, Wolfgang Denk wrote: Dear Jean-Christophe PLAGNIOL-VILLARD, In message 20090331202939.gi24...@game.jcrosoft.org you wrote: On 11:19 Tue 17 Mar , Dirk Behme wrote: Fix OMAP3 timer handling to 1ms tick and CONFIG_SYS_HZ to 1000. Clean up macros and comments. Signed-off-by: Dirk Behme dirk.be...@googlemail.com Signed-off-by: Manikandan Pillai mani.pil...@ti.com What is the status of this patch? I see no reason to delay it. Wolfgang, it will no longer apply beacuse of commit 81472d893fa565c9d300928a40e504a689bde131 and I feel a bit shy for causing troubles, updated follows in separate mail Best regards, ladis ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2] OMAP3: Fix timer handling to 1ms and CONFIG_SYS_HZ to 1000.
From: Manikandan Pillai mani.pil...@ti.com Signed-off-by: Dirk Behme dirk.be...@googlemail.com Signed-off-by: Manikandan Pillai mani.pil...@ti.com Signed-off-by: Ladislav Michl la...@linux-mips.org --- Changes from Dirk's patch which is replaced by this [2]: * Fix conflicts after commit 81472d893fa565c9d300928a40e504a689bde131 Changes from Mani's original patch which is replaced by this [1]: * Don't remove overflow handling in get_timer_masked() * Update omap3_zoom1.h, too. * Clean up timer related comments and macros in config files * Don't touch reset_timer_masked() * Switch divider clock divider from 256 to 8 to be able to get 1000Hz * Remove unused udelay_masked() * Minor clean up of get_tbclk() [1] http://lists.denx.de/pipermail/u-boot/2009-March/049012.html [2] http://lists.denx.de/pipermail/u-boot/2009-March/049146.html --- cpu/arm_cortexa8/omap3/interrupts.c | 50 +++--- include/configs/omap3_beagle.h |9 +++--- include/configs/omap3_evm.h |9 +++--- include/configs/omap3_overo.h | 12 include/configs/omap3_pandora.h | 11 --- include/configs/omap3_zoom1.h | 11 --- 6 files changed, 44 insertions(+), 58 deletions(-) diff --git a/cpu/arm_cortexa8/omap3/interrupts.c b/cpu/arm_cortexa8/omap3/interrupts.c index 5d9c4e3..c75bc8b 100644 --- a/cpu/arm_cortexa8/omap3/interrupts.c +++ b/cpu/arm_cortexa8/omap3/interrupts.c @@ -169,7 +169,16 @@ static ulong timestamp; static ulong lastinc; static gptimer_t *timer_base = (gptimer_t *)CONFIG_SYS_TIMERBASE; -/* nothing really to do with interrupts, just starts up a counter. */ +/* + * Nothing really to do with interrupts, just starts up a counter. + * We run the counter with 13MHz, divided by 8, resulting in timer + * frequency of 1.625MHz. With 32bit counter register, counter + * overflows in ~44min + */ + +/* 13MHz / 8 = 1.625MHz */ +#define TIMER_CLOCK(V_SCLK / (2 CONFIG_SYS_PTV)) + int interrupt_init(void) { /* start the counter ticking up, reload value on overflow */ @@ -232,50 +241,25 @@ void udelay(unsigned long usec) void reset_timer_masked(void) { /* reset time, capture current incrementer value time */ - lastinc = readl(timer_base-tcrr); + lastinc = readl(timer_base-tcrr) / (TIMER_CLOCK / CONFIG_SYS_HZ); timestamp = 0; /* start advancing time stamp from 0 */ } ulong get_timer_masked(void) { - ulong now = readl(timer_base-tcrr); /* current tick value */ + /* current tick value */ + ulong now = readl(timer_base-tcrr) / (TIMER_CLOCK / CONFIG_SYS_HZ); if (now = lastinc) /* normal mode (non roll) */ /* move stamp fordward with absoulte diff ticks */ timestamp += (now - lastinc); else/* we have rollover of incrementer */ - timestamp += (0x - lastinc) + now; + timestamp += ((0x / (TIMER_CLOCK / CONFIG_SYS_HZ)) + - lastinc) + now; lastinc = now; return timestamp; } -/* waits specified delay value and resets timestamp */ -void udelay_masked(unsigned long usec) -{ - ulong tmo; - ulong endtime; - signed long diff; - - /* if big number, spread normalization to seconds */ - if (usec = 1000) { - /* start to normalize for usec to ticks per sec */ - tmo = usec / 1000; - /* find number of ticks to wait to achieve target */ - tmo *= CONFIG_SYS_HZ; - tmo /= 1000;/* finish normalize. */ - } else {/* else small number, */ - /* don't kill it prior to HZ multiply */ - tmo = usec * CONFIG_SYS_HZ; - tmo /= (1000 * 1000); - } - endtime = get_timer_masked() + tmo; - - do { - ulong now = get_timer_masked(); - diff = endtime - now; - } while (diff = 0); -} - /* * This function is derived from PowerPC code (read timebase as long long). * On ARM it just returns the timer value. @@ -291,7 +275,5 @@ unsigned long long get_ticks(void) */ ulong get_tbclk(void) { - ulong tbclk; - tbclk = CONFIG_SYS_HZ; - return tbclk; + return CONFIG_SYS_HZ; } diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 7db1eb7..88a57d3 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -223,12 +223,13 @@ /* load address */ /* - * 2430 has 12 GP timers, they can be driven by the SysClk (12/13/19.2) or by - * 32KHz clk, or from external sig. This rate is divided by a local divisor. + * OMAP3 has 12 GP timers, they can be driven by the system clock + * (12/13/16.8/19.2/38.4MHz) or by 32KHz clock. We use 13MHz (V_SCLK). + * This rate is divided by a local divisor. */ #define CONFIG_SYS_TIMERBASE
Re: [U-Boot] Compilation warning: MSR_RI redefined
Hi Stefan, your patch 7b5611cdd12ca0cc33f994f0d4a4454788fc3124 [inka4x0: Add hardware diagnosis functions for inka4x0] introduced all kind of new defines in the ns16550.h header resulting in a warning on some 4xx platforms: [ste...@kubuntu u-boot (master)]$ ./MAKEALL ml300 Configuring for ml300 board... In file included from serial.c:53: /home/stefan/git/u-boot/u-boot/include/ns16550.h:151:1: warning: MSR_RI redefined In file included from serial.c:41: /home/stefan/git/u-boot/u-boot/include/asm/processor.h:48:1: warning: this is the location of the previous definition I suggest to either remove this MSI_RI from the header again (it doesn't seem to be used here) or rename it. Ok, so much for the plan to add the defines not bit by bit as needed, but register-wise, while we're there. I actually would prefer to use UART_MSR_RI, as this is a UART thingy rather than to remove the define as we surely use the register, so I feel it worthwhile to have the whole definition on board. Let me cook up a rename for the UART stuff.. Cheers Detlev -- We have a live-manual. It's called emacs-de...@gnu.org. You can stick to just reading it, but you can skip to a specific chapter by simply sending an email asking for it ;-) -- Stefan Monnier -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: d...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Compilation warning: MSR_RI redefined
On Thursday 02 April 2009, Detlev Zundel wrote: I suggest to either remove this MSI_RI from the header again (it doesn't seem to be used here) or rename it. Ok, so much for the plan to add the defines not bit by bit as needed, but register-wise, while we're there. I actually would prefer to use UART_MSR_RI, as this is a UART thingy rather than to remove the define as we surely use the register, so I feel it worthwhile to have the whole definition on board. That's my preference as well. Let me cook up a rename for the UART stuff.. Thanks. Best regards, Stefan = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: off...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] omap3: mmc: mmc2 support
Hi, } unsigned char mmc_board_init(void) unsigned char? why in omap3_mmc.c, many functions return the unsigned char. I don't know why too :( but if we need it can be changed. +switch (curr_device) { +case 1: +writel(readl(t2_base-pbias_lite) | PBIASLITEPWRDNZ1 | +PBIASSPEEDCTRL0 | PBIASLITEPWRDNZ0, +t2_base-pbias_lite); -writel(readl(t2_base-devconf0) | MMCSDIO1ADPCLKISEL, -t2_base-devconf0); +writel(readl(t2_base-devconf0) | MMCSDIO1ADPCLKISEL, +t2_base-devconf0); +break; +case 2: +case 3: +writel(readl(t2_base-devconf1) | MMCSDIO2ADPCLKISEL, +t2_base-devconf1); +break; +} please only active code when the user activate the mmcx support how your driver will work it I want to have two mmc support at the sametime?? I announced the patch for mmc command (but not applied yet) please check it http://lists.denx.de/pipermail/u-boot/2009-March/049835.html +int mmc_legacy_init(int dev) { +if (mmc_set_dev(dev) != 0) +return 1; + btw it will better to move to the new Framework new Framework is what? do you mean generic mmc? /* * OMAP HSMMC register definitions */ -#define OMAP_HSMMC_BASE 0x4809C000 +#define OMAP_HSMMC_BASE_MMC10x4809C000 +#define OMAP_HSMMC_BASE_MMC20x480B4000 +#define OMAP_HSMMC_BASE_MMC30x480AD000 it's really a shame that TI does not make it in order and at the same shift so we could do this #define OMAP_HSMMC_BASE(x) (0x4809C000 + (shift x)) right but.. I can't find any patterns for OMAP's HSMMC register. also HSMMC register is defined separately at linux kernel code (please see arch/arm/plat-omap/include/mach/mmc.h) Many thanks Minkyu Kang ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 04/13] Blackfin: bf526-ezbrd: new board port
Signed-off-by: Mike Frysinger vap...@gentoo.org --- MAINTAINERS |1 + MAKEALL |1 + Makefile|6 +- board/bf526-ezbrd/.gitignore|1 + board/bf526-ezbrd/Makefile | 58 board/bf526-ezbrd/bf526-ezbrd.c | 77 board/bf526-ezbrd/config.mk | 32 +++ board/bf526-ezbrd/status-led.c | 56 board/bf526-ezbrd/u-boot.lds.S | 124 + include/configs/bf526-ezbrd.h | 190 +++ 10 files changed, 543 insertions(+), 3 deletions(-) create mode 100644 board/bf526-ezbrd/.gitignore create mode 100644 board/bf526-ezbrd/Makefile create mode 100644 board/bf526-ezbrd/bf526-ezbrd.c create mode 100644 board/bf526-ezbrd/config.mk create mode 100644 board/bf526-ezbrd/status-led.c create mode 100644 board/bf526-ezbrd/u-boot.lds.S create mode 100644 include/configs/bf526-ezbrd.h diff --git a/MAINTAINERS b/MAINTAINERS index 9eab566..c3db24d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -854,6 +854,7 @@ Yusuke Goda goda.yus...@renesas.com Mike Frysinger vap...@gentoo.org Blackfin Team u-boot-de...@blackfin.uclinux.org + BF526-EZBRD BF526 BF527-EZKIT BF527 BF533-EZKIT BF533 BF533-STAMP BF533 diff --git a/MAKEALL b/MAKEALL index 811556c..982b7fb 100755 --- a/MAKEALL +++ b/MAKEALL @@ -788,6 +788,7 @@ LIST_avr32=\ # LIST_blackfin=\ + bf526-ezbrd \ bf527-ezkit \ bf533-ezkit \ bf533-stamp \ diff --git a/Makefile b/Makefile index f70e1d9..ffd516b 100644 --- a/Makefile +++ b/Makefile @@ -3336,8 +3336,8 @@ suzaku_config:unconfig # # Analog Devices boards -BFIN_BOARDS = bf527-ezkit bf533-ezkit bf533-stamp bf537-stamp bf538f-ezkit \ - bf548-ezkit bf561-ezkit +BFIN_BOARDS = bf526-ezbrd bf527-ezkit bf533-ezkit bf533-stamp bf537-stamp \ + bf538f-ezkit bf548-ezkit bf561-ezkit $(BFIN_BOARDS:%=%_config) : unconfig @$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=) @@ -3511,7 +3511,7 @@ clean: $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin} \ $(obj)board/trab/trab_fkt $(obj)board/voiceblue/eeprom \ $(obj)board/armltd/{integratorap,integratorcp}/u-boot.lds \ - $(obj)board/bf5{27,33,38f,48,61}-ezkit/u-boot.lds \ + $(obj)board/bf5{26,27,33,38f,48,61}-ez{brd,kit}/u-boot.lds \ $(obj)board/bf5{33,37}-stamp/u-boot.lds\ $(obj)cpu/blackfin/bootrom-asm-offsets.[chs] @rm -f $(obj)include/bmp_logo.h diff --git a/board/bf526-ezbrd/.gitignore b/board/bf526-ezbrd/.gitignore new file mode 100644 index 000..945f324 --- /dev/null +++ b/board/bf526-ezbrd/.gitignore @@ -0,0 +1 @@ +/u-boot.lds diff --git a/board/bf526-ezbrd/Makefile b/board/bf526-ezbrd/Makefile new file mode 100644 index 000..88846ba --- /dev/null +++ b/board/bf526-ezbrd/Makefile @@ -0,0 +1,58 @@ +# +# U-boot - Makefile +# +# Copyright (c) 2005-2008 Analog Device Inc. +# +# (C) Copyright 2000-2006 +# Wolfgang Denk, DENX Software Engineering, w...@denx.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 +# + +include $(TOPDIR)/config.mk + +LIB= $(obj)lib$(BOARD).a + +COBJS-y:= $(BOARD).o +COBJS-$(CONFIG_STATUS_LED) += status-led.o + +SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS-y)) + +$(LIB):$(obj).depend $(OBJS) $(SOBJS) $(obj)u-boot.lds + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) + +$(obj)u-boot.lds: u-boot.lds.S + $(CPP) $(CPPFLAGS) -D__ASSEMBLY__ -P $^ $@ + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak $(obj).depend + +# + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend +
[U-Boot] [PATCH 01/13] Blackfin: bf548-ezkit: new board port
Signed-off-by: Mike Frysinger vap...@gentoo.org --- MAINTAINERS |1 + MAKEALL |1 + Makefile|5 +- board/bf548-ezkit/.gitignore|1 + board/bf548-ezkit/Makefile | 58 +++ board/bf548-ezkit/bf548-ezkit.c | 79 ++ board/bf548-ezkit/config.mk | 37 + board/bf548-ezkit/u-boot.lds.S | 124 +++ board/bf548-ezkit/video.c | 327 +++ include/configs/bf548-ezkit.h | 211 + 10 files changed, 842 insertions(+), 2 deletions(-) create mode 100644 board/bf548-ezkit/.gitignore create mode 100644 board/bf548-ezkit/Makefile create mode 100644 board/bf548-ezkit/bf548-ezkit.c create mode 100644 board/bf548-ezkit/config.mk create mode 100644 board/bf548-ezkit/u-boot.lds.S create mode 100644 board/bf548-ezkit/video.c create mode 100644 include/configs/bf548-ezkit.h diff --git a/MAINTAINERS b/MAINTAINERS index 25b28d6..47b6049 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -857,6 +857,7 @@ Blackfin Team u-boot-de...@blackfin.uclinux.org BF533-EZKIT BF533 BF533-STAMP BF533 BF537-STAMP BF537 + BF548-EZKIT BF548 BF561-EZKIT BF561 # diff --git a/MAKEALL b/MAKEALL index 854f303..e9f8961 100755 --- a/MAKEALL +++ b/MAKEALL @@ -791,6 +791,7 @@ LIST_blackfin= \ bf533-ezkit \ bf533-stamp \ bf537-stamp \ + bf548-ezkit \ bf561-ezkit \ diff --git a/Makefile b/Makefile index f857641..0e230c1 100644 --- a/Makefile +++ b/Makefile @@ -3336,7 +3336,7 @@ suzaku_config:unconfig # # Analog Devices boards -BFIN_BOARDS = bf533-ezkit bf533-stamp bf537-stamp bf561-ezkit +BFIN_BOARDS = bf533-ezkit bf533-stamp bf537-stamp bf548-ezkit bf561-ezkit $(BFIN_BOARDS:%=%_config) : unconfig @$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=) @@ -3510,7 +3510,8 @@ clean: $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin} \ $(obj)board/trab/trab_fkt $(obj)board/voiceblue/eeprom \ $(obj)board/armltd/{integratorap,integratorcp}/u-boot.lds \ - $(obj)board/{bf533-ezkit,bf533-stamp,bf537-stamp,bf561-ezkit}/u-boot.lds \ + $(obj)board/bf5{33,48,61}-ezkit/u-boot.lds \ + $(obj)board/bf5{33,37}-stamp/u-boot.lds\ $(obj)cpu/blackfin/bootrom-asm-offsets.[chs] @rm -f $(obj)include/bmp_logo.h @rm -f $(obj)nand_spl/{u-boot-spl,u-boot-spl.map,System.map} diff --git a/board/bf548-ezkit/.gitignore b/board/bf548-ezkit/.gitignore new file mode 100644 index 000..945f324 --- /dev/null +++ b/board/bf548-ezkit/.gitignore @@ -0,0 +1 @@ +/u-boot.lds diff --git a/board/bf548-ezkit/Makefile b/board/bf548-ezkit/Makefile new file mode 100644 index 000..c2b98ec --- /dev/null +++ b/board/bf548-ezkit/Makefile @@ -0,0 +1,58 @@ +# +# U-boot - Makefile +# +# Copyright (c) 2005-2008 Analog Device Inc. +# +# (C) Copyright 2000-2006 +# Wolfgang Denk, DENX Software Engineering, w...@denx.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 +# + +include $(TOPDIR)/config.mk + +LIB= $(obj)lib$(BOARD).a + +COBJS-y:= $(BOARD).o +COBJS-$(CONFIG_VIDEO) += video.o + +SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS-y)) + +$(LIB):$(obj).depend $(OBJS) $(SOBJS) $(obj)u-boot.lds + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) + +$(obj)u-boot.lds: u-boot.lds.S + $(CPP) $(CPPFLAGS) -D__ASSEMBLY__ -P $^ $@ + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak $(obj).depend + +# + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# diff --git a/board/bf548-ezkit/bf548-ezkit.c
[U-Boot] [PATCH 02/13] Blackfin: bf527-ezkit: new board port
Signed-off-by: Mike Frysinger vap...@gentoo.org --- MAINTAINERS |1 + MAKEALL |1 + Makefile|5 +- board/bf527-ezkit/.gitignore|1 + board/bf527-ezkit/Makefile | 58 +++ board/bf527-ezkit/bf527-ezkit.c | 77 ++ board/bf527-ezkit/config.mk | 32 board/bf527-ezkit/u-boot.lds.S | 124 +++ board/bf527-ezkit/video.c | 317 +++ include/configs/bf527-ezkit.h | 172 + 10 files changed, 786 insertions(+), 2 deletions(-) create mode 100644 board/bf527-ezkit/.gitignore create mode 100644 board/bf527-ezkit/Makefile create mode 100644 board/bf527-ezkit/bf527-ezkit.c create mode 100644 board/bf527-ezkit/config.mk create mode 100644 board/bf527-ezkit/u-boot.lds.S create mode 100644 board/bf527-ezkit/video.c create mode 100644 include/configs/bf527-ezkit.h diff --git a/MAINTAINERS b/MAINTAINERS index 47b6049..cba0561 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -854,6 +854,7 @@ Yusuke Goda goda.yus...@renesas.com Mike Frysinger vap...@gentoo.org Blackfin Team u-boot-de...@blackfin.uclinux.org + BF527-EZKIT BF527 BF533-EZKIT BF533 BF533-STAMP BF533 BF537-STAMP BF537 diff --git a/MAKEALL b/MAKEALL index e9f8961..1cf4073 100755 --- a/MAKEALL +++ b/MAKEALL @@ -788,6 +788,7 @@ LIST_avr32=\ # LIST_blackfin=\ + bf527-ezkit \ bf533-ezkit \ bf533-stamp \ bf537-stamp \ diff --git a/Makefile b/Makefile index 0e230c1..8bbf183 100644 --- a/Makefile +++ b/Makefile @@ -3336,7 +3336,8 @@ suzaku_config:unconfig # # Analog Devices boards -BFIN_BOARDS = bf533-ezkit bf533-stamp bf537-stamp bf548-ezkit bf561-ezkit +BFIN_BOARDS = bf527-ezkit bf533-ezkit bf533-stamp bf537-stamp bf548-ezkit \ + bf561-ezkit $(BFIN_BOARDS:%=%_config) : unconfig @$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=) @@ -3510,7 +3511,7 @@ clean: $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin} \ $(obj)board/trab/trab_fkt $(obj)board/voiceblue/eeprom \ $(obj)board/armltd/{integratorap,integratorcp}/u-boot.lds \ - $(obj)board/bf5{33,48,61}-ezkit/u-boot.lds \ + $(obj)board/bf5{27,33,48,61}-ezkit/u-boot.lds \ $(obj)board/bf5{33,37}-stamp/u-boot.lds\ $(obj)cpu/blackfin/bootrom-asm-offsets.[chs] @rm -f $(obj)include/bmp_logo.h diff --git a/board/bf527-ezkit/.gitignore b/board/bf527-ezkit/.gitignore new file mode 100644 index 000..945f324 --- /dev/null +++ b/board/bf527-ezkit/.gitignore @@ -0,0 +1 @@ +/u-boot.lds diff --git a/board/bf527-ezkit/Makefile b/board/bf527-ezkit/Makefile new file mode 100644 index 000..c2b98ec --- /dev/null +++ b/board/bf527-ezkit/Makefile @@ -0,0 +1,58 @@ +# +# U-boot - Makefile +# +# Copyright (c) 2005-2008 Analog Device Inc. +# +# (C) Copyright 2000-2006 +# Wolfgang Denk, DENX Software Engineering, w...@denx.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 +# + +include $(TOPDIR)/config.mk + +LIB= $(obj)lib$(BOARD).a + +COBJS-y:= $(BOARD).o +COBJS-$(CONFIG_VIDEO) += video.o + +SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS-y)) + +$(LIB):$(obj).depend $(OBJS) $(SOBJS) $(obj)u-boot.lds + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) + +$(obj)u-boot.lds: u-boot.lds.S + $(CPP) $(CPPFLAGS) -D__ASSEMBLY__ -P $^ $@ + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak $(obj).depend + +# + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# diff --git a/board/bf527-ezkit/bf527-ezkit.c
[U-Boot] [PATCH 00/13] Blackfin updates for 2009.05
Some more fixes and new boards (which were posted already). Mike Frysinger (13): Blackfin: bf548-ezkit: new board port Blackfin: bf527-ezkit: new board port Blackfin: bf538f-ezkit: new board port Blackfin: bf526-ezbrd: new board port Blackfin: bf518f-ezbrd: new board port Blackfin: fix crash when booting from external memory Blackfin: bf537-stamp: split CF/IDE code out into dedicated cf-ide.c Blackfin: convert bfin_sdh to legacy mmc Blackfin: drop newline from OTP help Blackfin: do not delay on output bytes Blackfin: add BF538/BF539 SPI portmux handling Blackfin: bf533-stamp: drop old spi flash driver Blackfin: force all boards to HZ of 1000 MAINTAINERS |5 + MAKEALL |5 + Makefile|6 +- board/bf518f-ezbrd/.gitignore |1 + board/bf518f-ezbrd/Makefile | 57 + board/bf518f-ezbrd/bf518f-ezbrd.c | 101 board/bf518f-ezbrd/config.mk| 32 +++ board/bf518f-ezbrd/u-boot.lds.S | 124 ++ board/bf526-ezbrd/.gitignore|1 + board/bf526-ezbrd/Makefile | 58 + board/bf526-ezbrd/bf526-ezbrd.c | 77 +++ board/bf526-ezbrd/config.mk | 32 +++ board/bf526-ezbrd/status-led.c | 56 + board/bf526-ezbrd/u-boot.lds.S | 124 ++ board/bf527-ezkit/.gitignore|1 + board/bf527-ezkit/Makefile | 58 + board/bf527-ezkit/bf527-ezkit.c | 77 +++ board/bf527-ezkit/config.mk | 32 +++ board/bf527-ezkit/u-boot.lds.S | 124 ++ board/bf527-ezkit/video.c | 317 ++ board/bf533-stamp/Makefile |1 - board/bf533-stamp/spi_flash.c |2 - board/bf537-stamp/Makefile |1 + board/bf537-stamp/bf537-stamp.c | 57 +- board/bf537-stamp/ide-cf.c | 66 ++ board/bf538f-ezkit/.gitignore |1 + board/bf538f-ezkit/Makefile | 57 + board/bf538f-ezkit/bf538f-ezkit.c | 27 +++ board/bf538f-ezkit/config.mk| 33 +++ board/bf538f-ezkit/u-boot.lds.S | 143 board/bf548-ezkit/.gitignore|1 + board/bf548-ezkit/Makefile | 58 + board/bf548-ezkit/bf548-ezkit.c | 79 +++ board/bf548-ezkit/config.mk | 37 +++ board/bf548-ezkit/u-boot.lds.S | 124 ++ board/bf548-ezkit/video.c | 327 +++ common/cmd_otp.c|2 +- cpu/blackfin/initcode.c |9 + cpu/blackfin/serial.c |4 - cpu/blackfin/start.S|2 + drivers/mmc/bfin_sdh.c | 14 +- drivers/spi/bfin_spi.c | 18 ++ include/asm-blackfin/blackfin-config-post.h |8 +- include/configs/bf518f-ezbrd.h | 147 include/configs/bf526-ezbrd.h | 190 include/configs/bf527-ezkit.h | 172 ++ include/configs/bf538f-ezkit.h | 139 include/configs/bf548-ezkit.h | 211 + 48 files changed, 3140 insertions(+), 78 deletions(-) create mode 100644 board/bf518f-ezbrd/.gitignore create mode 100644 board/bf518f-ezbrd/Makefile create mode 100644 board/bf518f-ezbrd/bf518f-ezbrd.c create mode 100644 board/bf518f-ezbrd/config.mk create mode 100644 board/bf518f-ezbrd/u-boot.lds.S create mode 100644 board/bf526-ezbrd/.gitignore create mode 100644 board/bf526-ezbrd/Makefile create mode 100644 board/bf526-ezbrd/bf526-ezbrd.c create mode 100644 board/bf526-ezbrd/config.mk create mode 100644 board/bf526-ezbrd/status-led.c create mode 100644 board/bf526-ezbrd/u-boot.lds.S create mode 100644 board/bf527-ezkit/.gitignore create mode 100644 board/bf527-ezkit/Makefile create mode 100644 board/bf527-ezkit/bf527-ezkit.c create mode 100644 board/bf527-ezkit/config.mk create mode 100644 board/bf527-ezkit/u-boot.lds.S create mode 100644 board/bf527-ezkit/video.c delete mode 100644 board/bf533-stamp/spi_flash.c create mode 100644 board/bf537-stamp/ide-cf.c create mode 100644 board/bf538f-ezkit/.gitignore create mode 100644 board/bf538f-ezkit/Makefile create mode 100644 board/bf538f-ezkit/bf538f-ezkit.c create mode 100644 board/bf538f-ezkit/config.mk create mode 100644 board/bf538f-ezkit/u-boot.lds.S create mode 100644 board/bf548-ezkit/.gitignore create mode 100644 board/bf548-ezkit/Makefile create mode 100644 board/bf548-ezkit/bf548-ezkit.c create mode 100644 board/bf548-ezkit/config.mk create mode 100644
[U-Boot] [PATCH 12/13] Blackfin: bf533-stamp: drop old spi flash driver
Now that the common SPI flash code supports all the flashes, we can stop using the old driver. Signed-off-by: Mike Frysinger vap...@gentoo.org --- board/bf533-stamp/Makefile|1 - board/bf533-stamp/spi_flash.c |2 -- 2 files changed, 0 insertions(+), 3 deletions(-) delete mode 100644 board/bf533-stamp/spi_flash.c diff --git a/board/bf533-stamp/Makefile b/board/bf533-stamp/Makefile index a03fe89..0f52837 100644 --- a/board/bf533-stamp/Makefile +++ b/board/bf533-stamp/Makefile @@ -30,7 +30,6 @@ include $(TOPDIR)/config.mk LIB= $(obj)lib$(BOARD).a COBJS-y:= $(BOARD).o -COBJS-$(CONFIG_CMD_EEPROM) += spi_flash.o COBJS-$(CONFIG_VIDEO) += video.o SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) diff --git a/board/bf533-stamp/spi_flash.c b/board/bf533-stamp/spi_flash.c deleted file mode 100644 index 8784741..000 --- a/board/bf533-stamp/spi_flash.c +++ /dev/null @@ -1,2 +0,0 @@ -/* Share the spi flash code */ -#include ../bf537-stamp/spi_flash.c -- 1.6.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 13/13] Blackfin: force all boards to HZ of 1000
Since the Blackfin timer code requires HZ to be 1000, barf on any board that tries to use a different value. Signed-off-by: Mike Frysinger vap...@gentoo.org --- include/asm-blackfin/blackfin-config-post.h |8 ++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/asm-blackfin/blackfin-config-post.h b/include/asm-blackfin/blackfin-config-post.h index fea4737..623fdc7 100644 --- a/include/asm-blackfin/blackfin-config-post.h +++ b/include/asm-blackfin/blackfin-config-post.h @@ -135,9 +135,13 @@ #ifndef CONFIG_SYS_MAXARGS # define CONFIG_SYS_MAXARGS 16 #endif -#ifndef CONFIG_SYS_HZ -# define CONFIG_SYS_HZ 1000 +#if defined(CONFIG_SYS_HZ) +# if (CONFIG_SYS_HZ != 1000) +# warning CONFIG_SYS_HZ must always be 1000 +# endif +# undef CONFIG_SYS_HZ #endif +#define CONFIG_SYS_HZ 1000 #ifndef CONFIG_SYS_BAUDRATE_TABLE # define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #endif -- 1.6.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] mtd: SPI Flash: Winbond W25X16/WX2532/WX2564 support
On Thursday 11 December 2008 16:16:29 Mike Frysinger wrote: On Wednesday 09 July 2008 18:37:06 Wolfgang Denk wrote: In message Jason McMullan wrote: Add support for the Winbond W25X16/32/64 series of SPI Flash devices. Signed-off-by line is missing. --- /dev/null +++ b/drivers/mtd/spi/winbond.c @@ -0,0 +1,331 @@ +/* + * Copyright 2008, Network Appliance Inc. + * Author: Jason McMullan mcmul...@netapp.com + * + */ GPL header is missing. Please fix and resubmit. Jason: could you fix these two minor issues so we can get this in ? :) pretty pretty please ? ive merged and been maintaining this in the Blackfin git repo because we have some winbond parts, but it'd be nice to get this into mainline. i cant push it without your sign off :(. -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 0/7] SPI flash updates for 2009.05
These patches have all been posted at one point or another, I'm just collecting them all in my tree here: git://git.denx.de/u-boot-blackfin.git sf So if you have any complaints, now's the time ! Jean-Christophe PLAGNIOL-VILLARD (1): mtd: add some at45 spi flash support Mike Frysinger (5): sf: drop DEBUG defines sf: add driver for SST flashes sf: stmicro: drop redundant id read sf: always read 5 bytes for the idcode sf: stmicro: use common page timeout define Mingkai Hu (1): mtd: SPI Flash: Support the Spansion Flash drivers/mtd/spi/Makefile |2 + drivers/mtd/spi/atmel.c | 50 +- drivers/mtd/spi/spansion.c | 350 + drivers/mtd/spi/spi_flash.c | 13 +- drivers/mtd/spi/spi_flash_internal.h |1 + drivers/mtd/spi/sst.c| 358 ++ drivers/mtd/spi/stmicro.c| 11 +- 7 files changed, 771 insertions(+), 14 deletions(-) create mode 100644 drivers/mtd/spi/spansion.c create mode 100644 drivers/mtd/spi/sst.c ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 3/7] sf: drop DEBUG defines
Signed-off-by: Mike Frysinger vap...@gentoo.org Acked-by: Haavard Skinnemoen haavard.skinnem...@atmel.com --- drivers/mtd/spi/atmel.c |2 +- drivers/mtd/spi/spi_flash.c |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/spi/atmel.c b/drivers/mtd/spi/atmel.c index fc924a2..c3b936f 100644 --- a/drivers/mtd/spi/atmel.c +++ b/drivers/mtd/spi/atmel.c @@ -3,7 +3,7 @@ * * Copyright (C) 2008 Atmel Corporation */ -#define DEBUG + #include common.h #include malloc.h #include spi_flash.h diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index d1d81af..f002c0e 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -3,7 +3,7 @@ * * Copyright (C) 2008 Atmel Corporation */ -#define DEBUG + #include common.h #include malloc.h #include spi.h -- 1.6.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/7] mtd: add some at45 spi flash support
From: Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com - AT45DB321D - AT45DB161D - AT45DB081D - AT45DB041D - AT45DB021D - AT45DB011D Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com Signed-off-by: Mike Frysinger vap...@gentoo.org --- drivers/mtd/spi/atmel.c | 48 +++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/drivers/mtd/spi/atmel.c b/drivers/mtd/spi/atmel.c index a5f51ca..fc924a2 100644 --- a/drivers/mtd/spi/atmel.c +++ b/drivers/mtd/spi/atmel.c @@ -53,6 +53,54 @@ to_atmel_spi_flash(struct spi_flash *flash) static const struct atmel_spi_flash_params atmel_spi_flash_table[] = { { + .idcode1= 0x22, + .l2_page_size = 8, + .pages_per_block= 8, + .blocks_per_sector = 16, + .nr_sectors = 4, + .name = AT45DB011D, + }, + { + .idcode1= 0x23, + .l2_page_size = 8, + .pages_per_block= 8, + .blocks_per_sector = 16, + .nr_sectors = 8, + .name = AT45DB021D, + }, + { + .idcode1= 0x24, + .l2_page_size = 8, + .pages_per_block= 8, + .blocks_per_sector = 32, + .nr_sectors = 8, + .name = AT45DB041D, + }, + { + .idcode1= 0x25, + .l2_page_size = 8, + .pages_per_block= 8, + .blocks_per_sector = 32, + .nr_sectors = 16, + .name = AT45DB081D, + }, + { + .idcode1= 0x26, + .l2_page_size = 9, + .pages_per_block= 8, + .blocks_per_sector = 32, + .nr_sectors = 16, + .name = AT45DB161D, + }, + { + .idcode1= 0x27, + .l2_page_size = 9, + .pages_per_block= 8, + .blocks_per_sector = 64, + .nr_sectors = 64, + .name = AT45DB321D, + }, + { .idcode1= 0x28, .l2_page_size = 10, .pages_per_block= 8, -- 1.6.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/7] mtd: SPI Flash: Support the Spansion Flash
From: Mingkai Hu mingkai...@freescale.com Add MTD SPI Flash support for S25FL008A, S25FL016A, S25FL032A, S25FL064A, S25FL128P. Signed-off-by: Mingkai Hu mingkai...@freescale.com Signed-off-by: Mike Frysinger vap...@gentoo.org --- drivers/mtd/spi/Makefile |1 + drivers/mtd/spi/spansion.c | 356 2 files changed, 357 insertions(+), 0 deletions(-) create mode 100644 drivers/mtd/spi/spansion.c diff --git a/drivers/mtd/spi/Makefile b/drivers/mtd/spi/Makefile index 3d4f892..6ca6073 100644 --- a/drivers/mtd/spi/Makefile +++ b/drivers/mtd/spi/Makefile @@ -27,6 +27,7 @@ LIB := $(obj)libspi_flash.a COBJS-$(CONFIG_SPI_FLASH) += spi_flash.o COBJS-$(CONFIG_SPI_FLASH_ATMEL)+= atmel.o +COBJS-$(CONFIG_SPI_FLASH_SPANSION) += spansion.o COBJS-$(CONFIG_SPI_FLASH_STMICRO) += stmicro.o COBJS := $(COBJS-y) diff --git a/drivers/mtd/spi/spansion.c b/drivers/mtd/spi/spansion.c new file mode 100644 index 000..3dcccd3 --- /dev/null +++ b/drivers/mtd/spi/spansion.c @@ -0,0 +1,356 @@ +/* + * Copyright (C) 2009 Freescale Semiconductor, Inc. + * + * Author: Mingkai Hu (mingkai...@freescale.com) + * Based on stmicro.c by Wolfgang Denk (w...@denx.de), + * TsiChung Liew (tsi-chung.l...@freescale.com), + * and Jason McMullan (mcmul...@netapp.com) + * + * 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 + */ + +#include common.h +#include malloc.h +#include spi_flash.h + +#include spi_flash_internal.h + +/* S25FLxx-specific commands */ +#define CMD_S25FLXX_READ 0x03/* Read Data Bytes */ +#define CMD_S25FLXX_FAST_READ 0x0b/* Read Data Bytes at Higher Speed */ +#define CMD_S25FLXX_READID 0x90/* Read Manufacture ID and Device ID */ +#define CMD_S25FLXX_WREN 0x06/* Write Enable */ +#define CMD_S25FLXX_WRDI 0x04/* Write Disable */ +#define CMD_S25FLXX_RDSR 0x05/* Read Status Register */ +#define CMD_S25FLXX_WRSR 0x01/* Write Status Register */ +#define CMD_S25FLXX_PP 0x02/* Page Program */ +#define CMD_S25FLXX_SE 0xd8/* Sector Erase */ +#define CMD_S25FLXX_BE 0xc7/* Bulk Erase */ +#define CMD_S25FLXX_DP 0xb9/* Deep Power-down */ +#define CMD_S25FLXX_RES0xab/* Release from DP, and Read Signature */ + +#define SPSN_ID_S25FL008A 0x0213 +#define SPSN_ID_S25FL016A 0x0214 +#define SPSN_ID_S25FL032A 0x0215 +#define SPSN_ID_S25FL064A 0x0216 +#define SPSN_ID_S25FL128P 0x2018 +#define SPSN_EXT_ID_S25FL128P_256KB0x0300 +#define SPSN_EXT_ID_S25FL128P_64KB 0x0301 + +#define SPANSION_SR_WIP(1 0)/* Write-in-Progress */ + +struct spansion_spi_flash_params { + u16 idcode1; + u16 idcode2; + u16 page_size; + u16 pages_per_sector; + u16 nr_sectors; + const char *name; +}; + +struct spansion_spi_flash { + struct spi_flash flash; + const struct spansion_spi_flash_params *params; +}; + +static inline struct spansion_spi_flash *to_spansion_spi_flash(struct spi_flash +*flash) +{ + return container_of(flash, struct spansion_spi_flash, flash); +} + +static const struct spansion_spi_flash_params spansion_spi_flash_table[] = { + { + .idcode1 = SPSN_ID_S25FL008A, + .idcode2 = 0, + .page_size = 256, + .pages_per_sector = 256, + .nr_sectors = 16, + .name = S25FL008A, + }, + { + .idcode1 = SPSN_ID_S25FL016A, + .idcode2 = 0, + .page_size = 256, + .pages_per_sector = 256, + .nr_sectors = 32, + .name = S25FL016A, + }, + { + .idcode1 = SPSN_ID_S25FL032A, + .idcode2 = 0, + .page_size = 256, + .pages_per_sector = 256, + .nr_sectors = 64, + .name = S25FL032A, + }, + { + .idcode1 = SPSN_ID_S25FL064A, + .idcode2 = 0, + .page_size = 256, + .pages_per_sector = 256, + .nr_sectors = 128, +
[U-Boot] [PATCH 7/7] sf: stmicro: use common page timeout define
Signed-off-by: Mike Frysinger vap...@gentoo.org CC: Haavard Skinnemoen haavard.skinnem...@atmel.com --- drivers/mtd/spi/stmicro.c |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/spi/stmicro.c b/drivers/mtd/spi/stmicro.c index e401cd0..b43e9f4 100644 --- a/drivers/mtd/spi/stmicro.c +++ b/drivers/mtd/spi/stmicro.c @@ -295,8 +295,7 @@ int stmicro_erase(struct spi_flash *flash, u32 offset, size_t len) break; } - /* Up to 2 seconds */ - ret = stmicro_wait_ready(flash, 2 * CONFIG_SYS_HZ); + ret = stmicro_wait_ready(flash, SPI_FLASH_PAGE_ERASE_TIMEOUT); if (ret 0) { debug(SF: STMicro page erase timed out\n); break; -- 1.6.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 5/7] sf: stmicro: drop redundant id read
The common SPI flash code reads the idcode and passes it down to the SPI flash driver, so there is no need to read it again ourselves. Signed-off-by: Mike Frysinger vap...@gentoo.org Acked-by: Haavard Skinnemoen haavard.skinnem...@atmel.com CC: Jason McMullan mcmul...@netapp.com CC: TsiChung Liew tsi-chung.l...@freescale.com --- drivers/mtd/spi/stmicro.c |8 +--- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/drivers/mtd/spi/stmicro.c b/drivers/mtd/spi/stmicro.c index e7dda91..e401cd0 100644 --- a/drivers/mtd/spi/stmicro.c +++ b/drivers/mtd/spi/stmicro.c @@ -315,12 +315,6 @@ struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 * idcode) const struct stmicro_spi_flash_params *params; struct stmicro_spi_flash *stm; unsigned int i; - int ret; - u8 id[3]; - - ret = spi_flash_cmd(spi, CMD_READ_ID, id, sizeof(id)); - if (ret) - return NULL; for (i = 0; i ARRAY_SIZE(stmicro_spi_flash_table); i++) { params = stmicro_spi_flash_table[i]; @@ -330,7 +324,7 @@ struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 * idcode) } if (i == ARRAY_SIZE(stmicro_spi_flash_table)) { - debug(SF: Unsupported STMicro ID %02x\n, id[1]); + debug(SF: Unsupported STMicro ID %02x\n, idcode[1]); return NULL; } -- 1.6.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 6/7] sf: always read 5 bytes for the idcode
Some SPI flash drivers like to have extended id information available (like the spansion flash), so rather than making it re-issue the ID cmd to get at the last 2 bytes, have the common code read 5 bytes rather than just 3. This also matches the Linux behavior where it always reads 5 id bytes from all flashes. Signed-off-by: Mike Frysinger vap...@gentoo.org Acked-by: Haavard Skinnemoen haavard.skinnem...@atmel.com CC: Mingkai Hu mingkai...@freescale.com --- drivers/mtd/spi/spansion.c | 10 ++ drivers/mtd/spi/spi_flash.c |6 +++--- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/mtd/spi/spansion.c b/drivers/mtd/spi/spansion.c index 3dcccd3..fdb7917 100644 --- a/drivers/mtd/spi/spansion.c +++ b/drivers/mtd/spi/spansion.c @@ -310,15 +310,9 @@ struct spi_flash *spi_flash_probe_spansion(struct spi_slave *spi, u8 *idcode) struct spansion_spi_flash *spsn; unsigned int i; unsigned short jedec, ext_jedec; - int ret; - u8 id[5] = {0}; - - ret = spi_flash_cmd(spi, CMD_READ_ID, id, sizeof(id)); - if (ret) - return NULL; - jedec = id[1] 8 | id[2]; - ext_jedec = id[3] 8 | id[4]; + jedec = idcode[1] 8 | idcode[2]; + ext_jedec = idcode[3] 8 | idcode[4]; for (i = 0; i ARRAY_SIZE(spansion_spi_flash_table); i++) { params = spansion_spi_flash_table[i]; diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index 21ba5f9..274895a 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -101,7 +101,7 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, struct spi_slave *spi; struct spi_flash *flash; int ret; - u8 idcode[3]; + u8 idcode[5]; spi = spi_setup_slave(bus, cs, max_hz, spi_mode); if (!spi) { @@ -120,8 +120,8 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, if (ret) goto err_read_id; - debug(SF: Got idcode %02x %02x %02x\n, idcode[0], - idcode[1], idcode[2]); + debug(SF: Got idcode %02x %02x %02x %02x %02x\n, idcode[0], + idcode[1], idcode[2], idcode[3], idcode[4]); switch (idcode[0]) { #ifdef CONFIG_SPI_FLASH_SPANSION -- 1.6.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 4/7] sf: add driver for SST flashes
Signed-off-by: Mike Frysinger vap...@gentoo.org Acked-by: Haavard Skinnemoen haavard.skinnem...@atmel.com --- drivers/mtd/spi/Makefile |1 + drivers/mtd/spi/spi_flash.c |5 + drivers/mtd/spi/spi_flash_internal.h |1 + drivers/mtd/spi/sst.c| 358 ++ 4 files changed, 365 insertions(+), 0 deletions(-) create mode 100644 drivers/mtd/spi/sst.c diff --git a/drivers/mtd/spi/Makefile b/drivers/mtd/spi/Makefile index 6ca6073..a71b16e 100644 --- a/drivers/mtd/spi/Makefile +++ b/drivers/mtd/spi/Makefile @@ -28,6 +28,7 @@ LIB := $(obj)libspi_flash.a COBJS-$(CONFIG_SPI_FLASH) += spi_flash.o COBJS-$(CONFIG_SPI_FLASH_ATMEL)+= atmel.o COBJS-$(CONFIG_SPI_FLASH_SPANSION) += spansion.o +COBJS-$(CONFIG_SPI_FLASH_SST) += sst.o COBJS-$(CONFIG_SPI_FLASH_STMICRO) += stmicro.o COBJS := $(COBJS-y) diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index f002c0e..21ba5f9 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -139,6 +139,11 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, flash = spi_flash_probe_stmicro(spi, idcode); break; #endif +#ifdef CONFIG_SPI_FLASH_SST + case 0xBF: + flash = spi_flash_probe_sst(spi, idcode); + break; +#endif default: debug(SF: Unsupported manufacturer %02X\n, idcode[0]); flash = NULL; diff --git a/drivers/mtd/spi/spi_flash_internal.h b/drivers/mtd/spi/spi_flash_internal.h index 75f5900..2d020c3 100644 --- a/drivers/mtd/spi/spi_flash_internal.h +++ b/drivers/mtd/spi/spi_flash_internal.h @@ -43,4 +43,5 @@ int spi_flash_read_common(struct spi_flash *flash, const u8 *cmd, /* Manufacturer-specific probe functions */ struct spi_flash *spi_flash_probe_spansion(struct spi_slave *spi, u8 *idcode); struct spi_flash *spi_flash_probe_atmel(struct spi_slave *spi, u8 *idcode); +struct spi_flash *spi_flash_probe_sst(struct spi_slave *spi, u8 *idcode); struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 *idcode); diff --git a/drivers/mtd/spi/sst.c b/drivers/mtd/spi/sst.c new file mode 100644 index 000..62236d4 --- /dev/null +++ b/drivers/mtd/spi/sst.c @@ -0,0 +1,358 @@ +/* + * Driver for SST serial flashes + * + * (C) Copyright 2000-2002 + * Wolfgang Denk, DENX Software Engineering, w...@denx.de. + * Copyright 2008, Network Appliance Inc. + * Jason McMullan mcmul...@netapp.com + * Copyright (C) 2004-2007 Freescale Semiconductor, Inc. + * TsiChung Liew (tsi-chung.l...@freescale.com) + * Copyright (c) 2008-2009 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + +#include common.h +#include malloc.h +#include spi_flash.h + +#include spi_flash_internal.h + +#define CMD_SST_WREN 0x06/* Write Enable */ +#define CMD_SST_WRDI 0x04/* Write Disable */ +#define CMD_SST_RDSR 0x05/* Read Status Register */ +#define CMD_SST_WRSR 0x01/* Write Status Register */ +#define CMD_SST_READ 0x03/* Read Data Bytes */ +#define CMD_SST_FAST_READ 0x0b/* Read Data Bytes at Higher Speed */ +#define CMD_SST_BP 0x02/* Byte Program */ +#define CMD_SST_AAI_WP 0xAD/* Auto Address Increment Word Program */ +#define CMD_SST_SE 0x20/* Sector Erase */ + +#define SST_SR_WIP (1 0)/* Write-in-Progress */ +#define SST_SR_WEL (1 1)/* Write enable */ +#define SST_SR_BP0 (1 2)/* Block Protection 0 */ +#define SST_SR_BP1 (1 3)/* Block Protection 1 */ +#define SST_SR_BP2 (1 4)/* Block Protection 2 */ +#define SST_SR_AAI (1 6)/* Addressing mode */ +#define SST_SR_BPL (1 7)/* BP bits lock */ + +struct sst_spi_flash_params { + u8 idcode1; + u16 nr_sectors; + const char *name; +}; + +struct sst_spi_flash { + struct spi_flash flash; + const struct sst_spi_flash_params *params; +}; + +static inline struct sst_spi_flash *to_sst_spi_flash(struct spi_flash *flash) +{ + return container_of(flash, struct sst_spi_flash, flash); +} + +#define SST_SECTOR_SIZE (4 * 1024) +static const struct sst_spi_flash_params sst_spi_flash_table[] = { + { + .idcode1 = 0x01, + .nr_sectors = 128, + .name = SST25WF512, + },{ + .idcode1 = 0x02, + .nr_sectors = 256, + .name = SST25WF010, + },{ + .idcode1 = 0x03, + .nr_sectors = 512, + .name = SST25WF020, + },{ + .idcode1 = 0x04, + .nr_sectors = 1024, + .name = SST25WF040, + }, +}; + +static int +sst_wait_ready(struct spi_flash *flash, unsigned long timeout) +{ + struct spi_slave *spi = flash-spi; +
Re: [U-Boot] [PATCH] [ARM] Move machine specific code to board at s3c64xx (v2)
On 10:18 Wed 26 Nov , Kyungmin Park wrote: Move machine specific code to smdk6400. Some board use OneNAND instead of NAND. Some register MP0_CS_CFG[5:0] are controled by both h/w and s/w. So it's better to use macro instead of hard-coded value. Signed-off-by: Kyungmin Park kyungmin.p...@samsung.com --- Applied Best Regards, J. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] s3c64xx: support the soft reset at s3c6410
On 19:36 Thu 02 Apr , Minkyu Kang wrote: This patch support the soft reset at s3c6410 Signed-off-by: Minkyu Kang mk7.k...@samsung.com --- cpu/arm1176/cpu.c |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/cpu/arm1176/cpu.c b/cpu/arm1176/cpu.c index 1e94f7d..cb13d9c 100644 --- a/cpu/arm1176/cpu.c +++ b/cpu/arm1176/cpu.c @@ -112,7 +112,11 @@ int cleanup_before_linux (void) void reset_cpu (ulong ignored) { printf(reset... \n\n\n); +#if defined(CONFIG_S3C6410) + SW_RST_REG = 0x6410; +#else SW_RST_REG = 0x6400; +#endif this is soc specific please move to the soc and please use proper accessor Best Regards, J. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RFC PATCH] drivers/usb: regorganisation
On Wednesday 01 April 2009 13:21:19 Jean-Christophe PLAGNIOL-VILLARD wrote: drivers/usb/{ = gadget}/Makefile| 19 +-- drivers/usb/{ = gadget}/usbdcore_ep0.c |2 +- drivers/usb/{ = gadget}/usbdcore_mpc8xx.c |4 ++-- drivers/usb/{ = gadget}/usbdcore_omap1510.c |4 ++-- sounds like a good idea ... the task of identifying available gadget drivers has been a pain with the current setup. -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] release timing wrt linux
can we shorten/elongate (doesnt matter to me) the next release process ? the original time frame was picked so as to not overlap with the linux kernel, but the current merge window did exactly that :(. -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 05/13] Blackfin: bf518f-ezbrd: new board port
Signed-off-by: Mike Frysinger vap...@gentoo.org --- MAINTAINERS |1 + MAKEALL |1 + Makefile |6 +- board/bf518f-ezbrd/.gitignore |1 + board/bf518f-ezbrd/Makefile | 57 ++ board/bf518f-ezbrd/bf518f-ezbrd.c | 101 + board/bf518f-ezbrd/config.mk | 32 board/bf518f-ezbrd/u-boot.lds.S | 124 +++ include/configs/bf518f-ezbrd.h| 147 + 9 files changed, 467 insertions(+), 3 deletions(-) create mode 100644 board/bf518f-ezbrd/.gitignore create mode 100644 board/bf518f-ezbrd/Makefile create mode 100644 board/bf518f-ezbrd/bf518f-ezbrd.c create mode 100644 board/bf518f-ezbrd/config.mk create mode 100644 board/bf518f-ezbrd/u-boot.lds.S create mode 100644 include/configs/bf518f-ezbrd.h diff --git a/MAINTAINERS b/MAINTAINERS index c3db24d..284f5c6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -854,6 +854,7 @@ Yusuke Goda goda.yus...@renesas.com Mike Frysinger vap...@gentoo.org Blackfin Team u-boot-de...@blackfin.uclinux.org + BF518F-EZBRDBF518 BF526-EZBRD BF526 BF527-EZKIT BF527 BF533-EZKIT BF533 diff --git a/MAKEALL b/MAKEALL index 982b7fb..4a55e04 100755 --- a/MAKEALL +++ b/MAKEALL @@ -788,6 +788,7 @@ LIST_avr32=\ # LIST_blackfin=\ + bf518f-ezbrd\ bf526-ezbrd \ bf527-ezkit \ bf533-ezkit \ diff --git a/Makefile b/Makefile index ffd516b..724d66d 100644 --- a/Makefile +++ b/Makefile @@ -3336,8 +3336,8 @@ suzaku_config:unconfig # # Analog Devices boards -BFIN_BOARDS = bf526-ezbrd bf527-ezkit bf533-ezkit bf533-stamp bf537-stamp \ - bf538f-ezkit bf548-ezkit bf561-ezkit +BFIN_BOARDS = bf518f-ezbrd bf526-ezbrd bf527-ezkit bf533-ezkit bf533-stamp \ + bf537-stamp bf538f-ezkit bf548-ezkit bf561-ezkit $(BFIN_BOARDS:%=%_config) : unconfig @$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=) @@ -3511,7 +3511,7 @@ clean: $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin} \ $(obj)board/trab/trab_fkt $(obj)board/voiceblue/eeprom \ $(obj)board/armltd/{integratorap,integratorcp}/u-boot.lds \ - $(obj)board/bf5{26,27,33,38f,48,61}-ez{brd,kit}/u-boot.lds \ + $(obj)board/bf5{18f,26,27,33,38f,48,61}-ez{brd,kit}/u-boot.lds \ $(obj)board/bf5{33,37}-stamp/u-boot.lds\ $(obj)cpu/blackfin/bootrom-asm-offsets.[chs] @rm -f $(obj)include/bmp_logo.h diff --git a/board/bf518f-ezbrd/.gitignore b/board/bf518f-ezbrd/.gitignore new file mode 100644 index 000..945f324 --- /dev/null +++ b/board/bf518f-ezbrd/.gitignore @@ -0,0 +1 @@ +/u-boot.lds diff --git a/board/bf518f-ezbrd/Makefile b/board/bf518f-ezbrd/Makefile new file mode 100644 index 000..1b21728 --- /dev/null +++ b/board/bf518f-ezbrd/Makefile @@ -0,0 +1,57 @@ +# +# U-boot - Makefile +# +# Copyright (c) 2005-2008 Analog Device Inc. +# +# (C) Copyright 2000-2006 +# Wolfgang Denk, DENX Software Engineering, w...@denx.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 +# + +include $(TOPDIR)/config.mk + +LIB= $(obj)lib$(BOARD).a + +COBJS-y:= $(BOARD).o + +SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS-y)) + +$(LIB):$(obj).depend $(OBJS) $(SOBJS) $(obj)u-boot.lds + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) + +$(obj)u-boot.lds: u-boot.lds.S + $(CPP) $(CPPFLAGS) -D__ASSEMBLY__ -P $^ $@ + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak $(obj).depend + +# + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# diff --git a/board/bf518f-ezbrd/bf518f-ezbrd.c
[U-Boot] [PATCH 11/13] Blackfin: add BF538/BF539 SPI portmux handling
Signed-off-by: Mike Frysinger vap...@gentoo.org --- drivers/spi/bfin_spi.c | 18 ++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/drivers/spi/bfin_spi.c b/drivers/spi/bfin_spi.c index 0472c1a..bc3394a 100644 --- a/drivers/spi/bfin_spi.c +++ b/drivers/spi/bfin_spi.c @@ -36,6 +36,11 @@ MAKE_SPI_FUNC(SPI_BAUD, 0x14) __attribute__((weak)) int spi_cs_is_valid(unsigned int bus, unsigned int cs) { +#if defined(__ADSPBF538__) || defined(__ADSPBF539__) + /* The SPI1/SPI2 buses are weird ... only 1 CS */ + if (bus 0 cs != 1) + return 0; +#endif return (cs = 1 cs = 7); } @@ -204,6 +209,19 @@ static void spi_portmux(struct spi_slave *slave) } bfin_write_PORT_MUX(mux); bfin_write_PORTF_FER(f_fer); +#elif defined(__ADSPBF538__) || defined(__ADSPBF539__) + u16 fer, pins; + if (slave-bus == 1) + pins = PD0 | PD1 | PD2 | (slave-cs == 1 ? PD4 : 0); + else if (slave-bus == 2) + pins = PD5 | PD6 | PD7 | (slave-cs == 1 ? PD9 : 0); + else + pins = 0; + if (pins) { + fer = bfin_read_PORTDIO_FER(); + fer = ~pins; + bfin_write_PORTDIO_FER(fer); + } #elif defined(__ADSPBF54x__) #define DO_MUX(port, pin) \ mux = ((mux ~PORT_x_MUX_##pin##_MASK) | PORT_x_MUX_##pin##_FUNC_1); \ -- 1.6.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 06/13] Blackfin: fix crash when booting from external memory
When testing a u-boot binary that hasn't been booted from the bootrom, we have to make sure the bootstruct structure has sane storage space. If we don't, the initcode will crash when it tries to dereference an invalid pointer. Signed-off-by: Mike Frysinger vap...@gentoo.org --- cpu/blackfin/initcode.c |9 + cpu/blackfin/start.S|2 ++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/cpu/blackfin/initcode.c b/cpu/blackfin/initcode.c index 7bd4b22..3120447 100644 --- a/cpu/blackfin/initcode.c +++ b/cpu/blackfin/initcode.c @@ -249,6 +249,8 @@ static inline void serial_putc(char c) BOOTROM_CALLED_FUNC_ATTR void initcode(ADI_BOOT_DATA *bootstruct) { + ADI_BOOT_DATA bootstruct_scratch; + /* Save the clock pieces that are used in baud rate calculation */ unsigned int sdivB, divB, vcoB; serial_init(); @@ -260,6 +262,13 @@ void initcode(ADI_BOOT_DATA *bootstruct) serial_putc('A'); + /* If the bootstruct is NULL, then it's because we're loading +* dynamically and not via LDR (bootrom). So set the struct to +* some scratch space. +*/ + if (!bootstruct) + bootstruct = bootstruct_scratch; + #ifdef CONFIG_HW_WATCHDOG # ifndef CONFIG_HW_WATCHDOG_TIMEOUT_INITCODE # define CONFIG_HW_WATCHDOG_TIMEOUT_INITCODE 2 diff --git a/cpu/blackfin/start.S b/cpu/blackfin/start.S index 506fea5..7cbd632 100644 --- a/cpu/blackfin/start.S +++ b/cpu/blackfin/start.S @@ -131,6 +131,7 @@ ENTRY(_start) r3.h = 0x2000; cc = r5 r3 (iu); if cc jump .Ldma_and_reprogram; + r0 = 0 (x); /* set bootstruct to NULL */ call _initcode; jump .Lprogrammed; @@ -147,6 +148,7 @@ ENTRY(_start) r1 = r1 + r5; /* ... to current (not load) address of initcode */ p3 = r0; call _dma_memcpy_nocache; + r0 = 0 (x); /* set bootstruct to NULL */ call (p3); /* Since we reprogrammed SCLK, we need to update the serial divisor */ -- 1.6.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 13/13] Blackfin: force all boards to HZ of 1000
On 06:45 Thu 02 Apr , Mike Frysinger wrote: Since the Blackfin timer code requires HZ to be 1000, barf on any board that tries to use a different value. Signed-off-by: Mike Frysinger vap...@gentoo.org --- include/asm-blackfin/blackfin-config-post.h |8 ++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/asm-blackfin/blackfin-config-post.h b/include/asm-blackfin/blackfin-config-post.h index fea4737..623fdc7 100644 --- a/include/asm-blackfin/blackfin-config-post.h +++ b/include/asm-blackfin/blackfin-config-post.h @@ -135,9 +135,13 @@ #ifndef CONFIG_SYS_MAXARGS # define CONFIG_SYS_MAXARGS 16 #endif -#ifndef CONFIG_SYS_HZ -# define CONFIG_SYS_HZ 1000 +#if defined(CONFIG_SYS_HZ) +# if (CONFIG_SYS_HZ != 1000) +# warning CONFIG_SYS_HZ must always be 1000 +# endif +# undef CONFIG_SYS_HZ does this is really necessary? #endif +#define CONFIG_SYS_HZ 1000 why not asm-blackfin/config.h? Best Regards, J. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/3] arm: clean cache management
On 00:39 Thu 02 Apr , Wolfgang Denk wrote: Dear Jean-Christophe PLAGNIOL-VILLARD, In message 1238431700-7803-2-git-send-email-plagn...@jcrosoft.com you wrote: unify arm cache management except for non standard cache as ARM7TDMI Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com ... + echo /* May not be cahed processor */ tmp.fil cahed? Typo for cached? yes What is a cached processor ? some arm processor or prototype does not have cache support Best Regards, J. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] s3c64xx: support the soft reset at s3c6410
This patch support the soft reset at s3c6410 Signed-off-by: Minkyu Kang mk7.k...@samsung.com --- cpu/arm1176/cpu.c |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/cpu/arm1176/cpu.c b/cpu/arm1176/cpu.c index 1e94f7d..cb13d9c 100644 --- a/cpu/arm1176/cpu.c +++ b/cpu/arm1176/cpu.c @@ -112,7 +112,11 @@ int cleanup_before_linux (void) void reset_cpu (ulong ignored) { printf(reset... \n\n\n); +#if defined(CONFIG_S3C6410) + SW_RST_REG = 0x6410; +#else SW_RST_REG = 0x6400; +#endif /* loop forever and wait for reset to happen */ while (1) { if (serial_tstc()) { ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 10/13] Blackfin: do not delay on output bytes
Signed-off-by: Mike Frysinger vap...@gentoo.org --- cpu/blackfin/serial.c |4 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/cpu/blackfin/serial.c b/cpu/blackfin/serial.c index 42534bd..3861955 100644 --- a/cpu/blackfin/serial.c +++ b/cpu/blackfin/serial.c @@ -115,10 +115,6 @@ void serial_putc(const char c) SSYNC(); WATCHDOG_RESET(); - - /* wait for the byte to be shifted over the line */ - while (!(uart_lsr_read() TEMT)) - continue; } int serial_tstc(void) -- 1.6.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 08/13] Blackfin: convert bfin_sdh to legacy mmc
The Blackfin SDH controller is still using the legacy framework, so update the driver to use the renamed functions. Signed-off-by: Mike Frysinger vap...@gentoo.org --- drivers/mmc/bfin_sdh.c | 14 ++ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/mmc/bfin_sdh.c b/drivers/mmc/bfin_sdh.c index 7d6b495..16c9695 100644 --- a/drivers/mmc/bfin_sdh.c +++ b/drivers/mmc/bfin_sdh.c @@ -293,7 +293,7 @@ mmc_bwrite(int dev, unsigned long start, lbaint_t blkcnt, const void *buffer) printf(MMC_CMD_SET_BLOCKLEN failed\n); goto out; } - ret = mmc_cmd(MMC_CMD_WRITE_BLOCK, + ret = mmc_cmd(MMC_CMD_WRITE_SINGLE_BLOCK, start * mmc_blkdev.blksz, resp, MMC_RSP_R1); if (ret) { @@ -462,7 +462,7 @@ static int mmc_init_card(struct mmc_cid *cid, int verbose) return ret; } -int mmc_init(int verbose) +int mmc_legacy_init(int verbose) { __u16 pwr_ctl = 0; int ret; @@ -530,16 +530,6 @@ int mmc_init(int verbose) return 0; } -int mmc_read(ulong src, uchar *dst, int size) -{ - return -ENOSYS; -} - -int mmc_write(uchar *src, ulong dst, int size) -{ - return -ENOSYS; -} - int mmc2info(ulong addr) { return 0; -- 1.6.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 07/13] Blackfin: bf537-stamp: split CF/IDE code out into dedicated cf-ide.c
Signed-off-by: Mike Frysinger vap...@gentoo.org --- board/bf537-stamp/Makefile |1 + board/bf537-stamp/bf537-stamp.c | 57 ++--- board/bf537-stamp/ide-cf.c | 66 +++ 3 files changed, 70 insertions(+), 54 deletions(-) create mode 100644 board/bf537-stamp/ide-cf.c diff --git a/board/bf537-stamp/Makefile b/board/bf537-stamp/Makefile index 3b875a3..1dbf406 100644 --- a/board/bf537-stamp/Makefile +++ b/board/bf537-stamp/Makefile @@ -30,6 +30,7 @@ include $(TOPDIR)/config.mk LIB= $(obj)lib$(BOARD).a COBJS-y:= $(BOARD).o cmd_bf537led.o +COBJS-$(CONFIG_BFIN_IDE) += ide-cf.o COBJS-$(CONFIG_CMD_EEPROM) += spi_flash.o COBJS-$(CONFIG_CMD_NAND) += nand.o COBJS-$(CONFIG_POST) += post.o post-memory.o diff --git a/board/bf537-stamp/bf537-stamp.c b/board/bf537-stamp/bf537-stamp.c index 16ffe2f..28597c9 100644 --- a/board/bf537-stamp/bf537-stamp.c +++ b/board/bf537-stamp/bf537-stamp.c @@ -43,43 +43,6 @@ int checkboard(void) return 0; } -#if defined(CONFIG_BFIN_IDE) - -void cf_outb(unsigned char val, volatile unsigned char *addr) -{ - *(addr) = val; - SSYNC(); -} - -unsigned char cf_inb(volatile unsigned char *addr) -{ - volatile unsigned char c; - - c = *(addr); - SSYNC(); - - return c; -} - -void cf_insw(unsigned short *sect_buf, unsigned short *addr, int words) -{ - int i; - - for (i = 0; i words; i++) - *(sect_buf + i) = *(addr); - SSYNC(); -} - -void cf_outsw(unsigned short *addr, unsigned short *sect_buf, int words) -{ - int i; - - for (i = 0; i words; i++) - *(addr) = *(sect_buf + i); - SSYNC(); -} -#endif /* CONFIG_BFIN_IDE */ - phys_size_t initdram(int board_type) { gd-bd-bi_memstart = CONFIG_SYS_SDRAM_BASE; @@ -130,7 +93,6 @@ int board_eth_init(bd_t *bis) } #endif -#if defined(CONFIG_MISC_INIT_R) /* miscellaneous platform dependent initialisations */ int misc_init_r(void) { @@ -146,22 +108,9 @@ int misc_init_r(void) flash_protect(FLAG_PROTECT_SET, 0x203F, 0x203F, flash_info[0]); #endif -#if defined(CONFIG_BFIN_IDE) -#if defined(CONFIG_BFIN_TRUE_IDE) - /* Enable ATASEL when in True IDE mode */ - printf(Using CF True IDE Mode\n); - cf_outb(0, (unsigned char *)CONFIG_CF_ATASEL_ENA); - udelay(1000); -#elif defined(CONFIG_BFIN_CF_IDE) - /* Disable ATASEL when we're in Common Memory Mode */ - printf(Using CF Common Memory Mode\n); - cf_outb(0, (unsigned char *)CONFIG_CF_ATASEL_DIS); - udelay(1000); -#elif defined(CONFIG_BFIN_HDD_IDE) - printf(Using HDD IDE Mode\n); +#ifdef CONFIG_BFIN_IDE + cf_ide_init(); #endif - ide_init(); -#endif /* CONFIG_BFIN_IDE */ + return 0; } -#endif /* CONFIG_MISC_INIT_R */ diff --git a/board/bf537-stamp/ide-cf.c b/board/bf537-stamp/ide-cf.c new file mode 100644 index 000..5a3720d --- /dev/null +++ b/board/bf537-stamp/ide-cf.c @@ -0,0 +1,66 @@ +/* + * CF IDE addon card code + * + * Enter bugs at http://blackfin.uclinux.org/ + * + * Copyright (c) 2005-2009 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + +#include common.h +#include config.h +#include command.h +#include asm/blackfin.h + +void cf_outb(unsigned char val, volatile unsigned char *addr) +{ + *(addr) = val; + SSYNC(); +} + +unsigned char cf_inb(volatile unsigned char *addr) +{ + volatile unsigned char c; + + c = *(addr); + SSYNC(); + + return c; +} + +void cf_insw(unsigned short *sect_buf, unsigned short *addr, int words) +{ + int i; + + for (i = 0; i words; i++) + *(sect_buf + i) = *(addr); + SSYNC(); +} + +void cf_outsw(unsigned short *addr, unsigned short *sect_buf, int words) +{ + int i; + + for (i = 0; i words; i++) + *(addr) = *(sect_buf + i); + SSYNC(); +} + +void cf_ide_init(void) +{ +#if defined(CONFIG_BFIN_TRUE_IDE) + /* Enable ATASEL when in True IDE mode */ + printf(Using CF True IDE Mode\n); + cf_outb(0, (unsigned char *)CONFIG_CF_ATASEL_ENA); + udelay(1000); +#elif defined(CONFIG_BFIN_CF_IDE) + /* Disable ATASEL when we're in Common Memory Mode */ + printf(Using CF Common Memory Mode\n); + cf_outb(0, (unsigned char *)CONFIG_CF_ATASEL_DIS); + udelay(1000); +#elif defined(CONFIG_BFIN_HDD_IDE) + printf(Using HDD IDE Mode\n); +#endif + ide_init(); +} -- 1.6.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 09/13] Blackfin: drop newline from OTP help
Looks like I accidentally added a newline to the OTP help when merging and older change. Signed-off-by: Mike Frysinger vap...@gentoo.org --- common/cmd_otp.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/common/cmd_otp.c b/common/cmd_otp.c index 6523290..4be4344 100644 --- a/common/cmd_otp.c +++ b/common/cmd_otp.c @@ -225,7 +225,7 @@ int do_otp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } U_BOOT_CMD(otp, 7, 0, do_otp, - One-Time-Programmable sub-system\n, + One-Time-Programmable sub-system, read addr page [count] [half]\n - read 'count' half-pages starting at 'page' (offset 'half') to 'addr'\n otp dump addr page [count] [half]\n -- 1.6.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 7/7] sf: stmicro: use common page timeout define
Mike Frysinger wrote: - /* Up to 2 seconds */ - ret = stmicro_wait_ready(flash, 2 * CONFIG_SYS_HZ); + ret = stmicro_wait_ready(flash, SPI_FLASH_PAGE_ERASE_TIMEOUT); 50 ms is an awful lot less than 2 seconds. Sure this is safe? Haavard ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 13/13] Blackfin: force all boards to HZ of 1000
On Thursday 02 April 2009 06:57:03 Jean-Christophe PLAGNIOL-VILLARD wrote: On 06:45 Thu 02 Apr , Mike Frysinger wrote: Since the Blackfin timer code requires HZ to be 1000, barf on any board that tries to use a different value. Signed-off-by: Mike Frysinger vap...@gentoo.org --- include/asm-blackfin/blackfin-config-post.h |8 ++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/asm-blackfin/blackfin-config-post.h b/include/asm-blackfin/blackfin-config-post.h index fea4737..623fdc7 100644 --- a/include/asm-blackfin/blackfin-config-post.h +++ b/include/asm-blackfin/blackfin-config-post.h @@ -135,9 +135,13 @@ #ifndef CONFIG_SYS_MAXARGS # define CONFIG_SYS_MAXARGS 16 #endif -#ifndef CONFIG_SYS_HZ -# define CONFIG_SYS_HZ 1000 +#if defined(CONFIG_SYS_HZ) +# if (CONFIG_SYS_HZ != 1000) +# warning CONFIG_SYS_HZ must always be 1000 +# endif +# undef CONFIG_SYS_HZ does this is really necessary? to prevent insane people today, sure. it'll probably fall out when i start my cleanup ticks and timer work for the next merge though ... #endif +#define CONFIG_SYS_HZ 1000 why not asm-blackfin/config.h? there is no such file ? there are pre/post config files for Blackfin ports which contain Blackfin-specific settings. for vendor-specific common settings, there are files in the normal include/config/ tree. -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 7/7] sf: stmicro: use common page timeout define
On Thursday 02 April 2009 07:20:13 Haavard Skinnemoen wrote: Mike Frysinger wrote: - /* Up to 2 seconds */ - ret = stmicro_wait_ready(flash, 2 * CONFIG_SYS_HZ); + ret = stmicro_wait_ready(flash, SPI_FLASH_PAGE_ERASE_TIMEOUT); 50 ms is an awful lot less than 2 seconds. Sure this is safe? the 2 sec mark was copied in all spi flash drivers based on the original port rather than referring to a datasheet, and it works on my Blackfin boards that have stmicro parts. personally i think the timeouts in the current spi flash common code is too low in general, so i'd propose we raise them. after all, the timeouts only matter in when something goes wrong, so they wouldnt be reached. and the low threshold seems like it makes the presumption of faster SPI bus speeds. i.e. how about raising the timeout values 50x or 100x ? -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] U-boot initialization test
Dear eija_flight, In message 22843365.p...@talk.nabble.com you wrote: Using U-boot 1.3.1 version, It is possible (as a user) to apply all of these test feature into a standalone applications? because I need to log the result using standalone app. U-Boot 1.3.1 is very old and basicly unsupported here. Please use current code. POST results get logged in the log buffer (of course you need log buffer support). You probably can extend the standalone application interface to access the log buffer, but I'm not sure if this makes sense. Why not just using the existing U-Boot facilities? Or pass the log buffer to Linux (see shared log buffer feature in Linux) and process it therer using standard syslog technology? 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: w...@denx.de The fundamental principle of science, the definition almost, is this: the sole test of the validity of any idea is experiment. - Richard P. Feynman ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] exporting do_mem_xx functions
Dear eija_flight, In message 22844927.p...@talk.nabble.com you wrote: It is possible to use standalone apps to do memory operations? If it is possible, then how to do it? Like any other functions, too. Just read the documentation and follow the examples given there. I've been able to exporting some functions for my standalone apps, but getting hard time exporting the do_mem_xx functions.. please let me know if there's some way.. The question is if this request makes sense at all. If you want to run U-Boot commands, you should probably rather provide a shell script to do that. 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: w...@denx.de Landing: a controlled mid-air collision with a planet. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] release timing wrt linux
Dear Mike, In message 200904020716.34368.vap...@gentoo.org you wrote: can we shorten/elongate (doesnt matter to me) the next release process ? the original time frame was picked so as to not overlap with the linux kernel, but the current merge window did exactly that :(. Yes, I'm aware of this, but at least it's not our fault. We've been releasing mostly on schedule, it was the Linux kernel releases that shifted and shifted... Shorten is IMHO not an option, but we can delay it. Please suggest where and when? Make this merge window longer by one week, and this testing phase longer by two weeks? 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: w...@denx.de We do not colonize. We conquer. We rule. There is no other way for us. -- Rojan, By Any Other Name, stardate 4657.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 7/7] sf: stmicro: use common page timeout define
Mike Frysinger wrote: On Thursday 02 April 2009 07:20:13 Haavard Skinnemoen wrote: Mike Frysinger wrote: - /* Up to 2 seconds */ - ret = stmicro_wait_ready(flash, 2 * CONFIG_SYS_HZ); + ret = stmicro_wait_ready(flash, SPI_FLASH_PAGE_ERASE_TIMEOUT); 50 ms is an awful lot less than 2 seconds. Sure this is safe? the 2 sec mark was copied in all spi flash drivers based on the original port rather than referring to a datasheet, and it works on my Blackfin boards that have stmicro parts. Ok, that's good enough for me. personally i think the timeouts in the current spi flash common code is too low in general, so i'd propose we raise them. after all, the timeouts only matter in when something goes wrong, so they wouldnt be reached. and the low threshold seems like it makes the presumption of faster SPI bus speeds. i.e. how about raising the timeout values 50x or 100x ? I think that sounds like a good idea. Haavard ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 13/13] Blackfin: force all boards to HZ of 1000
On 07:21 Thu 02 Apr , Mike Frysinger wrote: On Thursday 02 April 2009 06:57:03 Jean-Christophe PLAGNIOL-VILLARD wrote: On 06:45 Thu 02 Apr , Mike Frysinger wrote: Since the Blackfin timer code requires HZ to be 1000, barf on any board that tries to use a different value. Signed-off-by: Mike Frysinger vap...@gentoo.org --- include/asm-blackfin/blackfin-config-post.h |8 ++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/asm-blackfin/blackfin-config-post.h b/include/asm-blackfin/blackfin-config-post.h index fea4737..623fdc7 100644 --- a/include/asm-blackfin/blackfin-config-post.h +++ b/include/asm-blackfin/blackfin-config-post.h @@ -135,9 +135,13 @@ #ifndef CONFIG_SYS_MAXARGS # define CONFIG_SYS_MAXARGS 16 #endif -#ifndef CONFIG_SYS_HZ -# define CONFIG_SYS_HZ 1000 +#if defined(CONFIG_SYS_HZ) +# if (CONFIG_SYS_HZ != 1000) +# warning CONFIG_SYS_HZ must always be 1000 +# endif +# undef CONFIG_SYS_HZ does this is really necessary? to prevent insane people today, sure. it'll probably fall out when i start my cleanup ticks and timer work for the next merge though ... #endif +#define CONFIG_SYS_HZ 1000 why not asm-blackfin/config.h? there is no such file ? There is now it was introduced by Kumar. Best Regards, J. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] release timing wrt linux
On 13:40 Thu 02 Apr , Wolfgang Denk wrote: Dear Mike, In message 200904020716.34368.vap...@gentoo.org you wrote: can we shorten/elongate (doesnt matter to me) the next release process ? the original time frame was picked so as to not overlap with the linux kernel, but the current merge window did exactly that :(. Yes, I'm aware of this, but at least it's not our fault. We've been releasing mostly on schedule, it was the Linux kernel releases that shifted and shifted... Shorten is IMHO not an option, but we can delay it. Please suggest where and when? Make this merge window longer by one week, and this testing phase longer by two weeks? why not create a release to integrate the Kconfig? Best Regards, J. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 13/13] Blackfin: force all boards to HZ of 1000
On Thursday 02 April 2009 07:28:21 Jean-Christophe PLAGNIOL-VILLARD wrote: On 07:21 Thu 02 Apr , Mike Frysinger wrote: On Thursday 02 April 2009 06:57:03 Jean-Christophe PLAGNIOL-VILLARD wrote: On 06:45 Thu 02 Apr , Mike Frysinger wrote: Since the Blackfin timer code requires HZ to be 1000, barf on any board that tries to use a different value. Signed-off-by: Mike Frysinger vap...@gentoo.org --- include/asm-blackfin/blackfin-config-post.h |8 ++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/asm-blackfin/blackfin-config-post.h b/include/asm-blackfin/blackfin-config-post.h index fea4737..623fdc7 100644 --- a/include/asm-blackfin/blackfin-config-post.h +++ b/include/asm-blackfin/blackfin-config-post.h @@ -135,9 +135,13 @@ #ifndef CONFIG_SYS_MAXARGS # define CONFIG_SYS_MAXARGS 16 #endif -#ifndef CONFIG_SYS_HZ -# define CONFIG_SYS_HZ 1000 +#if defined(CONFIG_SYS_HZ) +# if (CONFIG_SYS_HZ != 1000) +# warning CONFIG_SYS_HZ must always be 1000 +# endif +# undef CONFIG_SYS_HZ does this is really necessary? to prevent insane people today, sure. it'll probably fall out when i start my cleanup ticks and timer work for the next merge though ... #endif +#define CONFIG_SYS_HZ 1000 why not asm-blackfin/config.h? there is no such file ? There is now it was introduced by Kumar. news to me. yes, i can probably wholesale convert the current blackfin- config-post.h to config.h. too late for this merge window though :). -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] sf: set common timeouts in seconds, not milliseconds
Since timeouts are only hit when there is a problem in the system, we don't want to prematurely timeout on a functioning setup. Thus having low timeouts (in milliseconds) doesn't gain us anything in the production case, but rather increases likely hood of causing problems where none otherwise exist. Signed-off-by: Mike Frysinger vap...@gentoo.org CC: Haavard Skinnemoen haavard.skinnem...@atmel.com --- drivers/mtd/spi/spi_flash_internal.h |9 ++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/spi/spi_flash_internal.h b/drivers/mtd/spi/spi_flash_internal.h index 2d020c3..5d1e395 100644 --- a/drivers/mtd/spi/spi_flash_internal.h +++ b/drivers/mtd/spi/spi_flash_internal.h @@ -4,9 +4,12 @@ * Copyright (C) 2008 Atmel Corporation */ -/* Common parameters */ -#define SPI_FLASH_PROG_TIMEOUT ((10 * CONFIG_SYS_HZ) / 1000) -#define SPI_FLASH_PAGE_ERASE_TIMEOUT ((50 * CONFIG_SYS_HZ) / 1000) +/* Common parameters -- kind of high, but they should only occur when there + * is a problem (and well your system already is broken), so err on the side + * of caution in case we're dealing with slower SPI buses and/or processors. + */ +#define SPI_FLASH_PROG_TIMEOUT (2 * CONFIG_SYS_HZ) +#define SPI_FLASH_PAGE_ERASE_TIMEOUT (5 * CONFIG_SYS_HZ) #define SPI_FLASH_SECTOR_ERASE_TIMEOUT (10 * CONFIG_SYS_HZ) /* Common commands */ -- 1.6.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] release timing wrt linux
On Thursday 02 April 2009 07:40:09 Wolfgang Denk wrote: In message Mike wrote: can we shorten/elongate (doesnt matter to me) the next release process ? the original time frame was picked so as to not overlap with the linux kernel, but the current merge window did exactly that :(. Yes, I'm aware of this, but at least it's not our fault. We've been releasing mostly on schedule, it was the Linux kernel releases that shifted and shifted... Shorten is IMHO not an option, but we can delay it. Please suggest where and when? Make this merge window longer by one week, and this testing phase longer by two weeks? that sounds reasonable to me ... maybe leave the exact release time in May open so that if the kernel releases sooner, we can push out, or if it releases later, we can push up. -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] pending patches website
Hi Mike, not so long ago there was some custom thingy that was running on the u-boot website that'd automatically grab patches from the mailing list and try to file them away so they wouldnt get lost. but i cant seem to find it any more. is it gone ? No, it is not gone, it only starts to bitrot :( It also never by itself grabbed patches, but the idea was to post the patches to its own email account which in turn sent acknowledgements to the mailinglist _including_ a unique tracking number which was needed for automatic handling of follow-up mail. Unfortunately the original implementor is not available anymore and we currently do not see how to finish the missing bits, especially the automatic handling of the status of patches. If someone on this list with (solid) Perl knowledge volunteers to pick up the strings, let me know offlist. Cheers Detlev [1] http://bugs.denx.de/databases/u-boot -- The Speedo3 is very similar to other Intel network chips, that is to say apparently designed on a different planet. -- drivers/net/eepro100.c in Linux source -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: d...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] core ticks/timer code
Hi, Dear Scott Wood, In message 20090331212514.ga19...@ld0162-tx32.am.freescale.net you wrote: On Tue, Mar 31, 2009 at 05:48:01PM +0200, Wolfgang Denk wrote: We still need some hint that the timer works in millisecond resolution, though - no matter what you call it. How about just calling it HZ (or something more verbose like TIMER_HZ, but the former makes it easier to share code with Linux) and declaring it in a non-board header? It's OK with me. Other opinions? Obviously only like-minded people around. Who starts? ;) Cheers Detlev -- I will use free software even if it is less powerful, or less reliable, because freedom is the most important thing, and that is what the Free Software movement is about. How we get freedom. -- Richard M. Stallman -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: d...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] pending patches website
On Thursday 02 April 2009 08:32:00 Detlev Zundel wrote: not so long ago there was some custom thingy that was running on the u-boot website that'd automatically grab patches from the mailing list and try to file them away so they wouldnt get lost. but i cant seem to find it any more. is it gone ? No, it is not gone, it only starts to bitrot :( It also never by itself grabbed patches, but the idea was to post the patches to its own email account which in turn sent acknowledgements to the mailinglist _including_ a unique tracking number which was needed for automatic handling of follow-up mail. Unfortunately the original implementor is not available anymore and we currently do not see how to finish the missing bits, especially the automatic handling of the status of patches. If someone on this list with (solid) Perl knowledge volunteers to pick up the strings, let me know offlist. thanks, that was the site i was looking for maybe the lack of automation is a problem ? having a completely custom system is also a problem ... would patchwork satisfy the same tracking needs ? benefits there are: - automation - someone else does the work of developing it - all discussion stays tied to mailing list - it's already being used by many kernel trees dont take this as i love patchwork ... ive never actually used it, but if it's gaining traction in major projects like the kernel, then having u-boot be the same is one less system for developers/contributors to have to be familiar with ... -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] NetLoop initialization bug
Hi Michael, Sorry for the previous mail, I have to enable the git operation via gmail on my workstation. What do you mean by this? Usually you only need a mailer which is capable to attach things inline. Even better - if you have a direct access to an mta or an smtp server, use git-send-email after git-format-patch. Meanwhile I created the patch again by diff. Well this is really more work for the people importing the patches, so if at all possible, get tghe setup working with the automatically generated patches. The patch fixes the bug of partial initialization of global network parameters. Upon u-boot's start up the first ping command causes a failure of the consequent TFTP transfers. It happens in the recently added mechanism of NetLoop initialization where initialization of global network parameters is separated in the NetInitLoop routine which is called per env_id change. Thus, ping request will initialize the network parameters necessary for ping operation only, afterwards the env_changed_id will be set to the env_id that will prevent all following initialization requests from other protocols. The problem is that the initialized by ping subset of network parameters is not sufficient for other protocols and particularly for TFTP which requires the NetServerIp also. Signed-off-by: Michael Zaidman michael.zaidman at gmail.com Please don't elide your e-mail address here. The consent is that we use real e-mail addresses in the signed-off-by lines (as you also did in your previous post). One negative impact for example is that our statistic scripts will fail for such entries. Apart from that you have to nudge Ben or Heiko as to the real content. I only wanted to help get the formalities straight ;) Cheers Detlev -- Number theorists do it perfectly and rationally. -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: d...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] Don't claim that we speak AT
When we claim that we speak AT, Network Manager will send query us with AT commands. Signed-off-by: Russ Dill russ.d...@gmail.com --- drivers/serial/usbtty.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c index 2624e6f..1ed0e4d 100644 --- a/drivers/serial/usbtty.c +++ b/drivers/serial/usbtty.c @@ -178,7 +178,7 @@ static struct acm_config_desc acm_configuration_descriptors[NUM_CONFIGS] = { .bInterfaceClass = COMMUNICATIONS_INTERFACE_CLASS_CONTROL, .bInterfaceSubClass = COMMUNICATIONS_ACM_SUBCLASS, - .bInterfaceProtocol = COMMUNICATIONS_V25TER_PROTOCOL, + .bInterfaceProtocol = COMMUNICATIONS_NO_PROTOCOL, .iInterface = STR_CTRL_INTERFACE, }, .usb_class_header = { -- 1.6.0.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] sf: set common timeouts in seconds, not milliseconds
Mike Frysinger wrote: Since timeouts are only hit when there is a problem in the system, we don't want to prematurely timeout on a functioning setup. Thus having low timeouts (in milliseconds) doesn't gain us anything in the production case, but rather increases likely hood of causing problems where none otherwise exist. Signed-off-by: Mike Frysinger vap...@gentoo.org CC: Haavard Skinnemoen haavard.skinnem...@atmel.com Acked-by: Haavard Skinnemoen haavard.skinnem...@atmel.com ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Problem booting image + device tree (MPC5200B)
Thanks for the tip. I gather that the U-Boot version I'm using (1.2.0) is appropriate for my hardware revision in combination with the phycore-MPC5200B-tiny module as per the link sent by Pengutronix The OSELAS.BSP-Phytec-phyCORE-MPC5200B-tiny-5 release should be still sufficient for you. If you can use this board support package (userland and kernel), you can start to try more recent kernels as the next step. I also installed 2.6.20 from kernel.org and applied the kernel-patches from the OSELAS.BSP-Phytec-phyCORE-MPC5200B-tiny-5. I created a kernel image with ARCH=powerpc and CROSS_COMPILE=powerpc-603e-linux-gnu- and the config file as present in configs/phytec...defconfig The dtb file was created using the installation of dtc present by default with the 2.6.29 kernel sources. The same problem occurs even with kernel 2.6.20. I have not used the Oselas tool-chain or ptxdist as yet. U-Boot 1.2.0 with patches could be installed onto flash memory and images transmitted even without. Is this essential to get a kernel image to boot on the module? I'm enclosing a logfile with my boot messages in case it's some very evident version conflict I've overlooked. Best regards, Nandini - Original Message - From: Marco marco.storne...@gmail.com To: Nandini Hengen nhen...@hengen-ingenieure.de Cc: u-boot@lists.denx.de Sent: Wednesday, April 01, 2009 6:49 PM Subject: Re: [U-Boot] Problem booting image + device tree (MPC5200B) You could try to see if the kernel hangs but it prints something checking __log_buf. In this way you can try to understand the problem. Marco Nandini Hengen ha scritto: Hello, I have also downloaded U-Boot version u-boot-2009.3 Are any additional patches for the MPC5200b-tiny necessary? In case of U-Boot 1.2 I had u-boot-1.2.0.tar.bz2 and u-boot-1.2.0.mpc5200b-tiny-2.tar.gz which added a patches directory to my main directory. A few corrections to my previous email: a.. I'm using the option ARCH=powerpc and the config and dtb options for pcm030 which were present in the 2.6.29 Kernel-Sources I downloaded b.. The modules are basically functional (not toasted as yet ;-) - what I meant to convey was that the kernel images don't seem to be able to boot and the original images it shipped with are not there any longer. I can download a new U-Boot version however. U-Boot 1.2 also seems to recognize the device tree (pcm030.dtb transfered to 0x60 and uImage to 0x40 using tftp). I get the message Booting using flat device tree at 0x60 when I try booting with bootm 0x40 - 0x60. After that it just hangs. I've mailed the Oselas.Phytec group - thanks for the tip. Did you try one of the kernels generated by our board support package for this target? I tried the kernel image uImage-pcm032-2 from pengutronix (assuming it was wrapped) and another pcm030 image which I compiled (generated using the 2.6.x sources on the Kit-CD downloaded from Pengutronix). Both don't seem to work at the moment. Could you please provide me with some links to suitable kernels or images for this target which are definitely functional ? I vaguely remember having read somewhere about the hardware revision number of the mentioned module not being compatible with some kernels - not too sure about this. Best regards Nandini Hengen - Original Message - From: Wolfgang Denk w...@denx.de To: Nandini Hengen nhen...@hengen-ingenieure.de Cc: u-boot@lists.denx.de Sent: Wednesday, April 01, 2009 3:53 PM Subject: Re: [U-Boot] Problem booting image + device tree (MPC5200B) Dear Nandini Hengen, In message b11fc910abee42fda27a3d279e222...@cerec you wrote: I currently have a problem with the device tree - the kernel hangs after unpacking and trying to load the device tree. ... U-Boot Version 1.2 incl. downloaded patches ... combination with U-Boot 1.1.4). I also found a thread which recommended using the newest U-Boot version and loading the dtb file using tftp into RAM separately. Since then I've been using U-Boot 1.2. Until now non of the kernel images generated seem to load (apart from the image the module was originally shipped with) Rigth. The U-Boot versions you mntion are way too old to know about device tree handling. I tried this using two phytec modules - both of which are non-functional at Well, and incorrect kernel will not render a board non-functional. I'm currently wondering whether to send back the modules to Phytec or compiling a different kernel and device tree would help. I recommend to get a recent version of U-Boot running. 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: w...@denx.de The night sky over the planet Krikkit is the least interesting sight in the entire Universe. - Douglas Adams _Life, the
Re: [U-Boot] netconsole in u-boot
Hi Ong, Am trying to configure out how to change my u-boot to be netconsole from serial console. When i key in help in my u-boot start-up, i didnt seen any nc command. U-Boot help In my last e-mail I already pointed you to doc/README.NetConsole. From where in this document do you get the idea tha help should show you somethong about netconsole? coninfo woulb be a much better candidate for getting info... Cheers Detlev -- #!/usr/bin/perl $c=print\\#\!\/usr\/bin\/perl\ \\\$c\=\.quotemeta\(\$c\)\.\;\\n\$c;\; print#!/usr/bin/perl\n\$c=\.quotemeta($c).\;\n$c;; -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: d...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] Don't claim that we speak AT
On Thu, Apr 2, 2009 at 6:16 AM, Mike Frysinger vap...@gentoo.org wrote: On Thursday 02 April 2009 09:06:13 Russ Dill wrote: ... will send query us with ... one of those words should get dropped ... probably send: will query us with ... drivers/serial/usbtty.c | 2 +- please put this info into the subject/summary. a simple usbtty: prefix in the subject would be fine. -mike Sorry, I'm too sleep deprived, let me NAK my own patch here. The kernel won't recognize a device with PROTO_NONE. Maybe in the future this is how serial consoles should be handled. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] pending patches website
On Apr 2, 2009, at 7:44 AM, Mike Frysinger wrote: On Thursday 02 April 2009 08:32:00 Detlev Zundel wrote: not so long ago there was some custom thingy that was running on the u-boot website that'd automatically grab patches from the mailing list and try to file them away so they wouldnt get lost. but i cant seem to find it any more. is it gone ? No, it is not gone, it only starts to bitrot :( It also never by itself grabbed patches, but the idea was to post the patches to its own email account which in turn sent acknowledgements to the mailinglist _including_ a unique tracking number which was needed for automatic handling of follow-up mail. Unfortunately the original implementor is not available anymore and we currently do not see how to finish the missing bits, especially the automatic handling of the status of patches. If someone on this list with (solid) Perl knowledge volunteers to pick up the strings, let me know offlist. thanks, that was the site i was looking for maybe the lack of automation is a problem ? having a completely custom system is also a problem ... would patchwork satisfy the same tracking needs ? benefits there are: - automation - someone else does the work of developing it - all discussion stays tied to mailing list - it's already being used by many kernel trees dont take this as i love patchwork ... ive never actually used it, but if it's gaining traction in major projects like the kernel, then having u-boot be the same is one less system for developers/contributors to have to be familiar with ... I would suggest patchworks as well just because there are those of us already using it w/the kernel community and having a similar work flow for u-boot is always nice :) If desired we can ask the ozlab.org guys to host a u-boot patchwork if its something we want to try out. http://patchwork.ozlabs.org/ - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Compilation warning: MSR_RI redefined
On Apr 2, 2009, at 4:03 AM, Stefan Roese wrote: On Thursday 02 April 2009, Detlev Zundel wrote: I suggest to either remove this MSI_RI from the header again (it doesn't seem to be used here) or rename it. Ok, so much for the plan to add the defines not bit by bit as needed, but register-wise, while we're there. I actually would prefer to use UART_MSR_RI, as this is a UART thingy rather than to remove the define as we surely use the register, so I feel it worthwhile to have the whole definition on board. That's my preference as well. Agreed, when I saw MSR_RI I wasn't thinking UART at all. - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] release timing wrt linux
On Apr 2, 2009, at 7:03 AM, Mike Frysinger wrote: On Thursday 02 April 2009 07:40:09 Wolfgang Denk wrote: In message Mike wrote: can we shorten/elongate (doesnt matter to me) the next release process ? the original time frame was picked so as to not overlap with the linux kernel, but the current merge window did exactly that :(. Yes, I'm aware of this, but at least it's not our fault. We've been releasing mostly on schedule, it was the Linux kernel releases that shifted and shifted... Shorten is IMHO not an option, but we can delay it. Please suggest where and when? Make this merge window longer by one week, and this testing phase longer by two weeks? that sounds reasonable to me ... maybe leave the exact release time in May open so that if the kernel releases sooner, we can push out, or if it releases later, we can push up. What's the concern w/overlap or conflict with the kernel release? I doubt whatever we pick will ever be insync w/the kernel. - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] release timing wrt linux
On Thursday 02 April 2009 09:27:55 Kumar Gala wrote: On Apr 2, 2009, at 7:03 AM, Mike Frysinger wrote: On Thursday 02 April 2009 07:40:09 Wolfgang Denk wrote: In message Mike wrote: can we shorten/elongate (doesnt matter to me) the next release process ? the original time frame was picked so as to not overlap with the linux kernel, but the current merge window did exactly that :(. Yes, I'm aware of this, but at least it's not our fault. We've been releasing mostly on schedule, it was the Linux kernel releases that shifted and shifted... Shorten is IMHO not an option, but we can delay it. Please suggest where and when? Make this merge window longer by one week, and this testing phase longer by two weeks? that sounds reasonable to me ... maybe leave the exact release time in May open so that if the kernel releases sooner, we can push out, or if it releases later, we can push up. What's the concern w/overlap or conflict with the kernel release? it's pretty common for people who work on u-boot to also work on the kernel. trying to balance merge windows of two major projects simultaneously is unnecessarily strenuous. I doubt whatever we pick will ever be insync w/the kernel. the idea is to be out of sync ;). no, things wont always line up perfectly, but that doesnt mean we cant adjust when the kernel does change. -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 5/8] ZOOM2 Add led support.
Jean-Christophe PLAGNIOL-VILLARD wrote: why not using the arm led API?? OK. I will fix. +{ +gpio_t *gpio6_base = (gpio_t *) OMAP34XX_GPIO6_BASE; + +sr32 (gpio6_base-cleardataout, 13, 1, 1); /* red off */ we clearly need now a GPIO API it's start to be mandatory Like what is in the kernel or something similar? Tom ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/8] ZOOM2 Mux changes to support zoom2 configuration.
please do this at the same time that you add the board OK. rebase squashing . Tom ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 5/8] ZOOM2 Add led support.
On 08:38 Thu 02 Apr , Tom wrote: Jean-Christophe PLAGNIOL-VILLARD wrote: why not using the arm led API?? OK. I will fix. +{ + gpio_t *gpio6_base = (gpio_t *) OMAP34XX_GPIO6_BASE; + + sr32 (gpio6_base-cleardataout, 13, 1, 1); /* red off */ we clearly need now a GPIO API it's start to be mandatory Like what is in the kernel or something similar? as you wish but share the same API for the omap3 on u-boot and the kernel will be nice. We do it for example on at91 or avr32 Best Regards, J. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] UBI/cfi-mtd: Fix mtd name for multiple chips
From: Andreas Huber andreas.hu...@keymile.com On platforms with multiple NOR chips, currently only the first one can be selected using the ubi part command. This patch fixes this problem by using different names for the NOR mtd devices. It also changes the name of the NOR MTD device from cfi-mtd to norX (X indexing the device numer) to better match the mtdparts defaults. Signed-off-by: Stefan Roese s...@denx.de Signed-off-by: Andreas Huber andreas.hu...@keymile.com --- common/cmd_ubi.c | 26 +- drivers/mtd/cfi_mtd.c |4 +++- include/flash.h |2 -- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/common/cmd_ubi.c b/common/cmd_ubi.c index b99fd58..9c17d71 100644 --- a/common/cmd_ubi.c +++ b/common/cmd_ubi.c @@ -404,9 +404,6 @@ static int ubi_dev_scan(struct mtd_info *info, char *ubidev) u8 pnum; int err; - if (mtdparts_init() != 0) - return 1; - if (find_dev_and_part(ubidev, dev, pnum, part) != 0) return 1; @@ -445,6 +442,11 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) return 1; } + if (mtdparts_init() != 0) { + printf(Error initializing mtdparts!\n); + return 1; + } + if (strcmp(argv[1], part) == 0) { /* Print current partition */ if (argc == 2) { @@ -475,7 +477,7 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) } /* -* Check for nand|onenand selection +* Check for nor|nand|onenand selection */ #if defined(CONFIG_CMD_NAND) if (strcmp(argv[2], nand) == 0) { @@ -486,9 +488,23 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) #endif #if defined(CONFIG_FLASH_CFI_MTD) if (strcmp(argv[2], nor) == 0) { + char mtd_dev[16]; + struct mtd_device *dev; + struct part_info *part; + u8 pnum; + + /* +* Search the mtd device number where this partition +* is located +*/ + if (find_dev_and_part(argv[3], dev, pnum, part)) { + printf(Partition %s not found!\n, argv[3]); + return 1; + } + sprintf(mtd_dev, nor%d, dev-id-num); + ubi_dev.mtd_info = get_mtd_device_nm(mtd_dev); strcpy(ubi_dev.dev_name, NOR); ubi_dev.type = DEV_TYPE_NOR; - ubi_dev.mtd_info = get_mtd_device_nm(CFI_MTD_DEV_NAME); } #endif #if defined(CONFIG_CMD_ONENAND) diff --git a/drivers/mtd/cfi_mtd.c b/drivers/mtd/cfi_mtd.c index 1000f1b..f03e4fb 100644 --- a/drivers/mtd/cfi_mtd.c +++ b/drivers/mtd/cfi_mtd.c @@ -32,6 +32,7 @@ extern flash_info_t flash_info[]; static struct mtd_info cfi_mtd_info[CONFIG_SYS_MAX_FLASH_BANKS]; +static char cfi_mtd_names[CONFIG_SYS_MAX_FLASH_BANKS][16]; static int cfi_mtd_erase(struct mtd_info *mtd, struct erase_info *instr) { @@ -170,7 +171,8 @@ int cfi_mtd_init(void) if (error) continue; - mtd-name = CFI_MTD_DEV_NAME; + sprintf(cfi_mtd_names[i], nor%d, i); + mtd-name = cfi_mtd_names[i]; mtd-type = MTD_NORFLASH; mtd-flags = MTD_CAP_NORFLASH; mtd-size = fi-size; diff --git a/include/flash.h b/include/flash.h index 8b8979e..b016162 100644 --- a/include/flash.h +++ b/include/flash.h @@ -87,8 +87,6 @@ typedef unsigned long flash_sect_t; /* convert between bit value and numeric value */ #define CFI_FLASH_SHIFT_WIDTH 3 -/* cfi-mtd device name */ -#defineCFI_MTD_DEV_NAMEcfi-mtd /* Prototypes */ extern unsigned long flash_init (void); -- 1.6.2.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RFC PATCH] drivers/usb: regorganisation
Hello Jean-Christophe, usb_[eo]hci = [eo]hci ? Remy what do you prefer? I think this structure is a whole lot better then dumping everything in a flat directory tree. And I also prefer to follow the Linux kernel structure, thus without usb_ prefixes. e.g.: drivers/usb/host/ochi.c or drivers/usb/host/echi.c Kind Regards, Remy ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] Add GPL cleanup task to feature-removal-schedule.txt
From: Wolfgang Denk w...@denx.de Announce removal of all non-GPL or GPL-incompatible files after August 2009. Signed-off-by: Wolfgang Denk w...@denx.de --- doc/feature-removal-schedule.txt | 14 ++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/doc/feature-removal-schedule.txt b/doc/feature-removal-schedule.txt index 9ba7a04..10e63bf 100644 --- a/doc/feature-removal-schedule.txt +++ b/doc/feature-removal-schedule.txt @@ -18,6 +18,20 @@ Who: Peter Tyser pty...@xes-inc.com --- +What: GPL cleanup +When: August 2009 +Why: Over time, a couple of files have sneaked in into the U-Boot + source code that are either missing a valid GPL license + header or that carry a license that is incompatible with the + GPL. + Such files shall be removed from the U-Boot source tree. + See http://www.denx.de/wiki/pub/U-Boot/TaskGplCleanup/u-boot-1.1.2-files + for an old and probably incomplete list of such files. + +Who: Wolfgang Denk w...@denx.de and board maintainers + +--- + What: Individual I2C commands When: April 2009 Why: Per the U-Boot README, individual I2C commands such as imd, imm, -- 1.6.0.6 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Lowlevel init and nand spl Uboot patch for MX31 Phycore NAND boot
Hi: Was going through the patch for uboot posted earlier this year and the related review comments here: http://www.mail-archive.com/u-boot@lists.denx.de/msg01140.html. Looks like the NAND boot for MX31 PDK is not ready yet. I was told that if that the mx31 phycore patch should work just fine for most things on the PDK and hence can be used as a base for a port to the PDK. I am ignorant of the hardware details on MX31 Phycore but when i had a look at the low level init code (lowlevelinit.S) for Phycore and compared it to the existing lowlevelinit.S for the MX31 3stack board, i realized that they are a lot different when it comes to the NAND SPL. I am a newbie to NAND boot. Do i have to rewrite the NAND SPL code for preparing NAND boot images for the 3stack, Or is there a way i can translate some existing code(Maybe redboot code) for the MX31 3stack(PDK). I have modified the top level Makefile to include the sources for getting the SPL code compiled but am stuck at the lowlevelinit.S file. My final intent is to get the uboot boot out of NAND on MX31- 3stack(PDK) although i have managed to get uboot running from RAM on the platform. Thanks in Advance! Alfred. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] NetLoop initialization bug
On Thu, Apr 2, 2009 at 3:47 PM, Detlev Zundel d...@denx.de wrote: I have to enable the git operation via gmail on my workstation. What do you mean by this? Usually you only need a mailer which is capable to attach things inline. Even better - if you have a direct access to an mta or an smtp server, use git-send-email after git-format-patch. Ok, I tried the msmtp to access my www.gmail.com account with no success nether directly (is prohibited by corporate policy) nor via corporate email relay (the gmail smtp server uses non standard port which requires reflection in the email relay configuration and no one is willing to do it for me :-). Apart from that you have to nudge Ben or Heiko as to the real content. I only wanted to help get the formalities straight ;) Cheers Detlev Dear Heiko, Could you please do an additional try to apply the patch produced with git-format-patch. I hope it is OK now. Thanks, Michael From 774a3d83c4363a0bbeb0616786f522877882c88b Mon Sep 17 00:00:00 2001 From: Michael Zaidman michael.zaid...@gmail.com Date: Thu, 2 Apr 2009 18:25:03 +0300 Subject: [U-Boot] [PATCH] NetLoop initialization bug The patch fixes the bug of partial initialization of global network parameters. Upon u-boot's start up the first ping command causes a failure of the consequent TFTP transfers. It happens in the recently added mechanism of NetLoop initialization where initialization of global network parameters is separated in the NetInitLoop routine which is called per env_id change. Thus, ping request will initialize the network parameters necessary for ping operation only, afterwards the env_changed_id will be set to the env_id that will prevent all following initialization requests from other protocols. The problem is that the initialized by ping subset of network parameters is not sufficient for other protocols and particularly for TFTP which requires the NetServerIp also. Signed-off-by: Michael Zaidman michael.zaid...@gmail.com --- net/net.c | 62 ++-- 1 files changed, 3 insertions(+), 59 deletions(-) diff --git a/net/net.c b/net/net.c index a89f6a0..edb4477 100644 --- a/net/net.c +++ b/net/net.c @@ -285,68 +285,15 @@ NetInitLoop(proto_t protocol) int env_id = get_env_id (); /* update only when the environment has changed */ - if (env_changed_id == env_id) - return 0; - - switch (protocol) { -#if defined(CONFIG_CMD_NFS) - case NFS: -#endif -#if defined(CONFIG_CMD_PING) - case PING: -#endif -#if defined(CONFIG_CMD_SNTP) - case SNTP: -#endif - case NETCONS: - case TFTP: + if (env_changed_id != env_id) { NetCopyIP(NetOurIP, bd-bi_ip_addr); NetOurGatewayIP = getenv_IPaddr (gatewayip); NetOurSubnetMask= getenv_IPaddr (netmask); - NetOurVLAN = getenv_VLAN(vlan); - NetOurNativeVLAN = getenv_VLAN(nvlan); - - switch (protocol) { -#if defined(CONFIG_CMD_NFS) - case NFS: -#endif - case NETCONS: - case TFTP: - NetServerIP = getenv_IPaddr (serverip); - break; -#if defined(CONFIG_CMD_PING) - case PING: - /* nothing */ - break; -#endif -#if defined(CONFIG_CMD_SNTP) - case SNTP: - /* nothing */ - break; -#endif - default: - break; - } - - break; - case BOOTP: - case RARP: - /* -* initialize our IP addr to 0 in order to accept ANY -* IP addr assigned to us by the BOOTP / RARP server -*/ - NetOurIP = 0; NetServerIP = getenv_IPaddr (serverip); - NetOurVLAN = getenv_VLAN(vlan); /* VLANs must be read */ NetOurNativeVLAN = getenv_VLAN(nvlan); - case CDP: - NetOurVLAN = getenv_VLAN(vlan); /* VLANs must be read */ - NetOurNativeVLAN = getenv_VLAN(nvlan); - break; - default: - break; + NetOurVLAN = getenv_VLAN(vlan); + env_changed_id = env_id; } - env_changed_id = env_id; return 0; } @@ -440,10 +387,7 @@ restart: #if defined(CONFIG_CMD_DHCP) case DHCP: - /* Start with a clean slate... */ BootpTry = 0; - NetOurIP = 0; - NetServerIP = getenv_IPaddr (serverip); DhcpRequest(); /* Basically same as BOOTP */ break; #endif -- 1.5.6.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Compiling for ARMv7-a
Hi, I am trying to build the u-boot for ARM Cortex-A8 (OMAP3). By default the code is built for ARMv5. So, I made this change in cpu/arm_cortexa8/config.mk: # Make ARMv5 to allow more compilers to work, even though its v7a. -PLATFORM_CPPFLAGS += -march=armv5 +PLATFORM_CPPFLAGS += -march=armv7-a But when I run make, command-line looks like: arm-none-linux-gnueabi-gcc -g -Os -fno-strict-aliasing -fno-common -ffixed-r8 -msoft-float -fno-strict-aliasing -fno-common -ffixed-r8 -msoft-float -D__KERNEL__ -DTEXT_BASE=0x80e8 -I/home/premi/u-boot/include -fno-builtin -ffreestanding -nostdinc -isystem /opt/codesourcery/lib/gcc/arm-none-linux- gnueabi/4.3.2/include -pipe -DCONFIG_ARM -D__ARM__ -march=armv7-a -mno-thumb-interwork -march=armv5 -mno-thumb-interwork -Wall -Wstrict-prototypes -fno-stack-protector -c -o date.o date.c Notice that -march=armv7-a is followed by -march=armv5. Which option will take precedence? What is required to make sure both are same. My attempt at this change was not successful: omap3_evm_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 evm omap3 omap3 + @$(MKCONFIG) $(@:_config=) arm_cortexa8 arm_cortexa8 evm omap3 omap3 Also, many other options are duplicate on the command-line. May be okay, but is there a way to remove this duplication? Best regards, Sanjeev ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] Fix compile issue
Fixes this compile error: board.c: In function 'do_switch_ecc': board.c:339: error: 'cmd_tbl_t' has no member named 'help' make[1]: *** [board.o] Error 1 make[1]: Leaving directory `/db/psp_git/users/a0756819/u-boot/cpu/arm_cortexa8/omap3' make: *** [cpu/arm_cortexa8/omap3/libomap3.a] Error 2 Signed-off-by: Sanjeev Premi pr...@ti.com --- cpu/arm_cortexa8/omap3/board.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cpu/arm_cortexa8/omap3/board.c b/cpu/arm_cortexa8/omap3/board.c index 7bb3e28..15ea936 100644 --- a/cpu/arm_cortexa8/omap3/board.c +++ b/cpu/arm_cortexa8/omap3/board.c @@ -331,7 +331,7 @@ static int do_switch_ecc(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) return 0; usage: - printf (Usage: nandecc %s\n, cmdtp-help); + printf (Usage: nandecc %s\n, cmdtp-usage); return 1; } -- 1.6.2.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/8] ZOOM2 Add initial support for Zoom2
On Wed, Apr 01, 2009 at 10:02:14PM -0500, Tom Rix wrote: +#define SECTORSIZE 512 + +#define NAND_ALLOW_ERASE_ALL +#define ADDR_COLUMN 1 +#define ADDR_PAGE2 +#define ADDR_COLUMN_PAGE 3 + +#define NAND_ChipID_UNKNOWN 0x00 +#define NAND_MAX_FLOORS 1 +#define NAND_MAX_CHIPS 1 +#define NAND_NO_RB 1 +#define CONFIG_SYS_NAND_WP More legacy NAND stuff. You should probably go through the config and clean out anything that isn't verifiably necessary. -Scott ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] sf: stmicro: dont send 4 bytes when reading status register
I can't find anywhere in the datasheet that says the status register needs 3 dummy bytes sent to it before being able to read back the first real result. Tests on a Blackfin board show that after writing the opcode, the status register starts coming back immediately. So only write out the read status register opcode before polling the result. Signed-off-by: Mike Frysinger vap...@gentoo.org CC: Jason McMullan mcmul...@netapp.com CC: TsiChung Liew tsi-chung.l...@freescale.com --- drivers/mtd/spi/stmicro.c |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/spi/stmicro.c b/drivers/mtd/spi/stmicro.c index b43e9f4..9b910c1 100644 --- a/drivers/mtd/spi/stmicro.c +++ b/drivers/mtd/spi/stmicro.c @@ -133,12 +133,12 @@ static int stmicro_wait_ready(struct spi_flash *flash, unsigned long timeout) struct spi_slave *spi = flash-spi; unsigned long timebase; int ret; + u8 cmd = CMD_M25PXX_RDSR; u8 status; - u8 cmd[4] = { CMD_M25PXX_RDSR, 0xff, 0xff, 0xff }; - ret = spi_xfer(spi, 32, cmd[0], NULL, SPI_XFER_BEGIN); + ret = spi_xfer(spi, 8, cmd, NULL, SPI_XFER_BEGIN); if (ret) { - debug(SF: Failed to send command %02x: %d\n, cmd[0], ret); + debug(SF: Failed to send command %02x: %d\n, cmd, ret); return ret; } -- 1.6.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] Fix compile issue
On Thursday 02 April 2009 12:21:54 Sanjeev Premi wrote: cpu/arm_cortexa8/omap3/board.c |2 +- you're fixing a specific board or board family, so please put that into the subject line. Fix compile issue might be ok if it were an error in the top level build files, but this isnt ... -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [RFC PATCH V2] drivers/usb: regorganisation
move to linux usb driver organisation Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com Cc: Remy Bohmer li...@bohmer.net --- Remy is this one ok for you? I've try to respect the usb driver linux organistation at maximum Best Regards, J. Makefile |4 +- drivers/serial/usbtty.c|2 +- drivers/serial/usbtty.h|6 +- drivers/usb/{ = gadget}/Makefile | 29 +++-- drivers/usb/{usbdcore.c = gadget/core.c} |2 +- drivers/usb/{usbdcore_ep0.c = gadget/ep0.c} |2 +- include/usbdcore_ep0.h = drivers/usb/gadget/ep0.h |0 .../usb/{usbdcore_mpc8xx.c = gadget/mpc8xx_udc.c} |9 ++-- .../{usbdcore_omap1510.c = gadget/omap1510_udc.c} |6 +- drivers/usb/{ = host}/Makefile| 35 +-- drivers/usb/{usb_ehci_core.h = host/ehci-core.h} |0 drivers/usb/{usb_ehci_fsl.c = host/ehci-fsl.c}|6 +- drivers/usb/{usb_ehci_fsl.h = host/ehci-fsl.h}|0 drivers/usb/{usb_ehci_core.c = host/ehci-hcd.c} |3 +- drivers/usb/{usb_ehci_ixp.c = host/ehci-ixp4xx.c} |5 +- drivers/usb/{usb_ehci_pci.c = host/ehci-pci.c}|5 +- drivers/usb/{usb_ehci_vct.c = host/ehci-vct.c}|4 +- drivers/usb/{usb_ehci.h = host/ehci.h}|0 drivers/usb/{ = host}/isp116x-hcd.c |0 drivers/usb/{ = host}/isp116x.h |0 drivers/usb/{usb_ohci.c = host/ohci-hcd.c}|3 +- drivers/usb/{usb_ohci.h = host/ohci.h}|0 drivers/usb/{ = host}/r8a66597-hcd.c |0 drivers/usb/{ = host}/r8a66597.h |0 drivers/usb/{s3c64xx_usb.c = host/s3c64xx-hcd.c} |0 drivers/usb/{sl811_usb.c = host/sl811-hcd.c} |2 +- drivers/usb/{ = host}/sl811.h |0 drivers/usb/musb/Makefile | 47 drivers/usb/{davinci_usb.c = musb/davinci.c} |2 +- drivers/usb/{davinci_usb.h = musb/davinci.h} |0 drivers/usb/{ = musb}/musb_core.c |0 drivers/usb/{ = musb}/musb_core.h |0 drivers/usb/{ = musb}/musb_hcd.c |0 drivers/usb/{ = musb}/musb_hcd.h |0 include/{usbdcore_mpc8xx.h = usb/mpc8xx_udc.h}|0 .../{usbdcore_omap1510.h = usb/omap1510_udc.h}|0 include/{usbdcore.h = usbdevice.h}|0 37 files changed, 99 insertions(+), 73 deletions(-) copy drivers/usb/{ = gadget}/Makefile (61%) rename drivers/usb/{usbdcore.c = gadget/core.c} (99%) rename drivers/usb/{usbdcore_ep0.c = gadget/ep0.c} (99%) rename include/usbdcore_ep0.h = drivers/usb/gadget/ep0.h (100%) rename drivers/usb/{usbdcore_mpc8xx.c = gadget/mpc8xx_udc.c} (99%) rename drivers/usb/{usbdcore_omap1510.c = gadget/omap1510_udc.c} (99%) rename drivers/usb/{ = host}/Makefile (65%) rename drivers/usb/{usb_ehci_core.h = host/ehci-core.h} (100%) rename drivers/usb/{usb_ehci_fsl.c = host/ehci-fsl.c} (97%) rename drivers/usb/{usb_ehci_fsl.h = host/ehci-fsl.h} (100%) rename drivers/usb/{usb_ehci_core.c = host/ehci-hcd.c} (99%) rename drivers/usb/{usb_ehci_ixp.c = host/ehci-ixp4xx.c} (96%) rename drivers/usb/{usb_ehci_pci.c = host/ehci-pci.c} (97%) rename drivers/usb/{usb_ehci_vct.c = host/ehci-vct.c} (96%) rename drivers/usb/{usb_ehci.h = host/ehci.h} (100%) rename drivers/usb/{ = host}/isp116x-hcd.c (100%) rename drivers/usb/{ = host}/isp116x.h (100%) rename drivers/usb/{usb_ohci.c = host/ohci-hcd.c} (99%) rename drivers/usb/{usb_ohci.h = host/ohci.h} (100%) rename drivers/usb/{ = host}/r8a66597-hcd.c (100%) rename drivers/usb/{ = host}/r8a66597.h (100%) rename drivers/usb/{s3c64xx_usb.c = host/s3c64xx-hcd.c} (100%) rename drivers/usb/{sl811_usb.c = host/sl811-hcd.c} (99%) rename drivers/usb/{ = host}/sl811.h (100%) create mode 100644 drivers/usb/musb/Makefile rename drivers/usb/{davinci_usb.c = musb/davinci.c} (99%) rename drivers/usb/{davinci_usb.h = musb/davinci.h} (100%) rename drivers/usb/{ = musb}/musb_core.c (100%) rename drivers/usb/{ = musb}/musb_core.h (100%) rename drivers/usb/{ = musb}/musb_hcd.c (100%) rename drivers/usb/{ = musb}/musb_hcd.h (100%) rename include/{usbdcore_mpc8xx.h = usb/mpc8xx_udc.h} (100%) rename include/{usbdcore_omap1510.h = usb/omap1510_udc.h} (100%) rename include/{usbdcore.h = usbdevice.h} (100%) diff --git a/Makefile b/Makefile index f857641..565df93 100644 --- a/Makefile +++ b/Makefile @@ -263,7 +263,9 @@ endif LIBS += drivers/rtc/librtc.a LIBS += drivers/serial/libserial.a LIBS += drivers/twserial/libtws.a -LIBS += drivers/usb/libusb.a +LIBS += drivers/usb/gadget/libusb_gadget.a +LIBS += drivers/usb/musb/libusb_musb.a +LIBS += drivers/usb/host/libusb_host.a LIBS += drivers/video/libvideo.a LIBS += common/libcommon.a LIBS += libfdt/libfdt.a diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c
Re: [U-Boot] core ticks/timer code
Dirk, On Tue, Mar 31, 2009 at 05:55:13PM +0200, Dirk Behme wrote: ... I'd like that we split general ticks/timer code clean up and bug fixes. I'd like that we implement the changes proposed by Mike and Jean-Christophe independent and don't mix them with other fixes for broken timer code like http://lists.denx.de/pipermail/u-boot/2009-March/049146.html Having proper/fixed (old style) timer code will make it easier to convert to new style afterwards. From my point of view this is similar to rule don't mix coding style with functional changes. Well the very same bug is present in OMAP1 and OMAP2 timer code, so you'll end fixing copiedpaste code for no good reason. At least cpu/arm925t/interrupts.c and cpu/arm926ejs/omap/timer.c deserves the same fix [*] you sent for OMAP3 code. So what about merging that timer code first and then fixing it? ladis [*] I have local fix for cpu/arm925t/interrupts.c, but since those copypasted files started diverging just because each of us cares about different piece of hardware, I do not want to make situation even worse. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] release timing wrt linux
Dear Jean-Christophe PLAGNIOL-VILLARD, In message 20090402112949.gc2...@game.jcrosoft.org you wrote: Please suggest where and when? Make this merge window longer by one week, and this testing phase longer by two weeks? why not create a release to integrate the Kconfig? You would still have to pla for that release, and schedule it. Feel free to submit the Kconfig stuff for 2009.07. Or now, the merge window is stil open :-) 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: w...@denx.de As long as we're going to reinvent the wheel again, we might as well try making it round this time.- Mike Dennison ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RFC PATCH V2] drivers/usb: regorganisation
Dear Jean-Christophe PLAGNIOL-VILLARD, In message 1238691332-27548-1-git-send-email-plagn...@jcrosoft.com you wrote: move to linux usb driver organisation Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com Cc: Remy Bohmer li...@bohmer.net --- Remy is this one ok for you? Looks OK to me, but.. diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c index d8b1387..71f0e5b 100644 --- a/drivers/serial/usbtty.c +++ b/drivers/serial/usbtty.c @@ -94,7 +94,7 @@ static char serial_number[16]; * Descriptors, Strings, Local variables. */ -/* defined and used by usbdcore_ep0.c */ +/* defined and used by ep0.c */ extern struct usb_string_descriptor **usb_strings; This is now too short. Where might ep0.c be? Please use gadget/ep0.c here. rename to drivers/usb/gadget/mpc8xx_udc.c index 0e311ad..8d7bd65 100644 --- a/drivers/usb/usbdcore_mpc8xx.c +++ b/drivers/usb/gadget/mpc8xx_udc.c @@ -3,7 +3,7 @@ * bodonog...@codehermit.ie * * References - * DasUBoot/drivers/usb/usbdcore_omap1510.c, for design and implementation + * DasUBoot/drivers/usb/omap1510_udc.c, for design and implementation Please change into drivers/usb/omap1510_udc.c 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: w...@denx.de When a woman marries again it is because she detested her first hus- band. When a man marries again, it is because he adored his first wife. -- Oscar Wilde ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RFC PATCH V2] drivers/usb: regorganisation
On 20:07 Thu 02 Apr , Wolfgang Denk wrote: Dear Jean-Christophe PLAGNIOL-VILLARD, In message 1238691332-27548-1-git-send-email-plagn...@jcrosoft.com you wrote: move to linux usb driver organisation Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com Cc: Remy Bohmer li...@bohmer.net --- Remy is this one ok for you? Looks OK to me, but.. diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c index d8b1387..71f0e5b 100644 --- a/drivers/serial/usbtty.c +++ b/drivers/serial/usbtty.c @@ -94,7 +94,7 @@ static char serial_number[16]; * Descriptors, Strings, Local variables. */ -/* defined and used by usbdcore_ep0.c */ +/* defined and used by ep0.c */ extern struct usb_string_descriptor **usb_strings; This is now too short. Where might ep0.c be? Please use gadget/ep0.c here. ok rename to drivers/usb/gadget/mpc8xx_udc.c index 0e311ad..8d7bd65 100644 --- a/drivers/usb/usbdcore_mpc8xx.c +++ b/drivers/usb/gadget/mpc8xx_udc.c @@ -3,7 +3,7 @@ * bodonog...@codehermit.ie * * References - * DasUBoot/drivers/usb/usbdcore_omap1510.c, for design and implementation + * DasUBoot/drivers/usb/omap1510_udc.c, for design and implementation Please change into drivers/usb/omap1510_udc.c drivers/usb/gadget/omap1510_udc.c ok if Remy is ok could apply the at91 pull request then I will generate the final usb reorganisation patch? Best Regards, J. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/8] ZOOM2 Add initial support for Zoom2
Scott Wood wrote: More legacy NAND stuff. You should probably go through the config and clean out anything that isn't verifiably necessary. This has been removed from Zoom2 and Zoom1. Other modifications to the zoom configs will follow after this initial patch set. Tom ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] release timing wrt linux
On 20:00 Thu 02 Apr , Wolfgang Denk wrote: Dear Jean-Christophe PLAGNIOL-VILLARD, In message 20090402112949.gc2...@game.jcrosoft.org you wrote: Please suggest where and when? Make this merge window longer by one week, and this testing phase longer by two weeks? why not create a release to integrate the Kconfig? You would still have to pla for that release, and schedule it. Feel free to submit the Kconfig stuff for 2009.07. Or now, the merge window is stil open :-) I've not finished but near the only thing is that we will need time to write all the Kconfig so these 3 weeks could be you use for this purpose specialy if no drivers will added every day Best Regards, J. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 3/8] ZOOM2 Add support for debug board detection.
On 22:02 Wed 01 Apr , Tom Rix wrote: https://omapzoom.org/gf/project/omapzoom/wiki/?pagename=GettingStartedWithZoomII_AKA_OMAP34XII_MDP The zoom2 has an auxillary board that contains the serial, net, jtag and battery simulator. This change supports a runtime check if the debug board is connected. Signed-off-by: Tom Rix tom@windriver.com --- board/omap3/zoom2/Makefile |3 +- board/omap3/zoom2/debug_board.c | 57 +++ 2 files changed, 59 insertions(+), 1 deletions(-) create mode 100644 board/omap3/zoom2/debug_board.c diff --git a/board/omap3/zoom2/Makefile b/board/omap3/zoom2/Makefile index 088b8cb..b8fa5a7 100644 --- a/board/omap3/zoom2/Makefile +++ b/board/omap3/zoom2/Makefile @@ -25,7 +25,8 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -COBJS:= zoom2.o +COBJS:= zoom2.o \ + debug_board.o you do not plan to activate it via a CONFIG only? SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/board/omap3/zoom2/debug_board.c b/board/omap3/zoom2/debug_board.c new file mode 100644 index 000..782dcb2 --- /dev/null +++ b/board/omap3/zoom2/debug_board.c @@ -0,0 +1,57 @@ +/* + * (C) Copyright 2009 + * Wind River, www.windriver.com + * Tom Rix tom@windriver.com + * + * 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 + * + */ +#include common.h +#include asm/arch/cpu.h +#include asm/io.h +#include asm/arch/mux.h + +#define DEBUG_BOARD_CONNECTED 1 +#define DEBUG_BOARD_NOT_CONNECTED 0 + +static int debug_board_connected = DEBUG_BOARD_CONNECTED; why not set it as -1; and then avoid the first_time int? Best Regards, J. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/8] ZOOM2 Add initial support for Zoom2
On 22:02 Wed 01 Apr , Tom Rix wrote: Zoom2 is a new board from Texas Instruments and LogicPD This is the product description http://www.logicpd.com/products/development-kits/texas-instruments-zoom%E2%84%A2-omap34x-ii-mdp This patch provides a zoom2 base target by copying zoom1 and by making some obvious changes. This target compiles but does not yet run. To configure, run make omap3_zoom2_config Signed-off-by: Tom Rix tom@windriver.com --- MAINTAINERS |4 + MAKEALL |1 + Makefile |3 + board/omap3/common/Makefile |1 + board/omap3/zoom2/Makefile| 49 +++ board/omap3/zoom2/config.mk | 33 + board/omap3/zoom2/u-boot.lds | 63 + board/omap3/zoom2/zoom2.c | 79 +++ board/omap3/zoom2/zoom2.h | 134 ++ include/configs/omap3_zoom2.h | 311 + 10 files changed, 678 insertions(+), 0 deletions(-) create mode 100644 board/omap3/zoom2/Makefile create mode 100644 board/omap3/zoom2/config.mk create mode 100644 board/omap3/zoom2/u-boot.lds create mode 100644 board/omap3/zoom2/zoom2.c create mode 100644 board/omap3/zoom2/zoom2.h create mode 100644 include/configs/omap3_zoom2.h diff --git a/MAINTAINERS b/MAINTAINERS index 25b28d6..f89e01a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -610,6 +610,10 @@ Stelian Pop stelian@leadtechdesign.com at91sam9263ek ARM926EJS (AT91SAM9263 SoC) at91sam9rlekARM926EJS (AT91SAM9RL SoC) +Tom Rix tom@windriver.com + + omap3_zoom2 ARM CORTEX-A8 (OMAP3xx SoC) + Stefan Roese s...@denx.de ixdpg425xscale diff --git a/MAKEALL b/MAKEALL index 854f303..8d84c29 100755 --- a/MAKEALL +++ b/MAKEALL @@ -561,6 +561,7 @@ LIST_ARM_CORTEX_A8= \ omap3_evm \ omap3_pandora \ omap3_zoom1 \ + omap3_zoom2 \ # diff --git a/Makefile b/Makefile index f857641..1a3d14e 100644 --- a/Makefile +++ b/Makefile @@ -2974,6 +2974,9 @@ omap3_pandora_config : unconfig omap3_zoom1_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom1 omap3 omap3 +omap3_zoom2_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom2 omap3 omap3 + # ## XScale Systems # diff --git a/board/omap3/common/Makefile b/board/omap3/common/Makefile index 7b892fa..b8a0b14 100644 --- a/board/omap3/common/Makefile +++ b/board/omap3/common/Makefile @@ -33,6 +33,7 @@ COBJS-$(CONFIG_OMAP3_BEAGLE) += power.o COBJS-$(CONFIG_OMAP3_OVERO) += power.o COBJS-$(CONFIG_OMAP3_PANDORA) += power.o COBJS-$(CONFIG_OMAP3_ZOOM1) += power.o +COBJS-$(CONFIG_OMAP3_ZOOM2) += power.o COBJS:= $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/board/omap3/zoom2/Makefile b/board/omap3/zoom2/Makefile new file mode 100644 index 000..088b8cb --- /dev/null +++ b/board/omap3/zoom2/Makefile @@ -0,0 +1,49 @@ +# +# (C) Copyright 2000, 2001, 2002 +# Wolfgang Denk, DENX Software Engineering, w...@denx.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 +# + +include $(TOPDIR)/config.mk + +LIB = $(obj)lib$(BOARD).a + +COBJS:= zoom2.o + +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) + +$(LIB): $(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) + +clean: + rm -f $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak $(obj).depend + +# + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# diff --git a/board/omap3/zoom2/config.mk b/board/omap3/zoom2/config.mk new file mode 100644 index 000..ef2ae97 --- /dev/null +++ b/board/omap3/zoom2/config.mk @@ -0,0 +1,33 @@ +# +# (C) Copyright 2009 +#
Re: [U-Boot] [PATCH 4/8] ZOOM2 Add serial support.
On 22:02 Wed 01 Apr , Tom Rix wrote: Zoom2 serial is in general supplied by one of the 4 UARTS on the debug board. The default serial is from the USB connector on left side of the debug board. The USB connector will produce 2 of the 4 UARTS. On your host pick the first enumeration. The serial port set up is the same with Zoom1. Baud rate 115200, 8 bit data, no parity, 1 stop bit, no flow. The kernel bootargs are console=ttyS3,115200n8 Signed-off-by: Tom Rix tom@windriver.com --- board/omap3/zoom2/Makefile |3 +- board/omap3/zoom2/zoom2_serial.c | 134 ++ board/omap3/zoom2/zoom2_serial.h | 77 ++ common/serial.c |2 + cpu/arm_cortexa8/omap3/mem.c | 23 +++ drivers/serial/ns16550.c |4 +- include/asm-arm/arch-omap3/cpu.h |2 + include/configs/omap3_zoom2.h| 28 include/ns16550.h| 19 ++ include/serial.h |7 ++ 10 files changed, 282 insertions(+), 17 deletions(-) create mode 100644 board/omap3/zoom2/zoom2_serial.c create mode 100644 board/omap3/zoom2/zoom2_serial.h diff --git a/board/omap3/zoom2/Makefile b/board/omap3/zoom2/Makefile index b8fa5a7..d27990c 100644 --- a/board/omap3/zoom2/Makefile +++ b/board/omap3/zoom2/Makefile @@ -26,7 +26,8 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a COBJS:= zoom2.o \ - debug_board.o + debug_board.o \ + zoom2_serial.o it could be nice to disactivate it SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/board/omap3/zoom2/zoom2_serial.c b/board/omap3/zoom2/zoom2_serial.c new file mode 100644 index 000..e879962 --- /dev/null +++ b/board/omap3/zoom2/zoom2_serial.c @@ -0,0 +1,134 @@ +/* + * (C) Copyright 2009 + * Wind River, www.windriver.com + * Tom Rix tom@windriver.com + * + * 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 + * + * This file was adapted from cpu/mpc5xxx/serial.c + * + */ + +#include zoom2_serial.h + +int zoom2_debug_board_connected (void); please move to a header + +int quad_init_dev (unsigned long base) +{ + /* + * The Quad UART is on the debug board. + * Check if the debug board is attached before using the UART + */ + if (zoom2_debug_board_connected ()) { + NS16550_t com_port = (NS16550_t) base; + int baud_divisor = CONFIG_SYS_NS16550_CLK / 16 / + CONFIG_BAUDRATE; aligning it with CONFIG_SYS_NS16550_CLK could be nice please add an empty line + /* + * Zoom2 has a board specific initialization of its UART. + * This generic initialization has been copied from + * drivers/serial/ns16550.c. The macros have been expanded. + * + * Do the following instead of + * + * NS16550_init (port, clock_divisor); + */ + com_port-ier = 0x00; + + /* + * On Zoom2 board Set pre-scalar to 1 + * CLKSEL is GND = MCR[7] is 1 = preslr is 4 + * So change the prescl to 1 + */ + com_port-lcr = 0xBF; + com_port-fcr |= 0x10; + com_port-mcr = 0x7F; + + com_port-lcr = LCR_BKSE | LCR_8N1; + com_port-dll = 0; + com_port-dlm = 0; + com_port-lcr = LCR_8N1; + com_port-mcr = (MCR_DTR | MCR_RTS); + com_port-fcr = (FCR_FIFO_EN | FCR_RXSR | FCR_TXSR); + com_port-lcr = LCR_BKSE | LCR_8N1; + com_port-dll = baud_divisor 0xff; + com_port-dlm = (baud_divisor 8) 0xff; + com_port-lcr = LCR_8N1; clould you explain a fe more what you do here? + } + /* + * We have to lie here, otherwise the board init code will hang + * on the check + */ + return 0; +} + +void quad_putc_dev (unsigned long base, const char c) +{ + if (zoom2_debug_board_connected ()) { + NS16550_t port = (NS16550_t) base; + + if (c == '\n') + quad_putc_dev (base, '\r'); + + NS16550_putc (port, c); why
Re: [U-Boot] [PATCH] Network AT91 AVR32: generic way of addressing USRIO register layout
On 10:41 Mon 23 Mar , Haavard Skinnemoen wrote: Jean-Christophe PLAGNIOL-VILLARD wrote: On 09:58 Mon 23 Mar , Nicolas Ferre wrote: The MACB IP used by AVR32 AT91 have two different layout for USRIO register. We have to differentiate this in the driver code. No more cpu specific #ifdefs in driver: we manage a configuration variable. Signed-off-by: Nicolas Ferre nicolas.fe...@atmel.com Ack-by: Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com Haavard is ok for you too? Sure. Acked-by: Haavard Skinnemoen haavard.skinnem...@atmel.com Ben is ok for you? Best Regards, J. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/2] MPC8260ADS: Add nfsboot/ramboot to default environment.
This brings it in line with other Freescale boards. Signed-off-by: Scott Wood scottw...@freescale.com --- include/configs/MPC8260ADS.h | 42 ++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h index 42fbe90..49664b4 100644 --- a/include/configs/MPC8260ADS.h +++ b/include/configs/MPC8260ADS.h @@ -17,6 +17,8 @@ * Vitaly Bordug vbor...@ru.mvista.com * Added support for PCI bridge on MPC8272ADS * + * Copyright (C) Freescale Semiconductor, Inc. 2006-2009. + * * See file CREDITS for list of people who contributed to this * project. * @@ -512,4 +514,44 @@ #define CONFIG_HAS_ETH1 #endif +#define CONFIG_NETDEV eth0 +#define CONFIG_LOADADDR 50 /* default location for tftp and bootm */ + +#define XMK_STR(x) #x +#define MK_STR(x) XMK_STR(x) + +#define CONFIG_EXTRA_ENV_SETTINGS \ + netdev= MK_STR(CONFIG_NETDEV) \0\ + tftpflash=tftpboot $loadaddr $uboot; \ + protect off MK_STR(TEXT_BASE) +$filesize; \ + erase MK_STR(TEXT_BASE) +$filesize; \ + cp.b $loadaddr MK_STR(TEXT_BASE) $filesize; \ + protect on MK_STR(TEXT_BASE) +$filesize; \ + cmp.b $loadaddr MK_STR(TEXT_BASE) $filesize\0 \ + fdtaddr=40\0 \ + console=ttyS0\0 \ + setbootargs=setenv bootargs \ + root=$rootdev rw console=$console,$baudrate $othbootargs\0 \ + setipargs=setenv bootargs nfsroot=$serverip:$rootpath \ + ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off \ + root=$rootdev rw console=$console,$baudrate $othbootargs\0 + +#define CONFIG_NFSBOOTCOMMAND \ + setenv rootdev /dev/nfs; \ + run setipargs;\ + tftp $loadaddr $bootfile; \ + tftp $fdtaddr $fdtfile; \ + bootm $loadaddr - $fdtaddr + +#define CONFIG_RAMBOOTCOMMAND \ + setenv rootdev /dev/ram; \ + run setbootargs; \ + tftp $ramdiskaddr $ramdiskfile; \ + tftp $loadaddr $bootfile; \ + tftp $fdtaddr $fdtfile; \ + bootm $loadaddr $ramdiskaddr $fdtaddr + +#undef MK_STR +#undef XMK_STR + #endif /* __CONFIG_H */ -- 1.5.6.rc1.6.gc53ad ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/2] mpc8260: Fill in brg's clock-frequency in device tree.
Signed-off-by: Scott Wood scottw...@freescale.com --- cpu/mpc8260/cpu.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/cpu/mpc8260/cpu.c b/cpu/mpc8260/cpu.c index 1b034cd..d4622ca 100644 --- a/cpu/mpc8260/cpu.c +++ b/cpu/mpc8260/cpu.c @@ -311,6 +311,9 @@ void ft_cpu_setup (void *blob, bd_t *bd) fdt_fixup_ethernet(blob); #endif + do_fixup_by_compat_u32(blob, fsl,cpm2-brg, + clock-frequency, bd-bi_brgfreq, 1); + do_fixup_by_path_u32(blob, cpu_path, bus-frequency, bd-bi_busfreq, 1); do_fixup_by_path_u32(blob, cpu_path, timebase-frequency, OF_TBCLK, 1); do_fixup_by_path_u32(blob, cpu_path, clock-frequency, bd-bi_intfreq, 1); -- 1.5.6.rc1.6.gc53ad ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH RESEND] common/image.c: Relocate strings in tables.
Without this, u-boot can crash or print garbage if the original link address no longer points to a valid string. Signed-off-by: Scott Wood scottw...@freescale.com --- I sent this a couple weeks ago hoping to make it in as a bugfix, but it didn't make it. Do you have any objections to the patch, or can it go in this merge window? Sent again with the proper list address; apologies to Wolfgang for the duplicate. common/image.c |8 ++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/common/image.c b/common/image.c index daa68bc..e22c974 100644 --- a/common/image.c +++ b/common/image.c @@ -518,7 +518,11 @@ static char *get_table_entry_name (table_entry_t *table, char *msg, int id) { for (; table-id = 0; ++table) { if (table-id == id) - return (table-lname); +#ifdef USE_HOSTCC + return table-lname; +#else + return table-lname + gd-reloc_off; +#endif } return (msg); } @@ -579,7 +583,7 @@ static int get_table_entry_id (table_entry_t *table, fprintf (stderr, \n); #else for (t = table; t-id = 0; ++t) { - if (t-sname strcmp(t-sname, name) == 0) + if (t-sname strcmp(t-sname + gd-reloc_off, name) == 0) return (t-id); } debug (Invalid %s Type: %s\n, table_name, name); -- 1.5.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] core ticks/timer code
Wolfgang, Can this be put in the ToDo list so anyone who looks to clean up their CPU and/or architecture knows what it is exactly that we are trying to achieve Thanks, Graeme ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] NetLoop initialization bug
Hi Michael, Michael Zaidman wrote: On Thu, Apr 2, 2009 at 3:47 PM, Detlev Zundel d...@denx.de wrote: I have to enable the git operation via gmail on my workstation. What do you mean by this? Usually you only need a mailer which is capable to attach things inline. Even better - if you have a direct access to an mta or an smtp server, use git-send-email after git-format-patch. Ok, I tried the msmtp to access my www.gmail.com account with no success nether directly (is prohibited by corporate policy) nor via corporate email relay (the gmail smtp server uses non standard port which requires reflection in the email relay configuration and no one is willing to do it for me :-). Apart from that you have to nudge Ben or Heiko as to the real content. I only wanted to help get the formalities straight ;) Cheers Detlev Dear Heiko, Could you please do an additional try to apply the patch produced with git-format-patch. I hope it is OK now. I tried to apply it but it didn't work, but this isn't my usual computer. I'll try on my other machine tonight. BTW - what mailer are you using? regards, Ben ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] Network AT91 AVR32: generic way of addressing USRIO register layout
Jean-Christophe PLAGNIOL-VILLARD wrote: On 10:41 Mon 23 Mar , Haavard Skinnemoen wrote: Jean-Christophe PLAGNIOL-VILLARD wrote: On 09:58 Mon 23 Mar , Nicolas Ferre wrote: The MACB IP used by AVR32 AT91 have two different layout for USRIO register. We have to differentiate this in the driver code. No more cpu specific #ifdefs in driver: we manage a configuration variable. Signed-off-by: Nicolas Ferre nicolas.fe...@atmel.com Ack-by: Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com Haavard is ok for you too? Sure. Acked-by: Haavard Skinnemoen haavard.skinnem...@atmel.com Ben is ok for you? It's definitely an improvement, although I'm not fond of placing the conditional macro in the header file. Overall OK, though. I'll pick it up. regards, Ben ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RFC PATCH V2] drivers/usb: regorganisation
Dear Jean-Christophe PLAGNIOL-VILLARD, In message 20090402192755.gb15...@game.jcrosoft.org you wrote: if Remy is ok could apply the at91 pull request then I will generate the final usb reorganisation patch? That should go through the USB custodian tree. 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: w...@denx.de I like your game but we have to change the rules. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2] MPC8260ADS: Add nfsboot/ramboot to default environment.
This brings it in line with other Freescale boards. Signed-off-by: Scott Wood scottw...@freescale.com --- This time with ttyCPM0, not ttyS0. include/configs/MPC8260ADS.h | 42 ++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h index 42fbe90..21210eb 100644 --- a/include/configs/MPC8260ADS.h +++ b/include/configs/MPC8260ADS.h @@ -17,6 +17,8 @@ * Vitaly Bordug vbor...@ru.mvista.com * Added support for PCI bridge on MPC8272ADS * + * Copyright (C) Freescale Semiconductor, Inc. 2006-2009. + * * See file CREDITS for list of people who contributed to this * project. * @@ -512,4 +514,44 @@ #define CONFIG_HAS_ETH1 #endif +#define CONFIG_NETDEV eth0 +#define CONFIG_LOADADDR 50 /* default location for tftp and bootm */ + +#define XMK_STR(x) #x +#define MK_STR(x) XMK_STR(x) + +#define CONFIG_EXTRA_ENV_SETTINGS \ + netdev= MK_STR(CONFIG_NETDEV) \0\ + tftpflash=tftpboot $loadaddr $uboot; \ + protect off MK_STR(TEXT_BASE) +$filesize; \ + erase MK_STR(TEXT_BASE) +$filesize; \ + cp.b $loadaddr MK_STR(TEXT_BASE) $filesize; \ + protect on MK_STR(TEXT_BASE) +$filesize; \ + cmp.b $loadaddr MK_STR(TEXT_BASE) $filesize\0 \ + fdtaddr=40\0 \ + console=ttyCPM0\0 \ + setbootargs=setenv bootargs \ + root=$rootdev rw console=$console,$baudrate $othbootargs\0 \ + setipargs=setenv bootargs nfsroot=$serverip:$rootpath \ + ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off \ + root=$rootdev rw console=$console,$baudrate $othbootargs\0 + +#define CONFIG_NFSBOOTCOMMAND \ + setenv rootdev /dev/nfs; \ + run setipargs;\ + tftp $loadaddr $bootfile; \ + tftp $fdtaddr $fdtfile; \ + bootm $loadaddr - $fdtaddr + +#define CONFIG_RAMBOOTCOMMAND \ + setenv rootdev /dev/ram; \ + run setbootargs; \ + tftp $ramdiskaddr $ramdiskfile; \ + tftp $loadaddr $bootfile; \ + tftp $fdtaddr $fdtfile; \ + bootm $loadaddr $ramdiskaddr $fdtaddr + +#undef MK_STR +#undef XMK_STR + #endif /* __CONFIG_H */ -- 1.5.6.rc1.6.gc53ad ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] make davinci_dvevm_config error
Hi, I am using u-boot version 2009.03-rc1 for davinci DM6467 EVM. I have set CROSS_COMPILE=arm_v5t_le- and ARCH=arm. On trying make davinci_dvevm_config I get an error: ln : creating symbolic link asm to asm-arm : Opertaion not permitted Any pointers to how this build environment should be set for Davinci EVM. I had earlier used a U-boot 1.2 and did not face this issue. Thanks, Neeraj ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot