August 2011 - U-Boot

[U-Boot] Uboot for Mips
by Rahanesh 13 Sep '11

13 Sep '11

Hi All, I am currently working on MIPS board. I have a 32MB RAM. The address that is shown in uboot when i type bdinfo if 0x80000000 and size is 0x1000000(16MB). I want to increase the size to 32 MB as board has 32 MB RAM. Interesting Finding: When i write any data to 0x80000000 the same data is being written into 0x81000000. Same for all address in the range (data in 0x80000000 - 0x80ffffff is same as 0x81000000 - 0x81ffffff ). It seems that there is a dual mapping . What might be the reason? Please help -- View this message in context: http://www.nabble.com/Uboot-for-Mips-tp24366921p24366921.html Sent from the Uboot - Users mailing list archive at Nabble.com.

2 1

[U-Boot] [PATCH v3] Add assert() for debug assertions
by Simon Glass 12 Sep '11

12 Sep '11

assert() is like BUG_ON() but compiles to nothing unless DEBUG is defined. This is useful when a condition is an error but a board reset is unlikely to fix it, so it is better to soldier on in hope. Assertion failures should be caught during development/test. It turns out that assert() is defined separately in a few places in U-Boot with various meanings. This patch cleans up some of these. Build errors exposed by this change (and defining DEBUG) are also fixed in this patch. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v2: - Changed macros so that all code is compiled even if DEBUG is disabled Changes in v3: - Use panic() instead of printf() - Use separate __assert_fail() function to reduce memory footprint - Changed output format to match assert(3) common/dlmalloc.c | 7 ------- include/common.h | 21 +++++++++++++++++++++ include/malloc.h | 8 -------- lib/qsort.c | 5 ----- lib/vsprintf.c | 8 ++++++++ 5 files changed, 29 insertions(+), 20 deletions(-) diff --git a/common/dlmalloc.c b/common/dlmalloc.c index e9bab09..f2080c6 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -286,13 +286,6 @@ extern "C" { */ -#ifdef DEBUG -#include <assert.h> -#else -#define assert(x) ((void)0) -#endif - - /* INTERNAL_SIZE_T is the word-size used for internal bookkeeping of chunk sizes. On a 64-bit machine, you can reduce malloc diff --git a/include/common.h b/include/common.h index 1e21b7a..0956b93 100644 --- a/include/common.h +++ b/include/common.h @@ -124,6 +124,27 @@ typedef volatile unsigned char vu_char; #define debugX(level,fmt,args...) #endif /* DEBUG */ +#ifdef DEBUG +# define _DEBUG 1 +#else +# define _DEBUG 0 +#endif + +/* + * An assertion is run-time check done in debug mode only. If DEBUG is not + * defined then it is skipped. If DEBUG is defined and the assertion fails, + * then it calls panic*( which may or may not reset/halt U-Boot (see + * CONFIG_PANIC_HANG), It is hoped that all failing assertions are found + * before release, and after release it is hoped that they don't matter. But + * in any case these failing assertions cannot be fixed with a reset (which + * may just do the same assertion again). + */ +void __assert_fail(const char *assertion, const char *file, unsigned line, + const char *function); +#define assert(x) \ + ({ if (!(x) && _DEBUG) \ + __assert_fail(#x, __FILE__, __LINE__, __func__); }) + #define error(fmt, args...) do { \ printf("ERROR: " fmt "\nat %s:%d/%s()\n", \ ##args, __FILE__, __LINE__, __func__); \ diff --git a/include/malloc.h b/include/malloc.h index 3e145ad..ecf3c67 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -285,14 +285,6 @@ extern "C" { */ -#ifdef DEBUG -/* #include <assert.h> */ -#define assert(x) ((void)0) -#else -#define assert(x) ((void)0) -#endif - - /* INTERNAL_SIZE_T is the word-size used for internal bookkeeping of chunk sizes. On a 64-bit machine, you can reduce malloc diff --git a/lib/qsort.c b/lib/qsort.c index 1cc0d31..86c392c 100644 --- a/lib/qsort.c +++ b/lib/qsort.c @@ -17,11 +17,6 @@ #include <linux/types.h> #include <exports.h> -#if 0 -#include <assert.h> -#else -#define assert(arg) -#endif void qsort(void *base, size_t nel, diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 3b924ec..1f01b70 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -728,3 +728,11 @@ void panic(const char *fmt, ...) do_reset (NULL, 0, 0, NULL); #endif } + +void __assert_fail(const char *assertion, const char *file, unsigned line, + const char *function) +{ + /* This will not return */ + panic("%s:%u: %s: Assertion `%s' failed.", file, line, function, + assertion); +} -- 1.7.3.1

3 15

[U-Boot] [PATCH 1/3] BeagleBoard: turn off clocks in ehci_stop
by Joel A Fernandes 11 Sep '11

11 Sep '11

From: Koen Kooi <koen(a)dominion.thruhere.net> This fixes display problems in linux Signed-off-by: Koen Kooi <koen(a)dominion.thruhere.net> Signed-off-by: Joel A Fernandes <agnel.joel(a)gmail.com> --- board/ti/beagle/beagle.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index 7768901..a958545 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -356,6 +356,12 @@ int ehci_hcd_stop(void) pr_debug("Resetting OMAP3 EHCI\n"); omap_set_gpio_dataout(GPIO_PHY_RESET, 0); writel(OMAP_UHH_SYSCONFIG_SOFTRESET, OMAP3_UHH_BASE + OMAP_UHH_SYSCONFIG); + /* disable USB clocks */ + struct prcm *prcm_base = (struct prcm *)PRCM_BASE; + sr32(&prcm_base->iclken_usbhost, 0, 1, 0); + sr32(&prcm_base->fclken_usbhost, 0, 2, 0); + sr32(&prcm_base->iclken3_core, 2, 1, 0); + sr32(&prcm_base->fclken3_core, 2, 1, 0); return 0; } -- 1.7.1

5 13

[U-Boot] [U-Boot PATCH MX31:] smc911x MII made available
by Helmut.Raiger＠hale.at 09 Sep '11

09 Sep '11

From: Helmut Raiger <helmut.raiger(a)hale.at> The driver already had the MII functions, but they have not been registered using miiphy_register(). Signed-off-by: Helmut Raiger <helmut.raiger(a)hale.at> --- drivers/net/smc911x.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index aeafeba..9378a63 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -235,6 +235,25 @@ static int smc911x_rx(struct eth_device *dev) return 0; } +#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) +/* wrapper for smc911x_miiphy_read */ +static int _phy_read(char *devname, u8 phy, u8 reg, u16 *val) +{ + struct eth_device *dev = eth_get_dev_by_name(devname); + if (dev) + return smc911x_miiphy_read(dev, phy, reg, val); + return -1; +} +/* wrapper for smc911x_miiphy_write */ +static int _phy_write(char *devname, u8 phy, u8 reg, u16 val) +{ + struct eth_device *dev = eth_get_dev_by_name(devname); + if (dev) + return smc911x_miiphy_write(dev, phy, reg, val); + return -1; +} +#endif + int smc911x_initialize(u8 dev_num, int base_addr) { unsigned long addrl, addrh; @@ -273,5 +292,10 @@ int smc911x_initialize(u8 dev_num, int base_addr) sprintf(dev->name, "%s-%hu", DRIVERNAME, dev_num); eth_register(dev); + +#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) + miiphy_register(dev->name, _phy_read, _phy_write); +#endif + return 1; } -- 1.7.4.4 -- Scanned by MailScanner.

10 46

[U-Boot] [PATCH] powerpc/85xx: Enable CMD_REGINFO on corenet boards
by Kumar Gala 09 Sep '11

09 Sep '11

Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- include/configs/corenet_ds.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 96810b9..3aa5333 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -577,6 +577,7 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_SETEXPR +#define CONFIG_CMD_REGINFO #ifdef CONFIG_PCI #define CONFIG_CMD_PCI -- 1.7.3.4

2 4

[U-Boot] [PATCH] powerpc/85xx: Fix USB protocol definitions for P1020RDB
by Kumar Gala 09 Sep '11

09 Sep '11

From: Ramneek Mehresh <ramneek.mehresh(a)freescale.com> USB protocol macros (CONFIG_USB_EHCI ...) to be included only when CONFIG_HAS_FSL_DR_USB is defined for a board. Presence of USB DR controller should be declared along with the underlying protocol used in the controller Signed-off-by: Ramneek Mehresh <ramneek.mehresh(a)freescale.com> Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- include/configs/P1_P2_RDB.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h index 3ffdb1a..043515d 100644 --- a/include/configs/P1_P2_RDB.h +++ b/include/configs/P1_P2_RDB.h @@ -581,6 +581,9 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #endif #endif +#define CONFIG_HAS_FSL_DR_USB + +#if defined(CONFIG_HAS_FSL_DR_USB) #define CONFIG_USB_EHCI #ifdef CONFIG_USB_EHCI @@ -588,7 +591,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL #define CONFIG_USB_STORAGE -#define CONFIG_HAS_FSL_DR_USB +#endif #endif #if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI) -- 1.7.3.4

1 1

[U-Boot] [PATCH] bdinfo: Fix bdinfo to show all MACs for Microblaze and ARM
by Michal Simek 08 Sep '11

08 Sep '11

- Show all ethernet MACs in the system. - Show current ethernet device Signed-off-by: Michal Simek <monstr(a)monstr.eu> --- common/cmd_bdinfo.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c index 6051120..01441de 100644 --- a/common/cmd_bdinfo.c +++ b/common/cmd_bdinfo.c @@ -153,6 +153,11 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { +#if defined(CONFIG_CMD_NET) + struct eth_device *dev; + int i; +#endif + bd_t *bd = gd->bd; print_num("mem start ", (ulong)bd->bi_memstart); print_lnum("mem size ", (u64)bd->bi_memsize); @@ -164,7 +169,17 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_num("sram size ", (ulong)bd->bi_sramsize); #endif #if defined(CONFIG_CMD_NET) - print_eth(0); + i = 0; + while (1) { + dev = eth_get_dev_by_index(i); + if (dev) { + printf("eth%dname = %s\n", i, dev->name); + print_eth(i); + } else + break; + i++; + } + printf("current eth = %s\n", eth_get_name()); printf("ip_addr = %pI4\n", &bd->bi_ip_addr); #endif printf("baudrate = %ld bps\n", (ulong)bd->bi_baudrate); @@ -330,6 +345,9 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { int i; bd_t *bd = gd->bd; +#if defined(CONFIG_CMD_NET) + struct eth_device *dev; +#endif print_num("arch_number", bd->bi_arch_number); print_num("boot_params", (ulong)bd->bi_boot_params); @@ -341,7 +359,17 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } #if defined(CONFIG_CMD_NET) - print_eth(0); + i = 0; + while (1) { + dev = eth_get_dev_by_index(i) + if (dev) { + printf("eth%dname = %s\n", i, dev->name); + print_eth(i); + } else + break; + i++; + } + printf("current eth = %s\n", eth_get_name()); printf("ip_addr = %pI4\n", &bd->bi_ip_addr); #endif printf("baudrate = %d bps\n", bd->bi_baudrate); -- 1.5.5.6

3 2

[U-Boot] Microblaze changes
by Michal Simek 07 Sep '11

07 Sep '11

Hi, I am sending some Microblaze changes. Thanks for your comments, Michal

3 19

[U-Boot] [PATCH] Fix fw_env bug for multi-sector environments on NOR flash
by Fei, Yiyang 07 Sep '11

07 Sep '11

When storing u-boot environment variables on a NOR flash using multiple sectors, the following error occurs when writing changes using fw_setenv. /etc # cat fw_env.config /dev/mtd12 0x0000 0x20000 0x10000 2 /etc # fw_setenv test test End of range reached, aborting Error: can't write fw_env to flash The reason for the error is that although both sectors are written in one pass, the loop for the write is executed twice because the "processed" variable is incremented by the incorrect amount. Signed-off-by: Yiyang Fei <yiyang.fei(a)barco.com> --- tools/env/fw_env.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index ed6b53f..e6b2cae 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -880,9 +880,8 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, ioctl (fd, MEMLOCK, &erase); - processed += blocklen; - block_seek = 0; - blockstart += blocklen; + processed += erasesize; + blockstart += erasesize; } if (write_total > count) -- 1.7.2.5 Sorry for the disclaimer...it is out of my control. Yiyang Fei

3 3

[U-Boot] [PATCH 1/8] net: emaclite: Change driver name and add address
by Michal Simek 07 Sep '11

07 Sep '11

Current xilinx emaclite use net multi registration but doesn't support several emaclites interfaces. Changing driver name with adding address to name is the first step how to distiguish several drivers. Signed-off-by: Michal Simek <monstr(a)monstr.eu> --- drivers/net/xilinx_emaclite.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c index 3c7c250..8d170a3 100644 --- a/drivers/net/xilinx_emaclite.c +++ b/drivers/net/xilinx_emaclite.c @@ -350,7 +350,7 @@ int xilinx_emaclite_initialize (bd_t *bis, int base_addr) return -1; memset(dev, 0, sizeof(*dev)); - sprintf(dev->name, "Xilinx_Emaclite"); + sprintf(dev->name, "Xelite.%x", base_addr); dev->iobase = base_addr; dev->priv = 0; -- 1.5.5.6

3 13