July 2012 - U-Boot

Re: [U-Boot] [PATCH v2 09/19] tegra: Add SOC support for display/lcd
by Simon Glass 11 Jul '12

11 Jul '12

On Wed, Jul 11, 2012 at 6:49 AM, Simon Glass <sjg(a)google.com> wrote: > Hi Stephen, > > > On Fri, Jun 15, 2012 at 1:39 AM, Stephen Warren <swarren(a)wwwdotorg.org>wrote: > >> On 06/13/2012 10:19 AM, Simon Glass wrote: >> > From: Wei Ni <wni(a)nvidia.com> >> > >> > Add support for the LCD peripheral at the Tegra2 SOC level. A separate >> > LCD driver will use this functionality to configure the display. >> >> > diff --git a/arch/arm/include/asm/arch-tegra2/display.h >> b/arch/arm/include/asm/arch-tegra2/display.h >> >> > +/** >> > + * Perform the next stage of the LCD init if it is time to do so. >> > + * >> > + * LCD init can be time-consuming because of the number of delays we >> need >> > + * while waiting for the backlight power supply, etc. This function can >> > + * be called at various times during U-Boot operation to advance the >> > + * initialization of the LCD to the next stage if sufficient time has >> > + * passed since the last stage. It keeps track of what stage it is up >> to >> > + * and the time that it is permitted to move to the next stage. >> > + * >> > + * The final call should have wait=1 to complete the init. >> > + * >> > + * @param blob fdt blob containing LCD information >> > + * @param wait 1 to wait until all init is complete, and then >> return >> > + * 0 to return immediately, potentially doing nothing if it >> is >> > + * not yet time for the next init. >> > + */ >> > +int tegra_lcd_check_next_stage(const void *blob, int wait); >> >> The prototype in the header seems to be the only mention of this function. >> > > In my copy of the patches it is defined in the driver > (drivers/video/tegra.c). I will move it to the same patch. > > Regards, > Simon > >

1 0

[U-Boot] [PATCH v4] powerpc/p1022ds: Add sdcard and spi boot support to P1022DS
by Dirk Eibach 10 Jul '12

10 Jul '12

Signed-off-by: Dirk Eibach <eibach(a)gdsys.de> Cc: Timur Tabi <timur(a)freescale.com> --- Changes in v2: - add Cc - split up original patch series Changes in v3: - use clrsetbits() instead of clrbits()/setbits() - remove dead code - remove unnecessary #undef Changes in v4: - Add some documentation - set pmuxcr depending on bootmode - use 'ifdef' instead of 'if defined' - undo unrelated whitespace change - fix CONFIG_ENV_ADDR board/freescale/p1022ds/p1022ds.c | 5 +++ board/freescale/p1022ds/tlb.c | 10 +++++++ boards.cfg | 4 +++ doc/README.p1022ds | 52 +++++++++++++++++++++++++++++++++++ include/configs/P1022DS.h | 55 +++++++++++++++++++++++++++++++++--- 5 files changed, 121 insertions(+), 5 deletions(-) diff --git a/board/freescale/p1022ds/p1022ds.c b/board/freescale/p1022ds/p1022ds.c index 456d9b0..e1e074e 100644 --- a/board/freescale/p1022ds/p1022ds.c +++ b/board/freescale/p1022ds/p1022ds.c @@ -37,6 +37,11 @@ int board_early_init_f(void) { ccsr_gur_t *gur = (void *)CONFIG_SYS_MPC85xx_GUTS_ADDR; +#if defined(CONFIG_RAMBOOT_SPIFLASH) || defined(CONFIG_RAMBOOT_SDCARD) + /* Reset eLBC_DIU and SPI_eLBC in case we are booting from SD */ + clrsetbits_be32(&gur->pmuxcr, 0x00600000, 0x80000000); +#endif + /* Set pmuxcr to allow both i2c1 and i2c2 */ setbits_be32(&gur->pmuxcr, 0x1000); diff --git a/board/freescale/p1022ds/tlb.c b/board/freescale/p1022ds/tlb.c index e620112..013e9a7 100644 --- a/board/freescale/p1022ds/tlb.c +++ b/board/freescale/p1022ds/tlb.c @@ -71,6 +71,16 @@ struct fsl_e_tlb_entry tlb_table[] = { SET_TLB_ENTRY(1, PIXIS_BASE, PIXIS_BASE_PHYS, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, 7, BOOKE_PAGESZ_4K, 1), + +#ifdef CONFIG_SYS_RAMBOOT + SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE, + MAS3_SX|MAS3_SW|MAS3_SR, 0, + 0, 8, BOOKE_PAGESZ_1G, 1), + SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000, + CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000, + MAS3_SX|MAS3_SW|MAS3_SR, 0, + 0, 9, BOOKE_PAGESZ_1G, 1) +#endif }; int num_tlb_entries = ARRAY_SIZE(tlb_table); diff --git a/boards.cfg b/boards.cfg index 24c5879..8de4235 100644 --- a/boards.cfg +++ b/boards.cfg @@ -700,6 +700,10 @@ P1021RDB-PC_SDCARD powerpc mpc85xx p1_p2_rdb_pc freesca P1021RDB-PC_SPIFLASH powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1021RDB,SPIFLASH P1022DS powerpc mpc85xx p1022ds freescale P1022DS_36BIT powerpc mpc85xx p1022ds freescale - P1022DS:36BIT +P1022DS_36BIT_SDCARD powerpc mpc85xx p1022ds freescale - P1022DS:36BIT,SDCARD +P1022DS_36BIT_SPIFLASH powerpc mpc85xx p1022ds freescale - P1022DS:36BIT,SPIFLASH +P1022DS_SDCARD powerpc mpc85xx p1022ds freescale - P1022DS:SDCARD +P1022DS_SPIFLASH powerpc mpc85xx p1022ds freescale - P1022DS:SPIFLASH P1023RDS powerpc mpc85xx p1023rds freescale - P1023RDS P1023RDS_NAND powerpc mpc85xx p1023rds freescale - P1023RDS:NAND P1024RDB powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1024RDB diff --git a/doc/README.p1022ds b/doc/README.p1022ds index 04d9197..98499f8 100644 --- a/doc/README.p1022ds +++ b/doc/README.p1022ds @@ -21,3 +21,55 @@ and AUDIO codec clock sources only setting as 11MHz or 12MHz ! 'setenv hwconfig 'audclk:12;tdm' --- error ! 'setenv hwconfig 'audclk:11;tdm' --- error ! 'setenv hwconfig 'audclk:10' --- error ! + +Booting from eSPI/eSDHC +----------------------- + +The P1022 is capable of loading initialization code from a memory device that is +connected to the eSPI or eSDHC controller interface. Booting is supported by the +P1022 using an on-chip ROM which contains the basic device driver and the code +to perform block copy to any target memory. + +Freescale offers a tool for building SD or SPI images, which is hosted here: +http://git.freescale.com/git/cgit.cgi/ppc/sdk/boot-format.git + +For eSDHC: + +1. Build u-boot + make P1022DS_SDCARD_config + or + make P1022DS_36BIT_SDCARD_config + then + make + +2. Prepare SD card + boot_format config_ddr3_2gb_p1022ds.dat u-boot.bin -sd /dev/sd... + +3. Change dip-switch + SW4[5-8] = 0111 + +4. Insert SD card and push RESET + +For eSPI: + +1. Build u-boot + make P1022DS_SPIFLASH_config + or + make P1022DS_36BIT_SPIFLASH_config + then + make + +2. Prepare binary image file + boot_format config_ddr3_2gb_p1022ds.dat u-boot.bin -spi spiimage.bin + +3. Program SPI memory device using u-boot + tftpboot $loadaddr spiimage.bin + sf probe + sf erase 0 +$filesize + sf write $fileaddr 0 $filesize + +3. Change dip-switch + SW4[5-8] = 0110 + +4. Push RESET + diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 70d751d..ec60445 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -26,6 +26,18 @@ #define CONFIG_P1022DS #define CONFIG_MP /* support multiple processors */ +#ifdef CONFIG_SDCARD +#define CONFIG_RAMBOOT_SDCARD 1 +#define CONFIG_SYS_TEXT_BASE 0x11000000 +#define CONFIG_RESET_VECTOR_ADDRESS 0x1107fffc +#endif + +#ifdef CONFIG_SPIFLASH +#define CONFIG_RAMBOOT_SPIFLASH 1 +#define CONFIG_SYS_TEXT_BASE 0x11000000 +#define CONFIG_RESET_VECTOR_ADDRESS 0x1107fffc +#endif + #ifndef CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_TEXT_BASE 0xeff80000 #endif @@ -138,6 +150,12 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ +#if defined(CONFIG_RAMBOOT_NAND) || defined(CONFIG_RAMBOOT_SDCARD) || \ + defined(CONFIG_RAMBOOT_SPIFLASH) +#define CONFIG_SYS_RAMBOOT +#define CONFIG_SYS_EXTRA_ENV_RELOC +#endif + #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_EMPTY_INFO @@ -403,11 +421,38 @@ /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH -#define CONFIG_ENV_OVERWRITE -#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) -#define CONFIG_ENV_SIZE 0x2000 -#define CONFIG_ENV_SECT_SIZE 0x20000 +#if defined(CONFIG_SYS_RAMBOOT) +#if defined(CONFIG_RAMBOOT_NAND) +#define CONFIG_ENV_IS_IN_NAND 1 +#define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE +#define CONFIG_ENV_OFFSET ((512 * 1024) + CONFIG_SYS_NAND_BLOCK_SIZE) +#define CONFIG_ENV_RANGE (3 * CONFIG_ENV_SIZE) +#elif defined(CONFIG_RAMBOOT_SPIFLASH) +#define CONFIG_ENV_IS_IN_SPI_FLASH +#define CONFIG_ENV_SPI_BUS 0 +#define CONFIG_ENV_SPI_CS 0 +#define CONFIG_ENV_SPI_MAX_HZ 10000000 +#define CONFIG_ENV_SPI_MODE 0 +#define CONFIG_ENV_SIZE 0x2000 /* 8KB */ +#define CONFIG_ENV_OFFSET 0x100000 +#define CONFIG_ENV_SECT_SIZE 0x10000 +#elif defined(CONFIG_RAMBOOT_SDCARD) +#define CONFIG_ENV_IS_IN_MMC +#define CONFIG_FSL_FIXED_MMC_LOCATION +#define CONFIG_ENV_SIZE 0x2000 +#define CONFIG_SYS_MMC_ENV_DEV 0 +#else + #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ + #define CONFIG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE) +#endif +#else + #define CONFIG_ENV_IS_IN_FLASH + #define CONFIG_ENV_OVERWRITE + #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) + #define CONFIG_ENV_SIZE 0x2000 + #define CONFIG_ENV_SECT_SIZE 0x20000 +#endif #define CONFIG_LOADS_ECHO #define CONFIG_SYS_LOADS_BAUD_CHANGE -- 1.7.2.5

2 1

[U-Boot] [PATCH v3 1/2] tools, config.mk: add binutils-version
by Allen Martin 10 Jul '12

10 Jul '12

Modeled after gcc-version, add function to get binutils version. Signed-off-by: Allen Martin <amartin(a)nvidia.com> --- config.mk | 1 + tools/binutils-version.sh | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100755 tools/binutils-version.sh diff --git a/config.mk b/config.mk index c239f23..fa5e626 100644 --- a/config.mk +++ b/config.mk @@ -128,6 +128,7 @@ endif # cc-version # Usage gcc-ver := $(call cc-version) cc-version = $(shell $(SHELL) $(SRCTREE)/tools/gcc-version.sh $(CC)) +binutils-version = $(shell $(SHELL) $(SRCTREE)/tools/binutils-version.sh $(AS)) # # Include the make variables (CC, etc...) diff --git a/tools/binutils-version.sh b/tools/binutils-version.sh new file mode 100755 index 0000000..d4d9eb4 --- /dev/null +++ b/tools/binutils-version.sh @@ -0,0 +1,20 @@ +#!/bin/sh +# +# binutils-version [-p] gas-command +# +# Prints the binutils version of `gas-command' in a canonical 4-digit form +# such as `0222' for binutils 2.22 +# + +gas="$*" + +if [ ${#gas} -eq 0 ]; then + echo "Error: No assembler specified." + printf "Usage:\n\t$0 <gas-command>\n" + exit 1 +fi + +MAJOR=$($gas --version | head -1 | awk '{print $NF}' | cut -d . -f 1) +MINOR=$($gas --version | head -1 | awk '{print $NF}' | cut -d . -f 2) + +printf "%02d%02d\\n" $MAJOR $MINOR -- 1.7.9.5

1 1

[U-Boot] [PATCH] net: fix typo in arp clean up
by Mike Frysinger 10 Jul '12

10 Jul '12

The clean up patch missed an &, so we end up passing an int rather than a pointer to the sprintf function. arp.c: In function 'ArpReceive': arp.c:197: warning: format '%p' expects type 'void *', but argument 3 has type 'int' Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- net/arp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/arp.c b/net/arp.c index bac4cab..8e1d2ed 100644 --- a/net/arp.c +++ b/net/arp.c @@ -194,7 +194,7 @@ void ArpReceive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) #ifdef CONFIG_KEEP_SERVERADDR if (NetServerIP == NetArpWaitPacketIP) { char buf[20]; - sprintf(buf, "%pM", arp->ar_sha); + sprintf(buf, "%pM", &arp->ar_sha); setenv("serveraddr", buf); } #endif -- 1.7.7.3

2 1

[U-Boot] [PATCH 2/2] [v3] net: abort network initialization if the PHY driver fails
by Timur Tabi 10 Jul '12

10 Jul '12

Now that phy_startup() can return an actual error code, check for that error code and abort network initialization if the PHY fails. Signed-off-by: Timur Tabi <timur(a)freescale.com> Acked-by: Nobuhiro Iwamamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> (sh_eth part) Acked-by: Stephan Linz <linz(a)li-pro.net> (Xilinx part, xilinx_axi_emac and xilinx_ll_temac) Reviewed-by: Marek Vasut <marex(a)denx.de> (FEC part) --- drivers/net/fec_mxc.c | 8 +++++++- drivers/net/fm/eth.c | 9 ++++++++- drivers/net/sh_eth.c | 6 +++++- drivers/net/tsec.c | 8 +++++++- drivers/net/xilinx_axi_emac.c | 6 +++++- drivers/net/xilinx_ll_temac.c | 8 +++++++- 6 files changed, 39 insertions(+), 6 deletions(-) diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index eee41d7..5700552 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -510,7 +510,13 @@ static int fec_open(struct eth_device *edev) fec_eth_phy_config(edev); if (fec->phydev) { /* Start up the PHY */ - phy_startup(fec->phydev); + int ret = phy_startup(fec->phydev); + + if (ret) { + printf("Could not initialize PHY %s\n", + fec->phydev->dev->name); + return ret; + } speed = fec->phydev->speed; } else { speed = _100BASET; diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c index f34f4db..2b616ad 100644 --- a/drivers/net/fm/eth.c +++ b/drivers/net/fm/eth.c @@ -363,6 +363,9 @@ static int fm_eth_open(struct eth_device *dev, bd_t *bd) { struct fm_eth *fm_eth; struct fsl_enet_mac *mac; +#ifdef CONFIG_PHYLIB + int ret; +#endif fm_eth = (struct fm_eth *)dev->priv; mac = fm_eth->mac; @@ -384,7 +387,11 @@ static int fm_eth_open(struct eth_device *dev, bd_t *bd) fmc_tx_port_graceful_stop_disable(fm_eth); #ifdef CONFIG_PHYLIB - phy_startup(fm_eth->phydev); + ret = phy_startup(fm_eth->phydev); + if (ret) { + printf("%s: Could not initialize\n", fm_eth->phydev->dev->name); + return ret; + } #else fm_eth->phydev->speed = SPEED_1000; fm_eth->phydev->link = 1; diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index bb57e4d..268d884 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -415,7 +415,11 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd) goto err_phy_cfg; } phy = port_info->phydev; - phy_startup(phy); + ret = phy_startup(phy); + if (ret) { + printf(SHETHER_NAME ": phy startup failure\n"); + return ret; + } val = 0; diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 3c1c8f0..f5e314b 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -480,6 +480,7 @@ static int tsec_init(struct eth_device *dev, bd_t * bd) int i; struct tsec_private *priv = (struct tsec_private *)dev->priv; tsec_t *regs = priv->regs; + int ret; /* Make sure the controller is stopped */ tsec_halt(dev); @@ -511,7 +512,12 @@ static int tsec_init(struct eth_device *dev, bd_t * bd) startup_tsec(dev); /* Start up the PHY */ - phy_startup(priv->phydev); + ret = phy_startup(priv->phydev); + if (ret) { + printf("Could not initialize PHY %s\n", + priv->phydev->dev->name); + return ret; + } adjust_link(priv, priv->phydev); diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c index 7854a04..d777144 100644 --- a/drivers/net/xilinx_axi_emac.c +++ b/drivers/net/xilinx_axi_emac.c @@ -272,7 +272,11 @@ static int setup_phy(struct eth_device *dev) phydev->advertising = phydev->supported; priv->phydev = phydev; phy_config(phydev); - phy_startup(phydev); + if (phy_startup(phydev)) { + printf("axiemac: could not initialize PHY %s\n", + phydev->dev->name); + return 0; + } switch (phydev->speed) { case 1000: diff --git a/drivers/net/xilinx_ll_temac.c b/drivers/net/xilinx_ll_temac.c index 27dafc1..b67153b 100644 --- a/drivers/net/xilinx_ll_temac.c +++ b/drivers/net/xilinx_ll_temac.c @@ -232,6 +232,7 @@ static void ll_temac_halt(struct eth_device *dev) static int ll_temac_init(struct eth_device *dev, bd_t *bis) { struct ll_temac *ll_temac = dev->priv; + int ret; printf("%s: Xilinx XPS LocalLink Tri-Mode Ether MAC #%d at 0x%08X.\n", dev->name, dev->index, dev->iobase); @@ -240,7 +241,12 @@ static int ll_temac_init(struct eth_device *dev, bd_t *bis) return -1; /* Start up the PHY */ - phy_startup(ll_temac->phydev); + ret = phy_startup(ll_temac->phydev); + if (ret) { + printf("%s: Could not initialize PHY %s\n", + dev->name, ll_temac->phydev->dev->name); + return ret; + } if (!ll_temac_adjust_link(dev)) { ll_temac_halt(dev); -- 1.7.3.4

3 6

[U-Boot] [PATCH v2 1/2] tools, config.mk: add binutils-version
by Allen Martin 10 Jul '12

10 Jul '12

Modeled after gcc-version, add function to get binutils version. Signed-off-by: Allen Martin <amartin(a)nvidia.com> --- config.mk | 1 + tools/binutils-version.sh | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100755 tools/binutils-version.sh diff --git a/config.mk b/config.mk index c239f23..fa5e626 100644 --- a/config.mk +++ b/config.mk @@ -128,6 +128,7 @@ endif # cc-version # Usage gcc-ver := $(call cc-version) cc-version = $(shell $(SHELL) $(SRCTREE)/tools/gcc-version.sh $(CC)) +binutils-version = $(shell $(SHELL) $(SRCTREE)/tools/binutils-version.sh $(AS)) # # Include the make variables (CC, etc...) diff --git a/tools/binutils-version.sh b/tools/binutils-version.sh new file mode 100755 index 0000000..d4d9eb4 --- /dev/null +++ b/tools/binutils-version.sh @@ -0,0 +1,20 @@ +#!/bin/sh +# +# binutils-version [-p] gas-command +# +# Prints the binutils version of `gas-command' in a canonical 4-digit form +# such as `0222' for binutils 2.22 +# + +gas="$*" + +if [ ${#gas} -eq 0 ]; then + echo "Error: No assembler specified." + printf "Usage:\n\t$0 <gas-command>\n" + exit 1 +fi + +MAJOR=$($gas --version | head -1 | awk '{print $NF}' | cut -d . -f 1) +MINOR=$($gas --version | head -1 | awk '{print $NF}' | cut -d . -f 2) + +printf "%02d%02d\\n" $MAJOR $MINOR -- 1.7.9.5

2 6

[U-Boot] RMLL/LSM 2012 - U-Boot Developer's Meeting
by Wolfgang Denk 10 Jul '12

10 Jul '12

Hi all, this is just a reminder for the first U-Boot Developer's Meeting which takes place next week in the context of the 13es Rencontres Mondiales du Logiciel Libre (RMLL) aka 13th Libre Software Meeting (LSM) in Geneva. So far, the following events are scheduled: * Wednesday, July 11: 3:00 - 6:00 p.m. U-Boot Birds-of-a-Feather (BOF) Meeting See http://schedule2012.rmll.info/BoF-U-Boot?lang=en So far, I have received the following suggestions for topics we should talk about: * U-Boot History visualized (Wolfgang Denk <wd(a)denx.de>) * tips on how to use JTAG to debug custom hardware that does not boot (Fabio Estevam <festevam(a)gmail.com>) * Conflict resolution: setting up a moderator procedure for unhappy submitters (Detlev Zundel <dzu(a)denx.de>) More suggestions welcome!! * Thursday, July 12: 09:20 - 10:00 a.m. Tom Rini: "Giving Linux a Boot" See http://schedule2012.rmll.info/Giving-Linux-a-boot?lang=en 10:00 - 10:40 a.m. Detlev Zundel: "The Xenomai real-time develop- ment framework. Recent and future developments" See http://schedule2012.rmll.info/The-Xenomai-real-time-development-framework-R… 11:00 - 11:40 a.m. Marek Vasut: "U-Boot Driver Model" See http://schedule2012.rmll.info/U-Boot-driver-model?lang=en 11:40 a.m. - 12:20 p.m. Wolfgang Denk: "U-Boot 'Falcon' mode" See http://schedule2012.rmll.info/Minimizing-boot-times-using-U-Boot-Falcon-mod… 7:30 p.m. U-Boot & Beer no location scheduled yet; suggestions welcome!! Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de The most difficult thing in the world is to know how to do a thing and to watch someone else doing it wrong, without commenting. -- T.H. White

3 2

[U-Boot] [PATCH] smsc95xx: align buffers to cache line size
by Ilya Yanok 10 Jul '12

10 Jul '12

Align buffers passed to the USB code to cache line size so they can be DMAed safely. Signed-off-by: Ilya Yanok <ilya.yanok(a)cogentembedded.com> --- Depens on Marek's patch [1] for DEFINE_CACHE_ALIGN_BUFFER. [1] http://patchwork.ozlabs.org/patch/169619/ drivers/usb/eth/smsc95xx.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c index c7aebea..c62a8c1 100644 --- a/drivers/usb/eth/smsc95xx.c +++ b/drivers/usb/eth/smsc95xx.c @@ -153,13 +153,15 @@ static int curr_eth_dev; /* index for name of next device detected */ static int smsc95xx_write_reg(struct ueth_data *dev, u32 index, u32 data) { int len; + ALLOC_CACHE_ALIGN_BUFFER(u32, tmpbuf, 1); cpu_to_le32s(&data); + tmpbuf[0] = data; len = usb_control_msg(dev->pusb_dev, usb_sndctrlpipe(dev->pusb_dev, 0), USB_VENDOR_REQUEST_WRITE_REGISTER, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - 00, index, &data, sizeof(data), USB_CTRL_SET_TIMEOUT); + 00, index, tmpbuf, sizeof(data), USB_CTRL_SET_TIMEOUT); if (len != sizeof(data)) { debug("smsc95xx_write_reg failed: index=%d, data=%d, len=%d", index, data, len); @@ -171,11 +173,13 @@ static int smsc95xx_write_reg(struct ueth_data *dev, u32 index, u32 data) static int smsc95xx_read_reg(struct ueth_data *dev, u32 index, u32 *data) { int len; + ALLOC_CACHE_ALIGN_BUFFER(u32, tmpbuf, 1); len = usb_control_msg(dev->pusb_dev, usb_rcvctrlpipe(dev->pusb_dev, 0), USB_VENDOR_REQUEST_READ_REGISTER, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - 00, index, data, sizeof(data), USB_CTRL_GET_TIMEOUT); + 00, index, tmpbuf, sizeof(data), USB_CTRL_GET_TIMEOUT); + *data = tmpbuf[0]; if (len != sizeof(data)) { debug("smsc95xx_read_reg failed: index=%d, len=%d", index, len); @@ -664,7 +668,8 @@ static int smsc95xx_send(struct eth_device *eth, void* packet, int length) int actual_len; u32 tx_cmd_a; u32 tx_cmd_b; - unsigned char msg[PKTSIZE + sizeof(tx_cmd_a) + sizeof(tx_cmd_b)]; + ALLOC_CACHE_ALIGN_BUFFER(unsigned char, msg, + PKTSIZE + sizeof(tx_cmd_a) + sizeof(tx_cmd_b)); debug("** %s(), len %d, buf %#x\n", __func__, length, (int)msg); if (length > PKTSIZE) @@ -695,7 +700,7 @@ static int smsc95xx_send(struct eth_device *eth, void* packet, int length) static int smsc95xx_recv(struct eth_device *eth) { struct ueth_data *dev = (struct ueth_data *)eth->priv; - static unsigned char recv_buf[AX_RX_URB_SIZE]; + DEFINE_CACHE_ALIGN_BUFFER(unsigned char, recv_buf, AX_RX_URB_SIZE); unsigned char *buf_ptr; int err; int actual_len; -- 1.7.9.5

2 11

[U-Boot] [PATCH] i2c: deblock i2c bus also if accessed before realocation
by Holger Brunck 10 Jul '12

10 Jul '12

If we switch to a different i2c bus in changing the mux config for the i2c mux, we have to be sure to deblock the bus also before realocation. Signed-off-by: Holger Brunck <holger.brunck(a)keymile.com> cc: Heiko Schocher <hs(a)denx.de> cc: Valentin Longchamp <valentin.longchamp(a)keymile.com> --- common/cmd_i2c.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c index 2cdc4ed..795814d 100644 --- a/common/cmd_i2c.c +++ b/common/cmd_i2c.c @@ -1445,6 +1445,7 @@ int i2c_mux_ident_muxstring_f (uchar *buf) oldpos = pos; } + i2c_init_board(); return 0; } -- 1.7.1

2 2

[U-Boot] [ARM] one warning left for all ARM boards
by Albert ARIBAUD 10 Jul '12

10 Jul '12

Hi all, With the latest commits on u-boot/master, two obnoxious "attention" messages were removed from ARM builds, but one still remains: attention : -fstack-usage not supported for this target [enabled by default] This is with gcc version 4.6.3 (Ubuntu/Linaro 4.6.3-1ubuntu5). doc/SPL/README.omap3 does indeed say that not all GCC releases have -fstack-usage, and commit 4a30f1e8 from Tom Rini (Cc:) says it tests for the option, but apparently testing for the option is not the same as testing for the option on a given target... How do we get rid of those warnings? Right now they appear for every single ARM board built. Amicalement, -- Albert.

5 9