June 2010 - U-Boot

[U-Boot] [PATCH] smc911x_eeprom
by Sergey Alyoshin 29 Jun '10

29 Jun '10

smc911x_eeprom: smc911x_detect_chip() function return 0 on success diff --git a/examples/standalone/smc911x_eeprom.c b/examples/standalone/smc911x_eeprom.c index 104047f..cb3c131 100644 --- a/examples/standalone/smc911x_eeprom.c +++ b/examples/standalone/smc911x_eeprom.c @@ -240,7 +240,7 @@ static void dump_eeprom(struct eth_device *dev) static int smc911x_init(struct eth_device *dev) { /* See if there is anything there */ - if (!smc911x_detect_chip(dev)) + if (smc911x_detect_chip(dev)) return 1; smc911x_reset(dev);

3 3

[U-Boot] [PATCH 1/2] avr32: fix linking of atstk100x and favr32 boards
by Andreas Bießmann 29 Jun '10

29 Jun '10

When building some avr32 boards out of tree (e.g. O=..) the linker script could not be found. This patch references the linker script in source tree. Signed-off-by: Andreas Bießmann <biessmann(a)corscience.de> --- board/atmel/atstk1000/config.mk | 2 +- board/earthlcd/favr-32-ezkit/config.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/atmel/atstk1000/config.mk b/board/atmel/atstk1000/config.mk index ec3618d..40e55fe 100644 --- a/board/atmel/atstk1000/config.mk +++ b/board/atmel/atstk1000/config.mk @@ -1,4 +1,4 @@ PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections PLATFORM_LDFLAGS += --gc-sections TEXT_BASE = 0x00000000 -LDSCRIPT = $(obj)board/atmel/atstk1000/u-boot.lds +LDSCRIPT = $(src)board/atmel/atstk1000/u-boot.lds diff --git a/board/earthlcd/favr-32-ezkit/config.mk b/board/earthlcd/favr-32-ezkit/config.mk index 2337d62..5c919cd 100644 --- a/board/earthlcd/favr-32-ezkit/config.mk +++ b/board/earthlcd/favr-32-ezkit/config.mk @@ -1,4 +1,4 @@ PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections PLATFORM_LDFLAGS += --gc-sections TEXT_BASE = 0x00000000 -LDSCRIPT = $(obj)board/earthlcd/favr-32-ezkit/u-boot.lds +LDSCRIPT = $(src)board/earthlcd/favr-32-ezkit/u-boot.lds -- 1.7.1

2 3

[U-Boot] [PATCH] avr32: disable branch folding
by y＠azuregos.cs.local 29 Jun '10

29 Jun '10

From: Andreas Bießmann <biessmann(a)corscience.de> Due to a hardware bug mentioned in latest AP7000 datasheet errata (revision M from 09.09) branch folding is unreliable. This patch disables CPUCR.FE bitfield as stated in datasheet. Signed-off-by: Andreas Bießmann <biessmann(a)corscience.de> --- arch/avr32/cpu/start.S | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/avr32/cpu/start.S b/arch/avr32/cpu/start.S index d37a46e..3d73196 100644 --- a/arch/avr32/cpu/start.S +++ b/arch/avr32/cpu/start.S @@ -27,9 +27,10 @@ #define SYSREG_MMUCR_S_OFFSET 4 #define SR_INIT (SYSREG_BIT(GM) | SYSREG_BIT(EM) | SYSREG_BIT(M0)) -#define CPUCR_INIT (SYSREG_BIT(BI) | SYSREG_BIT(BE) \ - | SYSREG_BIT(FE) | SYSREG_BIT(RE) \ - | SYSREG_BIT(IBE) | SYSREG_BIT(IEE)) +// due to errata (unreliable branch folding) set FE bit to '0' +#define CPUCR_INIT ((SYSREG_BIT(BI) | SYSREG_BIT(BE) \ + | SYSREG_BIT(RE) | SYSREG_BIT(IBE) \ + | SYSREG_BIT(IEE)) & ~SYSREG_BIT(FE)) /* * To save some space, we use the same entry point for -- 1.7.1

3 2

[U-Boot] [PATCH] fixed #if chain and added AVR32 case in cmd_bdinfo.c
by Reinhard Meyer 29 Jun '10

29 Jun '10

From: Reinhard Meyer <info(a)emk-elektronik.de> Date: Sun, 6 Jun 2010 19:01:59 +0200 Subject: [PATCH] fixed #if chain and added AVR32 case in cmd_bdinfo.c AVR32 case was missing in cmd_bdinfo, resulting in compiler warning (bd->bi_baudrate declared unsigned int at AVR32, but printf used %d) At the same time slightly reordered #if #elif #endif to make ARM one of the cases and not an extra case surrounding all others Signed-off-by: Reinhard Meyer <info(a)emk-elektronik.de> --- common/cmd_bdinfo.c | 44 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 35 insertions(+), 9 deletions(-) diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c index a0f7998..710abdf 100644 --- a/common/cmd_bdinfo.c +++ b/common/cmd_bdinfo.c @@ -37,8 +37,9 @@ static void print_eth(int idx); #ifndef CONFIG_ARM /* PowerPC and other */ static void print_lnum(const char *, u64); +#endif -#ifdef CONFIG_PPC +#if defined(CONFIG_PPC) static void print_str(const char *, const char *); int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) @@ -119,7 +120,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 0; } -#elif defined(CONFIG_NIOS2) /* Nios-II */ +#elif defined(CONFIG_NIOS2) int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { @@ -145,7 +146,8 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 0; } -#elif defined(CONFIG_MICROBLAZE) /* ! PPC, which leaves Microblaze */ + +#elif defined(CONFIG_MICROBLAZE) int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { @@ -167,7 +169,8 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 0; } -#elif defined(CONFIG_SPARC) /* SPARC */ +#elif defined(CONFIG_SPARC) + int do_bdinfo(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) { bd_t *bd = gd->bd; @@ -199,7 +202,8 @@ int do_bdinfo(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) return 0; } -#elif defined(CONFIG_M68K) /* M68K */ +#elif defined(CONFIG_M68K) + static void print_str(const char *, const char *); int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) @@ -249,6 +253,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } #elif defined(CONFIG_BLACKFIN) + static void print_str(const char *, const char *); int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) @@ -277,7 +282,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 0; } -#else /* ! PPC, which leaves MIPS */ +#elif defined(CONFIG_MIPS) int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { @@ -296,9 +301,28 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 0; } -#endif /* MIPS */ -#else /* ARM */ +#elif defined(CONFIG_AVR32) + +int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + bd_t *bd = gd->bd; + + print_num ("boot_params", (ulong)bd->bi_boot_params); + print_num ("memstart", (ulong)bd->bi_memstart); + print_lnum ("memsize", (u64)bd->bi_memsize); + print_num ("flashstart", (ulong)bd->bi_flashstart); + print_num ("flashsize", (ulong)bd->bi_flashsize); + print_num ("flashoffset", (ulong)bd->bi_flashoffset); + + print_eth(0); + printf ("ip_addr = %pI4\n", &bd->bi_ip_addr); + printf ("baudrate = %lu bps\n", bd->bi_baudrate); + + return 0; +} + +#elif defined(CONFIG_ARM) int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { @@ -324,7 +348,9 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 0; } -#endif /* CONFIG_ARM XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */ +#else + #error "a case for this architecture does not exist!" +#endif static void print_num(const char *name, ulong value) { -- 1.5.6.5

3 2

[U-Boot] [PATCH] Fix (null) problem for AVR32 boards
by Reinhard Meyer (-VC) 29 Jun '10

29 Jun '10

Currently the U-Boot address ranges for AVR32 boards are printed like this: "U-Boot code: (null) -> 0001183c data: 000188e8 -> 0004e9b0" This patch fixes this to print: "U-Boot code: 00000000 -> 0001183c data: 000188f8 -> 0004e9c0" Signed-off-by: Reinhard Meyer <info(a)emk-elektronik.de> --- arch/avr32/lib/board.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/avr32/lib/board.c b/arch/avr32/lib/board.c index 6be5ab0..c6b1f7b 100644 --- a/arch/avr32/lib/board.c +++ b/arch/avr32/lib/board.c @@ -115,8 +115,9 @@ static int init_baudrate(void) static int display_banner (void) { printf ("\n\n%s\n\n", version_string); - printf ("U-Boot code: %p -> %p data: %p -> %p\n", - _text, _etext, _data, _end); + printf ("U-Boot code: %08lx -> %08lx data: %08lx -> %08lx\n", + (unsigned long)_text, (unsigned long)_etext, + (unsigned long)_data, (unsigned long)_end); return 0; } -- 1.5.6.5

2 1

[U-Boot] [PATCH] powerpc: fix wrong comment at GOT definitions
by Heiko Schocher 29 Jun '10

29 Jun '10

r12 is used for accessing the GOT not r14. Fix this in the comment. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- include/ppc_asm.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/ppc_asm.tmpl b/include/ppc_asm.tmpl index 84de146..2db4784 100644 --- a/include/ppc_asm.tmpl +++ b/include/ppc_asm.tmpl @@ -35,7 +35,7 @@ * * Stolen from prepboot/bootldr.h, (C) 1998 Gabriel Paubert, paubert(a)iram.es * - * Uses r14 to access the GOT + * Uses r12 to access the GOT */ #define START_GOT \ -- 1.6.2.5 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 1

[U-Boot] [PATCH 2/2] hwconfig: Add some unit tests
by Anton Vorontsov 29 Jun '10

29 Jun '10

I use this for testing, and I think this might be useful in the future. Signed-off-by: Anton Vorontsov <avorontsov(a)mvista.com> --- common/hwconfig.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/common/hwconfig.c b/common/hwconfig.c index 85a69da..1f9f4a0 100644 --- a/common/hwconfig.c +++ b/common/hwconfig.c @@ -11,12 +11,20 @@ * the License, or (at your option) any later version. */ +#ifndef HWCONFIG_TEST #include <config.h> #include <common.h> #include <exports.h> #include <hwconfig.h> #include <linux/types.h> #include <linux/string.h> +#else +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <assert.h> +#define min(a, b) (((a) < (b)) ? (a) : (b)) +#endif /* HWCONFIG_TEST */ static const char *hwconfig_parse(const char *opts, size_t maxlen, const char *opt, char *stopchs, char eqch, @@ -209,3 +217,50 @@ int hwconfig_subarg_cmp(const char *opt, const char *subopt, const char *subarg) return !strncmp(argstr, subarg, arglen); } + +#ifdef HWCONFIG_TEST +int main() +{ + const char *ret; + size_t len; + + setenv("hwconfig", "key1:subkey1=value1,subkey2=value2;key2:value3;;;;" + "key3;:,:=;key4", 1); + + ret = hwconfig_arg("key1", &len); + printf("%zd %.*s\n", len, (int)len, ret); + assert(len == 29); + assert(hwconfig_arg_cmp("key1", "subkey1=value1,subkey2=value2")); + assert(!strncmp(ret, "subkey1=value1,subkey2=value2", len)); + + ret = hwconfig_subarg("key1", "subkey1", &len); + printf("%zd %.*s\n", len, (int)len, ret); + assert(len == 6); + assert(hwconfig_subarg_cmp("key1", "subkey1", "value1")); + assert(!strncmp(ret, "value1", len)); + + ret = hwconfig_subarg("key1", "subkey2", &len); + printf("%zd %.*s\n", len, (int)len, ret); + assert(len == 6); + assert(hwconfig_subarg_cmp("key1", "subkey2", "value2")); + assert(!strncmp(ret, "value2", len)); + + ret = hwconfig_arg("key2", &len); + printf("%zd %.*s\n", len, (int)len, ret); + assert(len == 6); + assert(hwconfig_arg_cmp("key2", "value3")); + assert(!strncmp(ret, "value3", len)); + + assert(hwconfig("key3")); + assert(hwconfig_arg("key4", &len) == NULL); + assert(hwconfig_arg("bogus", &len) == NULL); + + unsetenv("hwconfig"); + + assert(hwconfig(NULL) == 0); + assert(hwconfig("") == 0); + assert(hwconfig("key3") == 0); + + return 0; +} +#endif /* HWCONFIG_TEST */ -- 1.7.0.5

2 1

[U-Boot] [PATCH 1/2] hwconfig: Fix stop characters parsing for subkeys
by Anton Vorontsov 29 Jun '10

29 Jun '10

For the following hwconfig string: key1:subkey1=value1,subkey2=value2;key2:value3 The subkey2 cannot be extracted correctly. The parsing code looks for comma as a stopch, but there may be two kind of stop characters: a comma and a semicolon. Currently the code would return "value2;key2:value3", while just "value2" is the correct answer. This patch fixes the issue by making the code aware of multiple stop characters. For old U-Boots, the issue can be workarounded by placing a comma before a semicolon, i.e.: hwconfig=key1:subkey1=value1,subkey2=value2,;key2:value3 Reported-by: York Sun <yorksun(a)freescale.com> Signed-off-by: Anton Vorontsov <avorontsov(a)mvista.com> --- common/hwconfig.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/common/hwconfig.c b/common/hwconfig.c index e5c60ba..85a69da 100644 --- a/common/hwconfig.c +++ b/common/hwconfig.c @@ -19,7 +19,7 @@ #include <linux/string.h> static const char *hwconfig_parse(const char *opts, size_t maxlen, - const char *opt, char stopch, char eqch, + const char *opt, char *stopchs, char eqch, size_t *arglen) { size_t optlen = strlen(opt); @@ -33,8 +33,9 @@ next: if (end - start > maxlen) return NULL; - if (str && (str == opts || str[-1] == stopch) && - (*end == stopch || *end == eqch || *end == '\0')) { + if (str && (str == opts || strpbrk(str - 1, stopchs) == str - 1) && + (strpbrk(end, stopchs) == end || *end == eqch || + *end == '\0')) { const char *arg_end; if (!arglen) @@ -43,7 +44,7 @@ next: if (*end != eqch) return NULL; - arg_end = strchr(str, stopch); + arg_end = strpbrk(str, stopchs); if (!arg_end) *arglen = min(maxlen, strlen(str)) - optlen - 1; else @@ -66,15 +67,15 @@ static const char *__hwconfig(const char *opt, size_t *arglen) if (env_hwconfig) return hwconfig_parse(env_hwconfig, strlen(env_hwconfig), - opt, ';', ':', arglen); + opt, ";", ':', arglen); if (board_hwconfig) return hwconfig_parse(board_hwconfig, strlen(board_hwconfig), - opt, ';', ':', arglen); + opt, ";", ':', arglen); if (cpu_hwconfig) return hwconfig_parse(cpu_hwconfig, strlen(cpu_hwconfig), - opt, ';', ':', arglen); + opt, ";", ':', arglen); return NULL; } @@ -164,7 +165,7 @@ int hwconfig_sub(const char *opt, const char *subopt) arg = __hwconfig(opt, &arglen); if (!arg) return 0; - return !!hwconfig_parse(arg, arglen, subopt, ',', '=', NULL); + return !!hwconfig_parse(arg, arglen, subopt, ",;", '=', NULL); } /* @@ -185,7 +186,7 @@ const char *hwconfig_subarg(const char *opt, const char *subopt, arg = __hwconfig(opt, &arglen); if (!arg) return NULL; - return hwconfig_parse(arg, arglen, subopt, ',', '=', subarglen); + return hwconfig_parse(arg, arglen, subopt, ",;", '=', subarglen); } /* -- 1.7.0.5

2 1

[U-Boot] Please Pull u-boot-ti/next
by s-paulraj＠ti.com 29 Jun '10

29 Jun '10

Wolfgang, Please pull u-boot-ti/next. I ran MAKEALL and so no issues. Thanks, Sandeep The following changes since commit 54e19a7ded6e9dbdc3392a57d82f4f77b34e85b8: Wolfgang Denk (1): Merge branch 'master' into next are available in the git repository at: git://git.denx.de/u-boot-ti.git next Nick Thompson (1): Davinci: SPI performance enhancements Prakash PM (1): DaVinci: EMAC: Get EMAC_MDIO_PHY_NUM from config files arch/arm/include/asm/arch-davinci/emac_defs.h | 2 +- drivers/spi/davinci_spi.c | 195 ++++++++++++++++--------- include/configs/da830evm.h | 1 + include/configs/davinci_dm365evm.h | 1 + include/configs/davinci_dvevm.h | 1 + include/configs/davinci_schmoogie.h | 1 + include/configs/davinci_sffsdr.h | 1 + include/configs/davinci_sonata.h | 1 + 8 files changed, 135 insertions(+), 68 deletions(-)

2 1

[U-Boot] (no subject)
by Wolfgang Denk 29 Jun '10

29 Jun '10

Hi, the EVB64260, P3G4, and ZUMA boards produce a lot of compiler warnings: mpsc.c: In function 'mpsc_putchar_early': mpsc.c:121: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c:127: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c: In function 'mpsc_getchar': mpsc.c:204: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c:207: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c: In function 'mpsc_init': mpsc.c:273: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c:274: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c: In function 'galbrg_set_baudrate': mpsc.c:402: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c: In function 'galbrg_set_CDV': mpsc.c:416: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c:419: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c: In function 'galbrg_enable': mpsc.c:429: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c:431: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c: In function 'galbrg_disable': mpsc.c:441: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c:443: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c: In function 'galbrg_set_clksrc': mpsc.c:453: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c:456: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c: In function 'galmpsc_connect': mpsc.c:585: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c:599: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c: In function 'galmpsc_route_rx_clock': mpsc.c:630: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c:637: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c: In function 'galmpsc_route_tx_clock': mpsc.c:647: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c:654: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c: In function 'galmpsc_config_channel_regs': mpsc.c:685: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c:686: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c: In function 'galmpsc_set_brkcnt': mpsc.c:707: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c:710: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c: In function 'galmpsc_set_tcschar': mpsc.c:720: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c:723: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c: In function 'galmpsc_set_char_length': mpsc.c:733: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c:736: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c: In function 'galmpsc_set_stop_bit_length': mpsc.c:746: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c:748: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c: In function 'galmpsc_set_parity': mpsc.c:758: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c:767: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c: In function 'galmpsc_enter_hunt': mpsc.c:777: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c:779: warning: dereferencing type-punned pointer will break strict-aliasing rules mpsc.c: In function 'galmpsc_shutdown': mpsc.c:809: warning: dereferencing type-punned pointer will break strict-aliasing rules Are you still maintaining these boards? If yes, can you please submit a patch to clean this up? If no, can you please give your OK so we remove these board configurations from the code base? Thanks. 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 "In the face of entropy and nothingness, you kind of have to pretend it's not there if you want to keep writing good code." - Karl Lehenbauer

2 2