April 2011 - U-Boot

[U-Boot] re
by grand6651 28 Apr '11

28 Apr '11

Hello, I need your full cooperation to enable me move this 8kilogram of gold over to you in your country for investment. My father who died as the result of a heart-related condition. His heart condition was due to the death of all the members of our family as earlier explained, who until his death was an oil contractor and lived all his life here in Thailand, but unfortunately died. This 8kilogram of gold in question are deposited in a cargo warehouse here in Thailand, and if they are not claimed within a time as permitted by the company, the company will confiscate it. Presently, I am in possession of the records regarding to this and and I want you to please come come over to Thailand so that we can clear the gold from the cargo company. I want this done so that I can use a good part of my share for helping the poor and also for investment package in your country under your supervision. You shall receive 10% of the total sum when we clear the gold from here and sell it in your country with your assistance. However, I must assure you that this transaction is safe, you should not be scared of any thing. I will put all modalities in place to ensure that this is done in a legitimate way without a single breach of law. Based on your maximum cooperation, we can finalize this transaction if you can come over to Thailand. The gold is 8kilogram. Please confirm and send me the following details. I wait your urgent reply. Thanks Mark Mobile: +66807752895 Please reply to this email: markhaines1847(a)yahoo.com.my

1 0

[U-Boot] [PATCH] powerpc/85xx: Don't set FT_FSL_PCI_SETUP if CONFIG_PCI is not set
by Matthew McClintock 28 Apr '11

28 Apr '11

A lot of boards set FT_FSL_PCI_SETUP directly in their board code and don't check to see if CONFIG_PCI is actually defined. This will cause the board compilation to fail if CONFIG_PCI is not defined. The p1022ds board is one such example. Instead of fixing every board this patch wraps FT_FSL_PCI_SETUP around CONFIG_PCI so we can remove CONFIG_PCI and boards will still build properly. cc: Kumar Gala <kumar.gala(a)freescale.com> Signed-off-by: Matthew McClintock <msm(a)freescale.com> --- arch/powerpc/include/asm/fsl_pci.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/include/asm/fsl_pci.h b/arch/powerpc/include/asm/fsl_pci.h index 82d75be..fc47a9f 100644 --- a/arch/powerpc/include/asm/fsl_pci.h +++ b/arch/powerpc/include/asm/fsl_pci.h @@ -230,7 +230,9 @@ int fsl_pcie_init_board(int busno); #define FT_FSL_PCIE3_SETUP __FT_FSL_PCIE_SETUP(blob, FSL_PCIE_COMPAT, 3) #define FT_FSL_PCIE4_SETUP __FT_FSL_PCIE_SETUP(blob, FSL_PCIE_COMPAT, 4) -#if defined(CONFIG_FSL_CORENET) +#if !defined(CONFIG_PCI) +#define FT_FSL_PCI_SETUP +#elif defined(CONFIG_FSL_CORENET) #define FSL_PCIE_COMPAT "fsl,p4080-pcie" #define FT_FSL_PCI_SETUP \ FT_FSL_PCIE1_SETUP; \ -- 1.7.3.4

2 1

[U-Boot] Good news
by The Honda Car Company 28 Apr '11

28 Apr '11

Your ticket number: 023-0148-790-459 with Serial number 5368/05 drewthe lucky number: 29 We are pleased to notify you that your emailaddress emerged as a winner in our Honda Car promotional lottery sweepstakes and as a result you have been granted the lump sum payout of One Million Pounds. Contact your claims officer below for your claims/winnings MR. MORRISON LUKE EMAIL:fudiciaryagent120@gmail.com You are to forward the following details to enable us clear your file for immediate payment. Full name:______________ Address:___________ Age:_______ Sex:_______ tel:_______________ Country:_______________ Occupation___________

1 0

[U-Boot] [PATCH v2] common: add a grepenv command
by Kim Phillips 28 Apr '11

28 Apr '11

u-boot environments, esp. when boards are shared across multiple users, can get pretty large and time consuming to visually parse. The grepenv command this patch adds can be used in lieu of printenv to facilitate searching. grepenv works like printenv but limits its output only to environment strings (variable name and value pairs) that match the user specified substring. Signed-off-by: Kim Phillips <kim.phillips(a)freescale.com> --- v2: rebased common/cmd_nvedit.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index fb69c24..532167b 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -160,6 +160,49 @@ int do_env_print (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return rcode; } +int do_grepenv (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + char buf[CONFIG_SYS_CBSIZE], *searchstr; + int i = 0, j = 0, k = 0; + int rcode = 1; + + if (argc != 2) { + cmd_usage(cmdtp); + return 1; + } + + searchstr = argv[1]; + + /* find and print matching env vars */ + do { + buf[j] = env_get_char(i); + if (buf[j] == searchstr[k]) { + k++; + if (searchstr[k] == '\0') { + /* match complete */ + rcode = 0; + do { + i++; j++; + buf[j] = env_get_char(i); + } while (buf[j] != '\0'); + puts(buf); puts("\n"); + j = 0; k = 0; + } else + j++; + } else { + k = 0; + if (buf[j] == '\0') { + j = 0; + if (ctrlc()) + return -1; + } else + j++; + } + i++; + } while (!(j == 0 && env_get_char(i) == '\0')); + + return rcode; +} /* * Set a new environment variable, * or replace or delete an existing one. @@ -904,6 +947,14 @@ U_BOOT_CMD_COMPLETE( ); U_BOOT_CMD_COMPLETE( + grepenv, 2, 0, do_grepenv, + "search environment", + "fixed-string\n" + " - list environment name and value pairs matching 'fixed-string'", + var_complete +); + +U_BOOT_CMD_COMPLETE( setenv, CONFIG_SYS_MAXARGS, 0, do_env_set, "set environment variables", "name value ...\n" -- 1.7.4

4 9

[U-Boot] [PATCH] [v2] powerpc: fix implementation of out_8 to match the other out_XX functions
by Timur Tabi 28 Apr '11

28 Apr '11

For some reason, the implementation of out_8() does not match the other output accessors, nor does it match equivalent Linux accessor. This can cause a problem in a situation like this: __raw_readb(p1); out_8(p2, x); In this case, there is no barrier between the read and the write. If the out_8() is changed to out_be16(), then there is a barrier. Signed-off-by: Timur Tabi <timur(a)freescale.com> --- arch/powerpc/include/asm/io.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h index 4ddad26..56ac9fe 100644 --- a/arch/powerpc/include/asm/io.h +++ b/arch/powerpc/include/asm/io.h @@ -175,7 +175,10 @@ extern inline int in_8(const volatile unsigned char __iomem *addr) extern inline void out_8(volatile unsigned char __iomem *addr, int val) { - __asm__ __volatile__("stb%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val)); + __asm__ __volatile__("sync;\n" + "stb%U0%X0 %1,%0;\n" + : "=m" (*addr) + : "r" (val)); } extern inline int in_le16(const volatile unsigned short __iomem *addr) -- 1.7.3.4

2 1

[U-Boot] env: fix env var autocompletion
by Kim Phillips 28 Apr '11

28 Apr '11

commit 560d424b6d7cd4205b062ad95f1b104bd4f8bcc3 "env: re-add support for auto-completion" fell short of its description - the 'used' logic in hmatch_r was reversed - 'used' is 0 if the hash table entry is not used, or -1 if deleted. This patch makes hmatch_r actually match on valid ('used') entries, instead of skipping them and failing to match anything. typing 'printenv tft' and hitting 'tab' now displays valid choices for variable names. Signed-off-by: Kim Phillips <kim.phillips(a)freescale.com> Cc: Mike Frysinger <vapier(a)gentoo.org> --- lib/hashtable.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/hashtable.c b/lib/hashtable.c index fcdb53c..92eaa38 100644 --- a/lib/hashtable.c +++ b/lib/hashtable.c @@ -209,7 +209,7 @@ int hmatch_r(const char *match, int last_idx, ENTRY ** retval, size_t key_len = strlen(match); for (idx = last_idx + 1; idx < htab->size; ++idx) { - if (htab->table[idx].used > 0) + if (htab->table[idx].used <= 0) continue; if (!strncmp(match, htab->table[idx].entry.key, key_len)) { *retval = &htab->table[idx].entry; -- 1.7.4.2.dirty

4 5

[U-Boot] [PATCH 0/3] powerpc, mpc52xx: update for digsy_mtc support
by Heiko Schocher 28 Apr '11

28 Apr '11

- change PHY addr for rev5 boards - protect default sectors in NOR flash again Heiko Schocher (3): mpc52xx, digsy_mtc: change phy addr for rev5 boards. mtd, cfi: introduce void flash_protect_default(void) mpc52xx, digsy_mtc: protect default flash sectors board/digsy_mtc/digsy_mtc.c | 7 ++++ drivers/mtd/cfi_flash.c | 77 +++++++++++++++++++++++-------------------- include/configs/digsy_mtc.h | 4 ++ include/flash.h | 1 + 4 files changed, 53 insertions(+), 36 deletions(-) checkpatch: total: 0 errors, 0 warnings, 27 lines checked 20110404_rebased/0001-mpc52xx-digsy_mtc-change-phy-addr-for-rev5-boards.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 96 lines checked 20110404_rebased/0002-mtd-cfi-introduce-void-flash_protect_default-void.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 14 lines checked 20110404_rebased/0003-mpc52xx-digsy_mtc-protect-default-flash-sectors.patch has no obvious style problems and is ready for submission. -- 1.7.4

4 7

[U-Boot] [PATCH] NET: Correct potential missing goto label in case statement.
by Gray Remlin 28 Apr '11

28 Apr '11

If neither CONFIG_CMD_PING or CONFIG_CMD_SNTP are defined but CONFIG_CMD_DNS is, a compile-time error will occur due to the absence of a goto label. Signed-off-by: Gray Remlin <gryrmln(a)gmail.com> --- net/net.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/net/net.c b/net/net.c index a609632..e50bdf1 100644 --- a/net/net.c +++ b/net/net.c @@ -1724,7 +1724,8 @@ static int net_check_prereq (proto_t protocol) puts ("*** ERROR: `serverip' not set\n"); return (1); } -#if defined(CONFIG_CMD_PING) || defined(CONFIG_CMD_SNTP) +#if defined(CONFIG_CMD_PING) || defined(CONFIG_CMD_SNTP) || \ + defined(CONFIG_CMD_DNS) common: #endif -- 1.7.4

2 1

[U-Boot] [PATCH] fix redundant environment for serial flash
by thomas.langer＠lantiq.com 28 Apr '11

28 Apr '11

This patch fixes problems in the handling of redundant environment in env_sf.c The major problem are double calls of free() on the allocated buffers, which damages the internal data of malloc and crashes on next call. In addition, the selection of the active environment had errors and compiler warnings, which are corrected by this patch. Signed-off-by: Thomas Langer <thomas.langer(a)lantiq.com> --- This patch is done and tested against the version 2010.12 and applies also cleanly against the u-boot/master. --- a/common/env_sf.c +++ b/common/env_sf.c @@ -59,7 +59,6 @@ DECLARE_GLOBAL_DATA_PTR; extern uchar default_environment[]; char * env_name_spec = "SPI Flash"; -env_t *env_ptr; static struct spi_flash *env_flash; @@ -79,7 +78,7 @@ int saveenv(void) char *saved_buffer = NULL; u32 sector = 1; int ret; - char flag = OBSOLETE_FLAG, new_flag = ACTIVE_FLAG; + char flag = OBSOLETE_FLAG; if (!env_flash) { env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, @@ -159,7 +158,7 @@ int saveenv(void) gd->env_valid = (gd->env_valid == 2 ? 1 : 2); - printf("Valid environment: %d\n", gd->env_valid); + printf("Valid environment: %d\n", (int)gd->env_valid); done: if (saved_buffer) @@ -174,25 +173,20 @@ void env_relocate_spec(void) env_t *tmp_env1 = NULL; env_t *tmp_env2 = NULL; env_t *ep = NULL; - uchar flag1, flag2; - /* current_env is set only in case both areas are valid! */ - int current_env = 0; tmp_env1 = (env_t *)malloc(CONFIG_ENV_SIZE); tmp_env2 = (env_t *)malloc(CONFIG_ENV_SIZE); if (!tmp_env1 || !tmp_env2) { - free(tmp_env1); - free(tmp_env2); set_default_env("!malloc() failed"); - return; + goto out; } env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS, CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE); if (!env_flash) { set_default_env("!spi_flash_probe() failed"); - return; + goto out; } ret = spi_flash_read(env_flash, CONFIG_ENV_OFFSET, @@ -204,33 +198,30 @@ void env_relocate_spec(void) if (crc32(0, tmp_env1->data, ENV_SIZE) == tmp_env1->crc) crc1_ok = 1; - flag1 = tmp_env1->flags; ret = spi_flash_read(env_flash, CONFIG_ENV_OFFSET_REDUND, CONFIG_ENV_SIZE, tmp_env2); if (!ret) { if (crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc) crc2_ok = 1; - flag2 = tmp_env2->flags; } if (!crc1_ok && !crc2_ok) { - free(tmp_env1); - free(tmp_env2); set_default_env("!bad CRC"); - return; + goto err_read; } else if (crc1_ok && !crc2_ok) { gd->env_valid = 1; - ep = tmp_env1; } else if (!crc1_ok && crc2_ok) { + gd->env_valid = 2; + } else if (tmp_env1->flags == ACTIVE_FLAG && + tmp_env2->flags == OBSOLETE_FLAG) { gd->env_valid = 1; - } else if (flag1 == ACTIVE_FLAG && flag2 == OBSOLETE_FLAG) { - gd->env_valid = 1; - } else if (flag1 == OBSOLETE_FLAG && flag2 == ACTIVE_FLAG) { + } else if (tmp_env1->flags == OBSOLETE_FLAG && + tmp_env2->flags == ACTIVE_FLAG) { gd->env_valid = 2; - } else if (flag1 == flag2) { + } else if (tmp_env1->flags == tmp_env2->flags) { gd->env_valid = 2; - } else if (flag1 == 0xFF) { + } else if (tmp_env1->flags == 0xFF) { gd->env_valid = 2; } else { /* @@ -240,8 +231,6 @@ void env_relocate_spec(void) gd->env_valid = 2; } - free(env_ptr); - if (gd->env_valid == 1) ep = tmp_env1; else @@ -257,10 +246,6 @@ err_read: spi_flash_free(env_flash); env_flash = NULL; out: - if (tmp_env1) - free(tmp_env1); - if (tmp_env2) - free(tmp_env2); free(tmp_env1); free(tmp_env2);

2 1

[U-Boot] mpq101 board broken
by Wolfgang Denk 28 Apr '11

28 Apr '11

Dear Alex, the mpq101 board support is broken in recent versions of U-Boot: Configuring for mpq101 board... ppc_85xxDP-ld: u-boot: section .ppcenv lma 0xfffc0000 overlaps previous sections Can you please have a look? 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 I must follow the people. Am I not their leader? - Benjamin Disraeli

3 7