June 2011 - U-Boot

[U-Boot] [PATCH] MPC83xx: add config options for memory setup.
by Andre Schwarz 07 Jul '11

07 Jul '11

CPO value and driver strength settings are board specifc. Also allow SPD data fetch from any accessible I2C EEPROM. Signed-off-by: Andre Schwarz <andre.schwarz(a)matrix-vision.de> --- arch/powerpc/cpu/mpc83xx/spd_sdram.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/cpu/mpc83xx/spd_sdram.c b/arch/powerpc/cpu/mpc83xx/spd_sdram.c index 44aaa9a..9b01f0d 100644 --- a/arch/powerpc/cpu/mpc83xx/spd_sdram.c +++ b/arch/powerpc/cpu/mpc83xx/spd_sdram.c @@ -68,6 +68,12 @@ void board_add_ram_info(int use_default) #ifndef CONFIG_SYS_READ_SPD #define CONFIG_SYS_READ_SPD i2c_read #endif +#ifndef SPD_EEPROM_OFFSET +#define SPD_EEPROM_OFFSET 0 +#endif +#ifndef SPD_EEPROM_ADDR_LEN +#define SPD_EEPROM_ADDR_LEN 1 +#endif /* * Convert picoseconds into clock cycles (rounding up if needed). @@ -160,7 +166,8 @@ long int spd_sdram() isync(); /* Read SPD parameters with I2C */ - CONFIG_SYS_READ_SPD(SPD_EEPROM_ADDRESS, 0, 1, (uchar *) & spd, sizeof (spd)); + CONFIG_SYS_READ_SPD(SPD_EEPROM_ADDRESS, SPD_EEPROM_OFFSET, + SPD_EEPROM_ADDR_LEN, (uchar *) &spd, sizeof(spd)); #ifdef SPD_DEBUG spd_debug(&spd); #endif @@ -562,6 +569,9 @@ long int spd_sdram() * Empirically, 0x3 == 6/8 clock delay is suggested for DDR I 266. */ wr_data_delay = 2; +#ifdef CONFIG_SYS_DDR_WRITE_DATA_DELAY + wr_data_delay = CONFIG_SYS_DDR_WRITE_DATA_DELAY; +#endif /* * Write Latency @@ -601,6 +611,9 @@ long int spd_sdram() */ cpo = 0; if (spd.mem_type == SPD_MEMTYPE_DDR2) { +#ifdef CONFIG_SYS_DDR_CPO + cpo = CONFIG_SYS_DDR_CPO; +#else if (effective_data_rate == 266) { cpo = 0x4; /* READ_LAT + 1/2 */ } else if (effective_data_rate == 333) { @@ -611,6 +624,7 @@ long int spd_sdram() /* Automatic calibration */ cpo = 0x1f; } +#endif } ddr->timing_cfg_2 = (0 @@ -679,6 +693,9 @@ long int spd_sdram() ddr->sdram_mode = (0 | (1 << (16 + 10)) /* DQS Differential disable */ +#ifdef CONFIG_SYS_DDR_MODE_WEAK + | (1 << (16 + 1)) /* weak driver (~60%) */ +#endif | (add_lat << (16 + 3)) /* Additive Latency in EMRS1 */ | (mode_odt_enable << 16) /* ODT Enable in EMRS1 */ | ((twr_clk - 1) << 9) /* Write Recovery Autopre */ -- 1.7.0.4

3 2

[U-Boot] [PATCH] MPC83xx: add define for global half-strength enable (HSE)
by Andre Schwarz 07 Jul '11

07 Jul '11

Signed-off-by: Andre Schwarz <andre.schwarz(a)matrix-vision.de> --- include/mpc83xx.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/mpc83xx.h b/include/mpc83xx.h index ea137c7..8292018 100644 --- a/include/mpc83xx.h +++ b/include/mpc83xx.h @@ -1000,6 +1000,7 @@ #define SDRAM_CFG_8_BE 0x00040000 #define SDRAM_CFG_NCAP 0x00020000 #define SDRAM_CFG_2T_EN 0x00008000 +#define SDRAM_CFG_HSE 0x00000008 #define SDRAM_CFG_BI 0x00000001 /* DDR_SDRAM_MODE - DDR SDRAM Mode Register -- 1.7.0.4

2 1

[U-Boot] [PATCH v2] MPC837x: set i2c1_clk
by Andre Schwarz 07 Jul '11

07 Jul '11

Running on mpc837x without CONFIG_FSL_ESDHC leads to i2c1_clk not being set at all. It is bound to clock of encryption module. fix this. Signed-off-by: Andre Schwarz <andre.schwarz(a)matrix-vision.de> --- Changes for v2: - fix commit message mangling in subject line. arch/powerpc/cpu/mpc83xx/speed.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c index 5e616dd..1eca1a8 100644 --- a/arch/powerpc/cpu/mpc83xx/speed.c +++ b/arch/powerpc/cpu/mpc83xx/speed.c @@ -327,6 +327,8 @@ int get_clocks(void) i2c1_clk = enc_clk; #elif defined(CONFIG_FSL_ESDHC) i2c1_clk = sdhc_clk; +#elif defined(CONFIG_MPC837x) + i2c1_clk = enc_clk; #endif #if !defined(CONFIG_MPC832x) i2c2_clk = csb_clk; /* i2c-2 clk is equal to csb clk */ -- 1.7.0.4

2 2

[U-Boot] [PATCH] fsl_dma: fix support for 83xx DMA engine
by Ira W. Snyder 07 Jul '11

07 Jul '11

Commit 359ec4931944adb885882deb9b781e4095eabc94 broke support for the Freescale DMA engine on the 83xx parts. This is due to using registers which do not exist on 83xx. Remove the attribute register accesses from the 83xx build. Signed-off-by: Ira W. Snyder <iws(a)ovro.caltech.edu> Cc: York Sun <yorksun(a)freescale.com> Cc: Peter Tyser <ptyser(a)xes-inc.com> Cc: Kumar Gala <galak(a)kernel.crashing.org> --- drivers/dma/fsl_dma.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/dma/fsl_dma.c b/drivers/dma/fsl_dma.c index 09c18c1..30785ec 100644 --- a/drivers/dma/fsl_dma.c +++ b/drivers/dma/fsl_dma.c @@ -116,10 +116,12 @@ int dmacpy(phys_addr_t dest, phys_addr_t src, phys_size_t count) { out_dma32(&dma->dar, (u32) (dest & 0xFFFFFFFF)); out_dma32(&dma->sar, (u32) (src & 0xFFFFFFFF)); +#if !defined(CONFIG_MPC83xx) out_dma32(&dma->satr, in_dma32(&dma->satr) | (u32)((u64)src >> 32)); out_dma32(&dma->datr, in_dma32(&dma->datr) | (u32)((u64)dest >> 32)); +#endif out_dma32(&dma->bcr, xfer_size); dma_sync(); -- 1.7.3.4

2 2

[U-Boot] [PATCH] ARM: Update maintainer of board scb9328
by Torsten Koschorrek 06 Jul '11

06 Jul '11

Signed-off-by: Torsten Koschorrek <koschorrek(a)synertronixx.de> --- MAINTAINERS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index c462ae2..fe578ef 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -684,7 +684,7 @@ Matthias Kaehlcke <matthias(a)kaehlcke.net> edb9315 ARM920T (EP9315) edb9315a ARM920T (EP9315) -Konstantin Kletschke <kletschke(a)synertronixx.de> +Torsten Koschorrek <koschorrek(a)synertronixx.de> scb9328 ARM920T Nishant Kamat <nskamat(a)ti.com> -- 1.7.2.5

2 4

[U-Boot] [PATCH 1/4 v3] musb: Use name based initialization for musb_config
by Ajay Kumar Gupta 06 Jul '11

06 Jul '11

Changed musb_config initialization for omap3.c, davinci.c and da8xx.c using name of structure fields. This would cause the uninitialized field to be null by default and thus would help in avoiding to init some flags required to be set only for a few selected platforms. CC: Remy Bohmer <linux(a)bohmer.net> Signed-off-by: Ajay Kumar Gupta <ajay.gupta(a)ti.com> --- No change from v2. drivers/usb/musb/da8xx.c | 6 +++--- drivers/usb/musb/davinci.c | 6 +++--- drivers/usb/musb/omap3.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c index 40bfe44..617d88e 100644 --- a/drivers/usb/musb/da8xx.c +++ b/drivers/usb/musb/da8xx.c @@ -27,9 +27,9 @@ /* MUSB platform configuration */ struct musb_config musb_cfg = { - (struct musb_regs *)DA8XX_USB_OTG_CORE_BASE, - DA8XX_USB_OTG_TIMEOUT, - 0 + .regs = (struct musb_regs *)DA8XX_USB_OTG_CORE_BASE, + .timeout = DA8XX_USB_OTG_TIMEOUT, + .musb_speed = 0, }; /* diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c index 8fbadc9..f56f2df 100644 --- a/drivers/usb/musb/davinci.c +++ b/drivers/usb/musb/davinci.c @@ -28,9 +28,9 @@ /* MUSB platform configuration */ struct musb_config musb_cfg = { - (struct musb_regs *)MENTOR_USB0_BASE, - DAVINCI_USB_TIMEOUT, - 0 + .regs = (struct musb_regs *)MENTOR_USB0_BASE, + .timeout = DAVINCI_USB_TIMEOUT, + .musb_speed = 0, }; /* MUSB module register overlay */ diff --git a/drivers/usb/musb/omap3.c b/drivers/usb/musb/omap3.c index 3bfd0a0..785629c 100644 --- a/drivers/usb/musb/omap3.c +++ b/drivers/usb/musb/omap3.c @@ -36,9 +36,9 @@ static int platform_needs_initialization = 1; struct musb_config musb_cfg = { - (struct musb_regs *)MENTOR_USB0_BASE, - OMAP3_USB_TIMEOUT, - 0 + .regs = (struct musb_regs *)MENTOR_USB0_BASE, + .timeout = OMAP3_USB_TIMEOUT, + .musb_speed = 0, }; /* -- 1.6.2.4

6 15

[U-Boot] smdk2416 board support
by Thiago A. Corrêa 06 Jul '11

06 Jul '11

Hi, We have a board based on smdk2416 and we received from the kit manufacturer, from which we based our own board a custom u-boot, which contains support for the following SMDK boards: 2412 2416 2440 2442 2443 2450 6400 6410 6430 c100 We are only interested in 2416 atm, but since we use Buildroot, it would make our lives a lot easier if this was upstream instead of this .tar.bz2 file. How would we proceed to add at least 2416 support to upstream? Can I just update it to HEAD? Should I rewrite it entierly? The board/samsung/smdk2416/smdk2416.c file contains the following copyright notice: /* * (C) Copyright 2007-2008 * Jong - pill, Lee <boyko.lee(a)samsung.com> * * (C) Copyright 2002 * David Mueller, ELSOFT AG, <d.mueller(a)elsoft.ch> * * 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 */ Please advise. Kind Regards, Thiago A. Correa

2 2

[U-Boot] [PATCH] build: Add targets for auto gen of asm-offsets.h and use it in imx35
by Matthias Weisser 06 Jul '11

06 Jul '11

asm-offsets.h should be auto generated. This patch adds two rules to rules.mk which makes this possible and removes the rules on imx35. Signed-off-by: Matthias Weisser <weisserm(a)arcor.de> --- arch/arm/cpu/arm1136/mx35/Makefile | 11 ----------- rules.mk | 10 ++++++++++ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/arch/arm/cpu/arm1136/mx35/Makefile b/arch/arm/cpu/arm1136/mx35/Makefile index 20f36e3..284cdc5 100644 --- a/arch/arm/cpu/arm1136/mx35/Makefile +++ b/arch/arm/cpu/arm1136/mx35/Makefile @@ -50,14 +50,3 @@ include $(SRCTREE)/rules.mk sinclude $(obj).depend ######################################################################### - -$(TOPDIR)/include/asm/arch/asm-offsets.h: $(TOPDIR)/include/autoconf.mk.dep \ - ./asm-offsets.s - @echo Generating $@ - $(TOPDIR)/tools/scripts/make-asm-offsets ./asm-offsets.s $@ - -asm-offsets.s: $(TOPDIR)/include/autoconf.mk.dep \ - ./asm-offsets.c - $(CC) -DDO_DEPS_ONLY \ - $(CFLAGS) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \ - -o $@ ./asm-offsets.c -c -S diff --git a/rules.mk b/rules.mk index c2860e5..5fd12a0 100644 --- a/rules.mk +++ b/rules.mk @@ -42,4 +42,14 @@ $(HOSTOBJS): $(obj)%.o: %.c $(NOPEDOBJS): $(obj)%.o: %.c $(HOSTCC) $(HOSTCFLAGS_NOPED) $(HOSTCFLAGS_$(@F)) $(HOSTCFLAGS_$(BCURDIR)) -o $@ $< -c +$(TOPDIR)/include/asm/arch/asm-offsets.h: $(TOPDIR)/include/autoconf.mk.dep \ + $(TOPDIR)/$(CPUDIR)/$(SOC)/asm-offsets.s + @echo Generating $@ + $(TOPDIR)/tools/scripts/make-asm-offsets $(TOPDIR)/$(CPUDIR)/$(SOC)/asm-offsets.s $@ + +$(TOPDIR)/$(CPUDIR)/$(SOC)/asm-offsets.s: $(TOPDIR)/include/autoconf.mk.dep \ + $(TOPDIR)/$(CPUDIR)/$(SOC)/asm-offsets.c + $(CC) -DDO_DEPS_ONLY \ + $(CFLAGS) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \ + -o $@ $(TOPDIR)/$(CPUDIR)/$(SOC)/asm-offsets.c -c -S ######################################################################### -- 1.7.0.4

2 2

[U-Boot] Pull request u-boot-blackfin.git (post branch)
by Mike Frysinger 06 Jul '11

06 Jul '11

All of thse patches have been posted previously, and no one has given feedback, so here they are in a handy branch for you to pull. The following changes since commit b1af6f532e0d348b153d5c148369229d24af361a: Prepare v2011.06 (2011-06-27 22:22:42 +0200) are available in the git repository at: git://www.denx.de/git/u-boot-blackfin.git post Mike Frysinger (5): post: fix up I/O helper usage post: add gpio hotkey support post: use ARRAY_SIZE post: new nor flash test serial: implement common uart post test common/serial.c | 90 +++++++++++++++++++++ include/post.h | 5 +- include/serial.h | 5 + post/board/lwmon/sysmon.c | 2 +- post/cpu/mpc8xx/ether.c | 4 +- post/cpu/mpc8xx/spr.c | 3 +- post/cpu/mpc8xx/uart.c | 4 +- post/cpu/ppc4xx/spr.c | 3 +- post/drivers/Makefile | 2 +- post/drivers/flash.c | 107 +++++++++++++++++++++++++ post/drivers/memory.c | 2 +- post/lib_powerpc/andi.c | 3 +- post/lib_powerpc/cmp.c | 3 +- post/lib_powerpc/cmpi.c | 3 +- post/lib_powerpc/cr.c | 12 +-- post/lib_powerpc/fpu/mul-subnormal-single-1.c | 2 +- post/lib_powerpc/load.c | 3 +- post/lib_powerpc/multi.c | 2 +- post/lib_powerpc/rlwimi.c | 3 +- post/lib_powerpc/rlwinm.c | 3 +- post/lib_powerpc/rlwnm.c | 3 +- post/lib_powerpc/srawi.c | 3 +- post/lib_powerpc/store.c | 3 +- post/lib_powerpc/three.c | 3 +- post/lib_powerpc/threei.c | 3 +- post/lib_powerpc/threex.c | 3 +- post/lib_powerpc/two.c | 3 +- post/lib_powerpc/twox.c | 3 +- post/post.c | 23 +++++- post/tests.c | 17 ++++- 30 files changed, 269 insertions(+), 56 deletions(-) create mode 100644 post/drivers/flash.c

2 27

[U-Boot] U-boot SPL direct Linux boot
by Simon Schwarz 05 Jul '11

05 Jul '11

Hi List, for my bachelor thesis I will implement a direct Linux boot from U-Boot SPL. My current plan is to utilize do_bootm_[OS]. Simplest solution is to direct boot Linux/other OS and just boot u-boot when a key is pressed. In addition i will also have some tests (header check/CRC) - if they fail start u-boot. IMHO this may also be of interest for the new SPL architecture. Are there already implementations I am not aware of? Any comments on what I should also add? Problems I may not see? Regards Simon

6 16