March 2014 - U-Boot

[U-Boot] [PATCH] patman: Use Patch-cc: instead of Cc:
by Simon Glass 13 Mar '14

13 Mar '14

Add a new Patch-cc: tag which performs the service now provided by the Cc: tag. The Cc: tag is interpreted by git send-email but ignored by patman. So now: Cc: patman does nothing. (git send-email can cc patches) Patch-cc: patman Cc's patch and removes this tag from the patch Signed-off-by: Simon Glass <sjg(a)chromium.org> --- tools/patman/README | 21 ++++++++++++--------- tools/patman/patchstream.py | 4 ++-- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/tools/patman/README b/tools/patman/README index 59f1776..b3aba13 100644 --- a/tools/patman/README +++ b/tools/patman/README @@ -217,8 +217,10 @@ Series-changes: n to update the log there and then, knowing that the script will do the rest. - Cc: Their Name <email> - This copies a single patch to another email address. +Patch-cc: Their Name <email> + This copies a single patch to another email address. Note that the + Cc: used by git send-email is ignored by patman, but will be + interpreted by git send-email if you use it. Series-process-log: sort, uniq This tells patman to sort and/or uniq the change logs. It is @@ -246,8 +248,9 @@ Where Patches Are Sent Once the patches are created, patman sends them using git send-email. The whole series is sent to the recipients in Series-to: and Series-cc. -You can Cc individual patches to other people with the Cc: tag. Tags in the -subject are also picked up to Cc patches. For example, a commit like this: +You can Cc individual patches to other people with the Patch-cc: tag. Tags +in the subject are also picked up to Cc patches. For example, a commit like +this: >>>> commit 10212537b85ff9b6e09c82045127522c0f0db981 @@ -258,16 +261,16 @@ Date: Mon Nov 7 23:18:44 2011 -0500 This should make sending out e-mails to the right people easier. - Cc: sandbox, mikef, ag - Cc: afleming + Patch-cc: sandbox, mikef, ag + Patch-cc: afleming <<<< will create a patch which is copied to x86, arm, sandbox, mikef, ag and afleming. -If you have a cover letter it will get sent to the union of the CC lists of -all of the other patches. If you want to sent it to additional people you -can add a tag: +If you have a cover letter it will get sent to the union of the Patch-cc +lists of all of the other patches. If you want to sent it to additional +people you can add a tag: Cover-letter-cc: <list of addresses> diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py index 684204c..c4017e0 100644 --- a/tools/patman/patchstream.py +++ b/tools/patman/patchstream.py @@ -36,7 +36,7 @@ re_series_tag = re.compile('^Series-([a-z-]*): *(.*)') re_commit_tag = re.compile('^Commit-([a-z-]*): *(.*)') # Commit tags that we want to collect and keep -re_tag = re.compile('^(Tested-by|Acked-by|Reviewed-by|Cc): (.*)') +re_tag = re.compile('^(Tested-by|Acked-by|Reviewed-by|Patch-cc): (.*)') # The start of a new commit in the git log re_commit = re.compile('^commit ([0-9a-f]*)$') @@ -267,7 +267,7 @@ class PatchStream: if (tag_match.group(1) == 'Tested-by' and tag_match.group(2).find(os.getenv('USER') + '@') != -1): self.warn.append("Ignoring %s" % line) - elif tag_match.group(1) == 'Cc': + elif tag_match.group(1) == 'Patch-cc': self.commit.AddCc(tag_match.group(2).split(',')) else: self.tags.append(line); -- 1.9.0.rc1.175.g0b1dcb5

2 1

[U-Boot] [PATCH v2] kbuild: delete *.pyc files by "make distclean"
by Masahiro Yamada 12 Mar '14

12 Mar '14

The tools "buildman" and "patman" are written in Python. When we run them, "*.pyc" files are created under tools/buildman, tools/patman directories. They should be cleaned up by "make distclean". Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)ti.com> Acked-by: Simon Glass <sjg(a)chromium.org> --- Changes in v2: - This is a minor update, but fixed a typo in commit description s/written Python/written in Python/ Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c8d5ccc..538c3bf 100644 --- a/Makefile +++ b/Makefile @@ -1228,7 +1228,7 @@ distclean: mrproper @find $(srctree) $(RCS_FIND_IGNORE) \ $ -name '*.orig' -o -name '*.rej' -o -name '*~' \ -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ - -o -name '.*.rej' \ + -o -name '.*.rej' -o -name '*.pyc' \ -o -name '*%' -o -name '.*.cmd' -o -name 'core' $ \ -type f -print | xargs rm -f -- 1.8.3.2

2 1

[U-Boot] [PATCH v4 0/6] usb: net: introduce Moschip MCS7830 driver
by Gerhard Sittig 12 Mar '14

12 Mar '14

this series - adds a new USB ethernet driver for adapters that are based on the MCS7730/7830/7832 chips - enables the driver for those boards which previously had support for "all other" USB ethernet adapters - updates the README.usb documentation file to list all available drivers for USB ethernet adapters development was done on a taskit stamp9g20, tests were done on the taskit stamp9g20 as well as wandboard both with "Delock 61147" and "Logilink UA0025C" adapters, transferring a 56MB file several times with TFTP there are several checkpatch warnings - about CamelCase for NetReceive() and USB related structure members, which cannot get fixed as the names are in the established API - about a multiple assignment for the "found" flags in the USB endpoint search, which I consider acceptable Changes in v4: - remove a duplicate comment in the mcs7830_read_phy() routine - remove the actually unused mcs7830_read_config() routine Changes in v3: - pick up Simon's ACKs for individual patches - drop the part of the series which moves BIT() to <common.h> - remove BIT() macro use, declare constant numbers for bit masks for improved portability - re-word the commit message, include a link to the www.asix.com.tw product page, and explictly list the supported chips Changes in v2: - introduced the "no #ifdef for prototypes" patch - don't #ifdef function prototypes in header files (the newly introduced mcs7830_*() routines in usb_ether.h) - remove editor navigation pseudo comments (text fold markers) - reduce the number of timeout declarations (only USB communication and ethernet link status remaining) - declare the ethernet adapter register set layout by means of a struct and offsetof() instead of magic register index numbers - separate the bit mask declarations from the register layout declaration, use the common BIT() macro instead of re-inventing its implementation - rename register layout and bit field macros to reduce excessive identifier lengths, and to not collide with the global CONFIG_* name space - introduce kernel nano doc comments for data structures, global variables, and all routines - improve handling of the list of supported dongles, remove the unused sentinel and iterate by means of ARRAY_SIZE(), fixup whitespace for the Sitecom entry - decorate the mcs7830_read_config() routine with the "__maybe_unused" attribute instead of forcing a reference by means of "(void)identifier;" just to silence a potential compiler warning - silent operation of the ethernet link status detection according to U-Boot philosophy, which simplifies the .init() callback code path - factor out common logic of PHY read/write support (the "emit a request and wait for completion" part), unbreak the retry logic (correct number of iterations) - use proper errno.h codes, and propagate errors up in the call chain - adjust the Cc: list - introduce the patch to alpha-sort USB adapter config options - introduce the patch to add MCS7830 USB ethernet to several boards - introduce the patch to add MCS7830 USB ethernet for taskit stamp9g20 - introduce the patch to update README.usb for USB ethernet options Gerhard Sittig (6): usb: net: don't ifdef routine declarations in usb_ether.h usb: net: introduce support for Moschip USB ethernet tegra: omap: alpha-sort USB ethernet items for Asix and SMSC tegra: imx: omap: enable Moschip USB ethernet support for several boards at91: enable USB ethernet for taskit stamp9g20 usb: net: update README.usb to list all USB ethernet options doc/README.usb | 13 +- drivers/usb/eth/Makefile | 1 + drivers/usb/eth/mcs7830.c | 812 ++++++++++++++++++++++++++++++++++++++++ drivers/usb/eth/usb_ether.c | 7 + include/configs/harmony.h | 3 +- include/configs/m53evk.h | 1 + include/configs/mx53loco.h | 1 + include/configs/nitrogen6x.h | 1 + include/configs/omap3_beagle.h | 3 +- include/configs/stamp9g20.h | 5 +- include/usb_ether.h | 14 +- 11 files changed, 850 insertions(+), 11 deletions(-) create mode 100644 drivers/usb/eth/mcs7830.c -- 1.7.10.4

5 21

[U-Boot] [PATCH 0/2] fw_env: fix bugs in fw_setenv when erase-block-size < env-size
by Dustin Byford 12 Mar '14

12 Mar '14

Hi All, I'm having a problem where fw_setenv fails writing the environment to a SPI NOR device with a 4K erase block size. This led me to two discoveries and two patches: 1) The "default" number of environment sectors is assumed to be one, even if the environment is larger than a sector. 2) fw_setenv has a bug calculating bytes written for NOR devices. Patches to follow: [PATCH 1/2] fw_env: calculate default number of env sectors [PATCH 2/2] fw_env: correct writes to devices with small erase blocks Thanks, --Dustin

2 4

[U-Boot] [PATCH] Add support for offset of a filesystem within a block-device
by Hannes Petermaier 12 Mar '14

12 Mar '14

For clear separation of user's (OS) filesystem to U-Boot and other's stuff it is now possible to give the filesystem a specific offset and a specific size. For full consistency OS storage driver also has to support this and has to use same offset and size. Following new parameters has been added to the block_dev_desc_t structure: - lba_offset : offset in blocks from which fs is reading/writing - lba_fs : size in blocks of fs This two parameters are filled from the underlaying device-driver. As default they are initialized for giving whole size of block-device to the filesystem. In case of mmc-driver a function for modifiying drive geometry is called 'board_mmc_geometry', this function is implemented as '__weak', so it can be replaced by a board-specific function, which can setup suitable offset and size for the filesystem. This function is responsible for giving reasonable values, e.g. lba_offset+lba_fs must not exceed available blocks of the device. Only MMC Driver and FATFS are modified to support this. Signed-off-by: Hannes Petermaier <oe5hpm(a)oevsv.at> --- disk/part_dos.c | 11 ++++++++--- drivers/mmc/mmc.c | 8 ++++++++ fs/fat/fat.c | 5 +++-- fs/fat/fat_write.c | 7 ++++--- include/part.h | 10 +++++++++- 5 files changed, 32 insertions(+), 9 deletions(-) diff --git a/disk/part_dos.c b/disk/part_dos.c index 05c3933..aa38819 100644 --- a/disk/part_dos.c +++ b/disk/part_dos.c @@ -87,7 +87,8 @@ int test_part_dos (block_dev_desc_t *dev_desc) { ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, dev_desc->blksz); - if (dev_desc->block_read(dev_desc->dev, 0, 1, (ulong *) buffer) != 1) + if (dev_desc->block_read(dev_desc->dev, dev_desc->lba_offset, 1, + (ulong *)buffer) != 1) return -1; if (test_block_type(buffer) != DOS_MBR) @@ -106,7 +107,9 @@ static void print_partition_extended(block_dev_desc_t *dev_desc, dos_partition_t *pt; int i; - if (dev_desc->block_read(dev_desc->dev, ext_part_sector, 1, (ulong *) buffer) != 1) { + if (dev_desc->block_read(dev_desc->dev, + ext_part_sector + dev_desc->lba_offset, 1, + (ulong *)buffer) != 1) { printf ("** Can't read partition table on %d:%d **\n", dev_desc->dev, ext_part_sector); return; @@ -169,7 +172,9 @@ static int get_partition_info_extended (block_dev_desc_t *dev_desc, int ext_part dos_partition_t *pt; int i; - if (dev_desc->block_read (dev_desc->dev, ext_part_sector, 1, (ulong *) buffer) != 1) { + if (dev_desc->block_read(dev_desc->dev, + ext_part_sector + dev_desc->lba_offset, 1, + (ulong *)buffer) != 1) { printf ("** Can't read partition table on %d:%d **\n", dev_desc->dev, ext_part_sector); return -1; diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 8ab0bc9..4acce73 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -526,6 +526,12 @@ static int mmc_change_freq(struct mmc *mmc) return 0; } +void __weak board_mmc_geometry(struct mmc *mmc) +{ + mmc->block_dev.lba_fs = mmc->block_dev.lba; + mmc->block_dev.lba_offset = 0; +} + static int mmc_set_capacity(struct mmc *mmc, int part_num) { switch (part_num) { @@ -551,6 +557,8 @@ static int mmc_set_capacity(struct mmc *mmc, int part_num) mmc->block_dev.lba = lldiv(mmc->capacity, mmc->read_bl_len); + board_mmc_geometry(mmc); + return 0; } diff --git a/fs/fat/fat.c b/fs/fat/fat.c index 54f42ea..dba0989 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -49,7 +49,8 @@ static int disk_read(__u32 block, __u32 nr_blocks, void *buf) return -1; return cur_dev->block_read(cur_dev->dev, - cur_part_info.start + block, nr_blocks, buf); + cur_part_info.start + block + cur_dev->lba_offset, + nr_blocks, buf); } int fat_set_blk_dev(block_dev_desc_t *dev_desc, disk_partition_t *info) @@ -97,7 +98,7 @@ int fat_register_device(block_dev_desc_t *dev_desc, int part_no) } info.start = 0; - info.size = dev_desc->lba; + info.size = dev_desc->lba_fs; info.blksz = dev_desc->blksz; info.name[0] = 0; info.type[0] = 0; diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c index 9f5e911..6238a8e 100644 --- a/fs/fat/fat_write.c +++ b/fs/fat/fat_write.c @@ -31,14 +31,15 @@ static int disk_write(__u32 block, __u32 nr_blocks, void *buf) if (!cur_dev || !cur_dev->block_write) return -1; - if (cur_part_info.start + block + nr_blocks > - cur_part_info.start + total_sector) { + if (cur_part_info.start + block + nr_blocks + cur_dev->lba_offset > + cur_part_info.start + total_sector + cur_dev->lba_offset) { printf("error: overflow occurs\n"); return -1; } return cur_dev->block_write(cur_dev->dev, - cur_part_info.start + block, nr_blocks, buf); + cur_part_info.start + block + cur_dev->lba_offset, + nr_blocks, buf); } /* diff --git a/include/part.h b/include/part.h index 4beb6db..29a227a 100644 --- a/include/part.h +++ b/include/part.h @@ -20,7 +20,15 @@ typedef struct block_dev_desc { #ifdef CONFIG_LBA48 unsigned char lba48; /* device can use 48bit addr (ATA/ATAPI v7) */ #endif - lbaint_t lba; /* number of blocks */ + lbaint_t lba_offset; /* + * offset from which file-systems + * do their work + */ + lbaint_t lba_fs; /* + * number of blocks available to the + * file-system + */ + lbaint_t lba; /* total number of blocks-available */ unsigned long blksz; /* block size */ int log2blksz; /* for convenience: log2(blksz) */ char vendor [40+1]; /* IDE model, SCSI Vendor */ -- 1.7.9.5

3 8

[U-Boot] [PATCH] board/BuR/kwb: fix usage of 'i2c_set_bus_speed'
by Hannes Petermaier 12 Mar '14

12 Mar '14

- fix: return-value of 'i2c_set_bus_speed' was interpreted wrong Signed-off-by: Hannes Petermaier <oe5hpm(a)oevsv.at> --- board/BuR/kwb/board.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/BuR/kwb/board.c b/board/BuR/kwb/board.c index 8aa16bc..8fb5e68 100644 --- a/board/BuR/kwb/board.c +++ b/board/BuR/kwb/board.c @@ -120,7 +120,7 @@ void am33xx_spl_board_init(void) /* power-ON 3V3 via Resetcontroller */ oldspeed = i2c_get_bus_speed(); - if (0 != i2c_set_bus_speed(CONFIG_SYS_OMAP24_I2C_SPEED_PSOC)) { + if (0 <= i2c_set_bus_speed(CONFIG_SYS_OMAP24_I2C_SPEED_PSOC)) { buf = RSTCTRL_FORCE_PWR_NEN; i2c_write(RSTCTRL_ADDR, RSTCTRL_CTRLREG, 1, (uint8_t *)&buf, sizeof(buf)); @@ -221,7 +221,7 @@ int board_late_init(void) TPS65217_WLEDCTRL1, 0x09, 0xFF); /* write bootinfo into scratchregister of resetcontroller */ oldspeed = i2c_get_bus_speed(); - if (0 != i2c_set_bus_speed(CONFIG_SYS_OMAP24_I2C_SPEED_PSOC)) { + if (0 <= i2c_set_bus_speed(CONFIG_SYS_OMAP24_I2C_SPEED_PSOC)) { i2c_write(RSTCTRL_ADDR, RSTCTRL_SCRATCHREG, 1, (uint8_t *)&buf, sizeof(buf)); i2c_set_bus_speed(oldspeed); -- 1.7.10.4

4 6

[U-Boot] [PATCH] arm: am335x: DXR2: Move unconditional LAN9303 reset into command
by Stefan Roese 12 Mar '14

12 Mar '14

The switch HW reset results in a disconnection of the switch port daisy- chain for a few seconds. This is not desired in the normal field use case. So lets remove this switch reset from the normal bootup sequence and move it into a board specific command. This way it can be executed in the development environment when really needed. Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Roger Meier <r.meier(a)siemens.com> Cc: Lukas Stockmann <lukas.stockmann(a)siemens.com> Cc: Tom Rini <trini(a)ti.com> --- board/siemens/dxr2/board.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/board/siemens/dxr2/board.c b/board/siemens/dxr2/board.c index 2172379..38ac93d 100644 --- a/board/siemens/dxr2/board.c +++ b/board/siemens/dxr2/board.c @@ -232,13 +232,6 @@ int board_eth_init(bd_t *bis) factoryset_setenv(); - /* Reset SMSC LAN9303 switch for default configuration */ - gpio_request(GPIO_LAN9303_NRST, "nRST"); - gpio_direction_output(GPIO_LAN9303_NRST, 0); - /* assert active low reset for 200us */ - udelay(200); - gpio_set_value(GPIO_LAN9303_NRST, 1); - /* Set rgmii mode and enable rmii clock to be sourced from chip */ writel((RMII_MODE_ENABLE | RMII_CHIPCKL_ENABLE), &cdev->miisel); @@ -249,6 +242,25 @@ int board_eth_init(bd_t *bis) n += rv; return n; } + +static int do_switch_reset(cmd_tbl_t *cmdtp, int flag, int argc, + char *const argv[]) +{ + /* Reset SMSC LAN9303 switch for default configuration */ + gpio_request(GPIO_LAN9303_NRST, "nRST"); + gpio_direction_output(GPIO_LAN9303_NRST, 0); + /* assert active low reset for 200us */ + udelay(200); + gpio_set_value(GPIO_LAN9303_NRST, 1); + + return 0; +}; + +U_BOOT_CMD( + switch_rst, CONFIG_SYS_MAXARGS, 1, do_switch_reset, + "Reset LAN9303 switch via its reset pin", + "" +); #endif /* #if defined(CONFIG_DRIVER_TI_CPSW) */ #endif /* #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) */ -- 1.8.5.5

2 1

[U-Boot] [PATCH] drivers: net: cpsw: init phy with gigabit features
by Ilya Ledvich 12 Mar '14

12 Mar '14

CPSW ia a gigabit device. Use the PHY_GBIT_FEATURES macro to determine phy supported features. Tested on cm_t335. Signed-off-by: Ilya Ledvich <ilya(a)compulab.co.il> --- drivers/net/cpsw.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/net/cpsw.c b/drivers/net/cpsw.c index 50167aa..018ec9a 100644 --- a/drivers/net/cpsw.c +++ b/drivers/net/cpsw.c @@ -941,11 +941,7 @@ static int cpsw_phy_init(struct eth_device *dev, struct cpsw_slave *slave) { struct cpsw_priv *priv = (struct cpsw_priv *)dev->priv; struct phy_device *phydev; - u32 supported = (SUPPORTED_10baseT_Half | - SUPPORTED_10baseT_Full | - SUPPORTED_100baseT_Half | - SUPPORTED_100baseT_Full | - SUPPORTED_1000baseT_Full); + u32 supported = PHY_GBIT_FEATURES; phydev = phy_connect(priv->bus, CONFIG_PHY_ADDR, -- 1.7.9.5

2 1

[U-Boot] [PATCH] am335x_evm: Remove SPI SPL from NOR support target
by Tom Rini 12 Mar '14

12 Mar '14

When using the am335x_evm_nor target one is generally expecting to be used in an environment when you want to program the NOR and not a "deployment" type target. In addition this only supports the Beaglebone White with the memory cape and NOR module installed, which precludes the presence of SPI flash. Drop SPI as we were getting close to the binary limit in some cases and slightly over with other toolchains. Signed-off-by: Tom Rini <trini(a)ti.com> --- include/configs/am335x_evm.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 2020e7f..fd6f52c 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -442,6 +442,8 @@ #define CONFIG_SYS_FLASH_BASE (0x08000000) #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE +/* Reduce SPL size by removing unlikey targets */ +#undef CONFIG_SPL_SPI_SUPPORT #ifdef CONFIG_NOR_BOOT #define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ -- 1.7.9.5

1 1

[U-Boot] [PATCH] drivers/spi/omap3: Bug fix of premature write transfer completion
by Vasili Galka 12 Mar '14

12 Mar '14

The logic determining SPI "write" transfer completion was faulty. At certain conditions (e.g. slow SPI clock freq) the transfers were interrupted before completion. Both EOT and TXS flags of channel status registeer shall be checked to ensure that all data was transferred. Tested on AM3359 chip. Signed-off-by: Vasili Galka <vasili(a)visionmap.com> --- drivers/spi/omap3_spi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c index a3ad056..651e46e 100644 --- a/drivers/spi/omap3_spi.c +++ b/drivers/spi/omap3_spi.c @@ -260,8 +260,9 @@ int omap3_spi_write(struct spi_slave *slave, unsigned int len, const void *txp, } /* wait to finish of transfer */ - while (!(readl(&ds->regs->channel[ds->slave.cs].chstat) & - OMAP3_MCSPI_CHSTAT_EOT)); + while ((readl(&ds->regs->channel[ds->slave.cs].chstat) & + (OMAP3_MCSPI_CHSTAT_EOT | OMAP3_MCSPI_CHSTAT_TXS)) != + (OMAP3_MCSPI_CHSTAT_EOT | OMAP3_MCSPI_CHSTAT_TXS)); /* Disable the channel otherwise the next immediate RX will get affected */ omap3_spi_set_enable(ds,OMAP3_MCSPI_CHCTRL_DIS); -- 1.8.1.msysgit.1

2 1