December 2015 - U-Boot

[U-Boot] [PATCH] common: miiphyutil: avoid memory leak
by Peng Fan 06 Dec '15

06 Dec '15

The following code will alloc memory for new_dev and ldev: " new_dev = mdio_alloc(); ldev = malloc(sizeof(*ldev)); " Either new_dev or ldev is NULL, directly return, but this may leak memory. So before return, using free(ldev) and mdio_free(new_dev) to avoid leaking memory, also free can handle NULL pointer. Signed-off-by: Peng Fan <Peng.Fan(a)freescale.com> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Bin Meng <bmeng.cn(a)gmail.com> --- common/miiphyutil.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/miiphyutil.c b/common/miiphyutil.c index 0811e09..7e41957 100644 --- a/common/miiphyutil.c +++ b/common/miiphyutil.c @@ -114,6 +114,8 @@ void miiphy_register(const char *name, if (new_dev == NULL || ldev == NULL) { printf("miiphy_register: cannot allocate memory for '%s'\n", name); + free(ldev); + mdio_free(new_dev); return; } -- 2.6.2

4 3

[U-Boot] [PATCH] common: cli_hush: avoid memory leak
by Peng Fan 06 Dec '15

06 Dec '15

Need to free memory avoid memory leak, when error. Signed-off-by: Peng Fan <Peng.Fan(a)freescale.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)konsulko.com> --- common/cli_hush.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/cli_hush.c b/common/cli_hush.c index f075459..ab85225 100644 --- a/common/cli_hush.c +++ b/common/cli_hush.c @@ -2474,8 +2474,10 @@ static int done_word(o_string *dest, struct p_context *ctx) if (child->argv == NULL) return 1; child->argv_nonnull = realloc(child->argv_nonnull, (argc+1)*sizeof(*child->argv_nonnull)); - if (child->argv_nonnull == NULL) + if (child->argv_nonnull == NULL) { + free(str); return 1; + } child->argv[argc-1]=str; child->argv_nonnull[argc-1] = dest->nonnull; child->argv[argc]=NULL; -- 2.6.2

4 6

[U-Boot] [PATCH] eeprom: Zap CONFIG_SYS_I2C_MULTI_EEPROMS
by Marek Vasut 06 Dec '15

06 Dec '15

This symbol is no longer used anywhere, remove it. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Heiko Schocher <hs(a)denx.de> Cc: Tom Rini <trini(a)konsulko.com> --- include/configs/am335x_sl50.h | 1 - include/configs/baltos.h | 1 - include/configs/bav335x.h | 1 - include/configs/ot1200.h | 1 - include/configs/ti_armv7_keystone2.h | 1 - 5 files changed, 5 deletions(-) diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index f655e69..1bdb96e 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -78,7 +78,6 @@ #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 -#define CONFIG_SYS_I2C_MULTI_EEPROMS /* PMIC support */ #define CONFIG_POWER_TPS65217 diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 5545cf0..e9b4fe1 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -213,7 +213,6 @@ #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 -#define CONFIG_SYS_I2C_MULTI_EEPROMS /* PMIC support */ #define CONFIG_POWER_TPS65910 diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 9917627..7ed874b 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -346,7 +346,6 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 -#define CONFIG_SYS_I2C_MULTI_EEPROMS /* PMIC support */ #define CONFIG_POWER_TPS65217 diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 426ec72..4baec44 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -115,7 +115,6 @@ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 -#define CONFIG_SYS_I2C_MULTI_EEPROMS #endif /* Miscellaneous commands */ diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index b5d2d2e..a644f90 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -159,7 +159,6 @@ #define I2C_BUS_MAX 3 /* EEPROM definitions */ -#define CONFIG_SYS_I2C_MULTI_EEPROMS #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 6 -- 2.1.4

3 2

[U-Boot] [PATCH] Fix typo: firstly -> first.
by Vagrant Cascadian 06 Dec '15

06 Dec '15

Signed-off-by: Vagrant Cascadian <vagrant(a)debian.org> --- drivers/block/ahci.c | 4 ++-- drivers/mtd/nand/pxa3xx_nand.c | 2 +- drivers/serial/serial.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/block/ahci.c b/drivers/block/ahci.c index 734fdcc..5efa821 100644 --- a/drivers/block/ahci.c +++ b/drivers/block/ahci.c @@ -818,7 +818,7 @@ static int ata_scsiop_read_capacity10(ccb *pccb) if (!ataid[pccb->target]) { printf("scsi_ahci: SCSI READ CAPACITY10 command failure. " "\tNo ATA info!\n" - "\tPlease run SCSI command INQUIRY firstly!\n"); + "\tPlease run SCSI command INQUIRY first!\n"); return -EPERM; } @@ -847,7 +847,7 @@ static int ata_scsiop_read_capacity16(ccb *pccb) if (!ataid[pccb->target]) { printf("scsi_ahci: SCSI READ CAPACITY16 command failure. " "\tNo ATA info!\n" - "\tPlease run SCSI command INQUIRY firstly!\n"); + "\tPlease run SCSI command INQUIRY first!\n"); return -EPERM; } diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index 1565a9a..f65b499 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c @@ -451,7 +451,7 @@ static void pxa3xx_set_datasize(struct pxa3xx_nand_info *info, } /** - * NOTE: it is a must to set ND_RUN firstly, then write + * NOTE: it is a must to set ND_RUN first, then write * command buffer, otherwise, it does not work. * We enable all the interrupt at the same time, and * let pxa3xx_nand_irq to handle all logic. diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c index 422d3ae..f1bd15b 100644 --- a/drivers/serial/serial.c +++ b/drivers/serial/serial.c @@ -527,7 +527,7 @@ static const int bauds[] = CONFIG_SYS_BAUDRATE_TABLE; * * Do a loopback test of the currently selected serial port. This * function is only useful in the context of the POST testing framwork. - * The serial port is firstly configured into loopback mode and then + * The serial port is first configured into loopback mode and then * characters are sent through it. * * Returns 0 on success, value otherwise. -- 2.1.4

3 2

[U-Boot] [PATCH] Fix typo: commmand -> command.
by Vagrant Cascadian 06 Dec '15

06 Dec '15

Signed-off-by: Vagrant Cascadian <vagrant(a)debian.org> --- doc/README.nand | 2 +- doc/README.update | 2 +- drivers/block/ahci.c | 4 ++-- drivers/block/fsl_sata.c | 2 +- include/configs/astro_mcf5373l.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/README.nand b/doc/README.nand index 0ff5633..545d88c 100644 --- a/doc/README.nand +++ b/doc/README.nand @@ -94,7 +94,7 @@ Configuration Options: address of u-boot MTD partition in NAND. CONFIG_CMD_NAND - Enables NAND support and commmands. + Enables NAND support and commands. CONFIG_CMD_NAND_TORTURE Enables the torture command (see description of this command below). diff --git a/doc/README.update b/doc/README.update index eab124c..d37f2c4 100644 --- a/doc/README.update +++ b/doc/README.update @@ -51,7 +51,7 @@ the mkimage tool. dtc tool with support for binary includes, e.g. in version to be prepared. Refer to the doc/uImage.FIT/ directory for more details on FIT images. -This mechanism can be also triggered by the commmand "fitupd". +This mechanism can be also triggered by the command "fitupd". If an optional, non-zero address is provided as argument, the TFTP transfer is skipped and the image at this address is used. The fitupd command is enabled by CONFIG_CMD_FITUPD. diff --git a/drivers/block/ahci.c b/drivers/block/ahci.c index 1ad638e..734fdcc 100644 --- a/drivers/block/ahci.c +++ b/drivers/block/ahci.c @@ -818,7 +818,7 @@ static int ata_scsiop_read_capacity10(ccb *pccb) if (!ataid[pccb->target]) { printf("scsi_ahci: SCSI READ CAPACITY10 command failure. " "\tNo ATA info!\n" - "\tPlease run SCSI commmand INQUIRY firstly!\n"); + "\tPlease run SCSI command INQUIRY firstly!\n"); return -EPERM; } @@ -847,7 +847,7 @@ static int ata_scsiop_read_capacity16(ccb *pccb) if (!ataid[pccb->target]) { printf("scsi_ahci: SCSI READ CAPACITY16 command failure. " "\tNo ATA info!\n" - "\tPlease run SCSI commmand INQUIRY firstly!\n"); + "\tPlease run SCSI command INQUIRY firstly!\n"); return -EPERM; } diff --git a/drivers/block/fsl_sata.c b/drivers/block/fsl_sata.c index 208a0ae..e000ebf 100644 --- a/drivers/block/fsl_sata.c +++ b/drivers/block/fsl_sata.c @@ -398,7 +398,7 @@ static int fsl_ata_exec_ata_cmd(struct fsl_sata *sata, struct sata_fis_h2d *cfis debug("attribute = %08x\n\r", val32); cmd_hdr->attribute = cpu_to_le32(val32); - /* Make sure cmd desc and cmd slot valid before commmand issue */ + /* Make sure cmd desc and cmd slot valid before command issue */ sync(); /* PMP*/ diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 8606151..828bc60 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -57,7 +57,7 @@ #define ENABLE_JFFS 1 #endif -/* Define which commmands should be available at u-boot command prompt */ +/* Define which commands should be available at u-boot command prompt */ #define CONFIG_CMD_CACHE #define CONFIG_CMD_DATE -- 2.1.4

3 2

[U-Boot] [PATCH 1/2] mpc8xx: remove stale "lwmon" files
by Wolfgang Denk 06 Dec '15

06 Dec '15

Commit acc2372d "mpc8xx: remove lwmon board support" removed support for the MPC823 based "lwmon" board, but left some board specific POST files. This patch cleans up and removes the now unused files. Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- post/board/lwmon/Makefile | 8 -- post/board/lwmon/sysmon.c | 297 ---------------------------------------------- 2 files changed, 305 deletions(-) delete mode 100644 post/board/lwmon/Makefile delete mode 100644 post/board/lwmon/sysmon.c diff --git a/post/board/lwmon/Makefile b/post/board/lwmon/Makefile deleted file mode 100644 index 7f6d5a0..0000000 --- a/post/board/lwmon/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# -# (C) Copyright 2002-2006 -# Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += sysmon.o diff --git a/post/board/lwmon/sysmon.c b/post/board/lwmon/sysmon.c deleted file mode 100644 index f521b27..0000000 --- a/post/board/lwmon/sysmon.c +++ /dev/null @@ -1,297 +0,0 @@ -/* - * (C) Copyright 2003 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include <post.h> -#include <common.h> - -/* - * SYSMON test - * - * This test performs the system hardware monitoring. - * The test passes when all the following voltages and temperatures - * are within allowed ranges: - * - * Board temperature - * Front temperature - * +3.3V CPU logic - * +5V logic - * +12V PCMCIA - * +12V CCFL - * +5V standby - * - * CCFL is not enabled if temperature values are not within allowed ranges - * - * See the list off all parameters in the sysmon_table below - */ - -#include <post.h> -#include <watchdog.h> -#include <i2c.h> - -#if CONFIG_POST & CONFIG_SYS_POST_SYSMON - -DECLARE_GLOBAL_DATA_PTR; - -static int sysmon_temp_invalid = 0; - -/* #define DEBUG */ - -typedef struct sysmon_s sysmon_t; -typedef struct sysmon_table_s sysmon_table_t; - -static void sysmon_lm87_init (sysmon_t * this); -static void sysmon_pic_init (sysmon_t * this); -static uint sysmon_i2c_read (sysmon_t * this, uint addr); -static uint sysmon_i2c_read_sgn (sysmon_t * this, uint addr); -static void sysmon_ccfl_disable (sysmon_table_t * this); -static void sysmon_ccfl_enable (sysmon_table_t * this); - -struct sysmon_s -{ - uchar chip; - void (*init)(sysmon_t *); - uint (*read)(sysmon_t *, uint); -}; - -static sysmon_t sysmon_lm87 = - {CONFIG_SYS_I2C_SYSMON_ADDR, sysmon_lm87_init, sysmon_i2c_read}; -static sysmon_t sysmon_lm87_sgn = - {CONFIG_SYS_I2C_SYSMON_ADDR, sysmon_lm87_init, sysmon_i2c_read_sgn}; -static sysmon_t sysmon_pic = - {CONFIG_SYS_I2C_PICIO_ADDR, sysmon_pic_init, sysmon_i2c_read}; - -static sysmon_t * sysmon_list[] = -{ - &sysmon_lm87, - &sysmon_lm87_sgn, - &sysmon_pic, - NULL -}; - -struct sysmon_table_s -{ - char * name; - char * unit_name; - sysmon_t * sysmon; - void (*exec_before)(sysmon_table_t *); - void (*exec_after)(sysmon_table_t *); - - int unit_precision; - int unit_div; - int unit_min; - int unit_max; - uint val_mask; - uint val_min; - uint val_max; - int val_valid; - uint val_min_alt; - uint val_max_alt; - int val_valid_alt; - uint addr; -}; - -static sysmon_table_t sysmon_table[] = -{ - {"Board temperature", " C", &sysmon_lm87_sgn, NULL, sysmon_ccfl_disable, - 1, 1, -128, 127, 0xFF, 0x58, 0xD5, 0, 0x6C, 0xC6, 0, 0x27}, - - {"Front temperature", " C", &sysmon_lm87, NULL, sysmon_ccfl_disable, - 1, 100, -27316, 8984, 0xFF, 0xA4, 0xFC, 0, 0xB2, 0xF1, 0, 0x29}, - - {"+3.3V CPU logic", "V", &sysmon_lm87, NULL, NULL, - 100, 1000, 0, 4386, 0xFF, 0xB6, 0xC9, 0, 0xB6, 0xC9, 0, 0x22}, - - {"+ 5 V logic", "V", &sysmon_lm87, NULL, NULL, - 100, 1000, 0, 6630, 0xFF, 0xB6, 0xCA, 0, 0xB6, 0xCA, 0, 0x23}, - - {"+12 V PCMCIA", "V", &sysmon_lm87, NULL, NULL, - 100, 1000, 0, 15460, 0xFF, 0xBC, 0xD0, 0, 0xBC, 0xD0, 0, 0x21}, - - {"+12 V CCFL", "V", &sysmon_lm87, NULL, sysmon_ccfl_enable, - 100, 1000, 0, 15900, 0xFF, 0xB6, 0xCA, 0, 0xB6, 0xCA, 0, 0x24}, - - {"+ 5 V standby", "V", &sysmon_pic, NULL, NULL, - 100, 1000, 0, 6040, 0xFF, 0xC8, 0xDE, 0, 0xC8, 0xDE, 0, 0x7C}, -}; -static int sysmon_table_size = ARRAY_SIZE(sysmon_table); - -static int conversion_done = 0; - - -int sysmon_init_f (void) -{ - sysmon_t ** l; - ulong reg; - - /* Power on CCFL, PCMCIA */ - reg = pic_read (0x60); - reg |= 0x09; - pic_write (0x60, reg); - - for (l = sysmon_list; *l; l++) { - (*l)->init(*l); - } - - return 0; -} - -void sysmon_reloc (void) -{ - /* Do nothing for now, sysmon_reloc() is required by the sysmon post */ -} - -static char *sysmon_unit_value (sysmon_table_t *s, uint val) -{ - static char buf[32]; - int unit_val = - s->unit_min + (s->unit_max - s->unit_min) * val / s->val_mask; - char *p, sign; - int dec, frac; - - if (val == -1) { - return "I/O ERROR"; - } - - if (unit_val < 0) { - sign = '-'; - unit_val = -unit_val; - } else { - sign = '+'; - } - - p = buf + sprintf(buf, "%c%2d", sign, unit_val / s->unit_div); - - - frac = unit_val % s->unit_div; - - frac /= (s->unit_div / s->unit_precision); - - dec = s->unit_precision; - - if (dec != 1) { - *p++ = '.'; - } - for (dec /= 10; dec != 0; dec /= 10) { - *p++ = '0' + (frac / dec) % 10; - } - strcpy(p, s->unit_name); - - return buf; -} - -static void sysmon_lm87_init (sysmon_t * this) -{ - uchar val; - - /* Detect LM87 chip */ - if (i2c_read(this->chip, 0x40, 1, &val, 1) || (val & 0x80) != 0 || - i2c_read(this->chip, 0x3E, 1, &val, 1) || val != 0x02) { - printf("Error: LM87 not found at 0x%02X\n", this->chip); - return; - } - - /* Configure pins 5,6 as AIN */ - val = 0x03; - if (i2c_write(this->chip, 0x16, 1, &val, 1)) { - printf("Error: can't write LM87 config register\n"); - return; - } - - /* Start monitoring */ - val = 0x01; - if (i2c_write(this->chip, 0x40, 1, &val, 1)) { - printf("Error: can't write LM87 config register\n"); - return; - } -} - -static void sysmon_pic_init (sysmon_t * this) -{ -} - -static uint sysmon_i2c_read (sysmon_t * this, uint addr) -{ - uchar val; - uint res = i2c_read(this->chip, addr, 1, &val, 1); - - return res == 0 ? val : -1; -} - -static uint sysmon_i2c_read_sgn (sysmon_t * this, uint addr) -{ - uchar val; - return i2c_read(this->chip, addr, 1, &val, 1) == 0 ? - 128 + (signed char)val : -1; -} - -static void sysmon_ccfl_disable (sysmon_table_t * this) -{ - if (!this->val_valid_alt) { - sysmon_temp_invalid = 1; - } -} - -static void sysmon_ccfl_enable (sysmon_table_t * this) -{ - ulong reg; - - if (!sysmon_temp_invalid) { - reg = pic_read (0x60); - reg |= 0x06; - pic_write (0x60, reg); - } -} - -int sysmon_post_test (int flags) -{ - int res = 0; - sysmon_table_t * t; - uint val; - - /* - * The A/D conversion on the LM87 sensor takes 300 ms. - */ - if (! conversion_done) { - while (post_time_ms(gd->post_init_f_time) < 300) WATCHDOG_RESET (); - conversion_done = 1; - } - - for (t = sysmon_table; t < sysmon_table + sysmon_table_size; t ++) { - if (t->exec_before) { - t->exec_before(t); - } - - val = t->sysmon->read(t->sysmon, t->addr); - if (val != -1) { - t->val_valid = val >= t->val_min && val <= t->val_max; - t->val_valid_alt = val >= t->val_min_alt && val <= t->val_max_alt; - } else { - t->val_valid = 0; - t->val_valid_alt = 0; - } - - if (t->exec_after) { - t->exec_after(t); - } - - if ((!t->val_valid) || (flags & POST_MANUAL)) { - printf("%-17s = %-10s ", t->name, sysmon_unit_value(t, val)); - printf("allowed range"); - printf(" %-8s ..", sysmon_unit_value(t, t->val_min)); - printf(" %-8s", sysmon_unit_value(t, t->val_max)); - printf(" %s\n", t->val_valid ? "OK" : "FAIL"); - } - - if (!t->val_valid) { - res = -1; - } - } - - return res; -} - -#endif /* CONFIG_POST & CONFIG_SYS_POST_SYSMON */ -- 2.4.3

2 1

[U-Boot] [PATCH] common: miiphyutil: no need to check name of mii_dev
by Peng Fan 06 Dec '15

06 Dec '15

The entry name of mii_dev is an array not pointer, so no need to check. Signed-off-by: Peng Fan <Peng.Fan(a)freescale.com> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Bin Meng <bmeng.cn(a)gmail.com> --- common/miiphyutil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/miiphyutil.c b/common/miiphyutil.c index e499b58..0811e09 100644 --- a/common/miiphyutil.c +++ b/common/miiphyutil.c @@ -159,7 +159,7 @@ void mdio_free(struct mii_dev *bus) int mdio_register(struct mii_dev *bus) { - if (!bus || !bus->name || !bus->read || !bus->write) + if (!bus || !bus->read || !bus->write) return -1; /* check if we have unique name */ -- 2.6.2

5 4

[U-Boot] [PATCH] common: bootm: check return value of strict_strtoul
by Peng Fan 06 Dec '15

06 Dec '15

Before continue, check return value of strict_strtoul. Signed-off-by: Peng Fan <Peng.Fan(a)freescale.com> Cc: Albert Aribaud <albert.u.boot(a)aribaud.net> Cc: Simon Glass <sjg(a)chromium.org> Cc: Jan Kiszka <jan.kiszka(a)siemens.com> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Hans de Goede <hdegoede(a)redhat.com> Cc: York Sun <yorksun(a)freescale.com> Cc: Tom Rini <trini(a)konsulko.com> --- arch/arm/lib/bootm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index ee56d74..a477cae 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -290,7 +290,10 @@ static void boot_jump_linux(bootm_headers_t *images, int flag) s = getenv("machid"); if (s) { - strict_strtoul(s, 16, &machid); + if (strict_strtoul(s, 16, &machid) < 0) { + debug("strict_strtoul failed!\n"); + return; + } printf("Using machid 0x%lx from environment\n", machid); } -- 2.6.2

5 12

[U-Boot] [PATCH v2 1/4] tegra: Remove merge markers in some Kconfig files
by Simon Glass 06 Dec '15

06 Dec '15

These were added by mistake in commit fde7e189. They cause a warning when configuring the boards. Remove them. Signed-off-by: Simon Glass <sjg(a)chromium.org> Reported-by: Stephen Warren <swarren(a)nvidia.com> Reported-by: Kevin Hilman <khilman(a)linaro.org> Tested-by: Stephen Warren <swarren(a)nvidia.com> Fixes: fde7e18938d8 ("dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig") --- Changes in v2: - Add 'Fixes' tag configs/beaver_defconfig | 3 --- configs/cardhu_defconfig | 3 --- configs/jetson-tk1_defconfig | 3 --- configs/trimslice_defconfig | 3 --- 4 files changed, 12 deletions(-) diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig index 2930344..8add08d 100644 --- a/configs/beaver_defconfig +++ b/configs/beaver_defconfig @@ -13,11 +13,8 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y -<<<<<<< HEAD CONFIG_SPI_FLASH_WINBOND=y -======= CONFIG_PCI_TEGRA=y ->>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig CONFIG_SYS_NS16550=y CONFIG_TEGRA20_SLINK=y CONFIG_USB=y diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig index 5760018..c9f565a 100644 --- a/configs/cardhu_defconfig +++ b/configs/cardhu_defconfig @@ -13,11 +13,8 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y -<<<<<<< HEAD CONFIG_SPI_FLASH_WINBOND=y -======= CONFIG_PCI_TEGRA=y ->>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig CONFIG_SYS_NS16550=y CONFIG_TEGRA20_SLINK=y CONFIG_USB=y diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig index 9500d2c..efc4aee 100644 --- a/configs/jetson-tk1_defconfig +++ b/configs/jetson-tk1_defconfig @@ -13,11 +13,8 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y -<<<<<<< HEAD CONFIG_SPI_FLASH_WINBOND=y -======= CONFIG_PCI_TEGRA=y ->>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig CONFIG_SYS_NS16550=y CONFIG_TEGRA114_SPI=y CONFIG_USB=y diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig index ee40218..e34faa3 100644 --- a/configs/trimslice_defconfig +++ b/configs/trimslice_defconfig @@ -13,11 +13,8 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y -<<<<<<< HEAD CONFIG_SPI_FLASH_WINBOND=y -======= CONFIG_PCI_TEGRA=y ->>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig CONFIG_SYS_NS16550=y CONFIG_TEGRA20_SFLASH=y CONFIG_USB=y -- 2.6.0.rc2.230.g3dd15c0

1 3

[U-Boot] [PATCH] arm: socfpga: Don't redefine CONFIG_PHYLIB
by Pavel Machek 06 Dec '15

06 Dec '15

CONFIG_PHYLIB is already set by the config system, don't set it again. Avoids ton of warnings. Signed-off-by: Pavel Machek <pavel(a)denx.de> diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index b3f65b6..86eccba 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -105,7 +105,6 @@ #define CONFIG_DW_ALTDESCRIPTOR #define CONFIG_MII #define CONFIG_AUTONEG_TIMEOUT (15 * CONFIG_SYS_HZ) -#define CONFIG_PHYLIB #define CONFIG_PHY_GIGE #endif -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

3 6