June 2011 - U-Boot

[U-Boot] [PATCH v3 0/7] Add support for pxecfg commands
by Jason Hobbs 29 Jul '11

29 Jul '11

The pxecfg commands provide a near subset of the functionality provided by the PXELINUX boot loader. This allows U-boot based systems to be controlled remotely using the same PXE based techniques that many non U-boot based servers use. To avoid identity confusion with PXELINUX, and because not all behavior is identical, we call this feature 'pxecfg'. As an example, support for the pxecfg commands is enabled for the ca9x4_ct_vxp config. Additional details are available in the README file added as part of this patch series. v2 of this patch series separates the menu code from the pxecfg code, giving a reusable menu implementation. It also contains various smaller changes documented in the comment section of the patches. v3 of this patch series adds a README for the menu, improves the menu interface, and includes other smaller changes documented in the comment section of the patches. The order of patches also changes, with all of the menu support being added first, followed by the pxecfg specific patches. Jason Hobbs (7): Add generic, reusable menu code cosmetic, main: clean up declarations of abortboot common, menu: use abortboot for menu timeout cosmetic, main: correct indentation/spacing issues common: add run_command2 for running simple or hush commands Add pxecfg command arm: ca9x4_ct_vxp: enable pxecfg support common/Makefile | 2 + common/cmd_pxecfg.c | 991 ++++++++++++++++++++++++++++++++++++++++ common/hush.c | 2 +- common/main.c | 62 ++-- common/menu.c | 279 +++++++++++ doc/README.menu | 161 +++++++ doc/README.pxecfg | 239 ++++++++++ include/common.h | 7 + include/configs/ca9x4_ct_vxp.h | 5 + include/hush.h | 2 +- include/menu.h | 30 ++ 11 files changed, 1744 insertions(+), 36 deletions(-) create mode 100644 common/cmd_pxecfg.c create mode 100644 common/menu.c create mode 100644 doc/README.menu create mode 100644 doc/README.pxecfg create mode 100644 include/menu.h

3 18

[U-Boot] [PATCH] ehci-hcd: Allow cleanups to happen on an EHCI timeout.
by Joel A Fernandes 29 Jul '11

29 Jul '11

With this, the EHCI seems to "recover" from a timeout. This is particularly observable if you were to ping the wrong IP Address and then ping the correct one or if there was a temporary failure during tftp sessions. All it takes is one timeout to disable it. If you have a noisy network (lot of traffic), even if the traffic is not for the board, the timeouts don't occur. Signed-off-by: Joel A Fernandes <agnel.joel(a)gmail.com> --- Robert, Could you see if this patch solves the issue you're seeing without increasing the timeout? Simon, Could this be a fix for a similar issue you were seeing with asix? drivers/usb/host/ehci-hcd.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 243bb39..9bfcbae 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -464,7 +464,6 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer, /* Check that the TD processing happened */ if (token & 0x80) { printf("EHCI timed out on TD - token=%#x\n", token); - goto fail; } /* Disable async schedule. */ -- 1.7.1

4 3

[U-Boot] [PATCH] post, memorytest: fix if vstart is not = 0x0
by Heiko Schocher 28 Jul '11

28 Jul '11

Signed-off-by: Heiko Schocher <hs(a)denx.de> --- post/drivers/memory.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/post/drivers/memory.c b/post/drivers/memory.c index 3f47449..b7943ef 100644 --- a/post/drivers/memory.c +++ b/post/drivers/memory.c @@ -500,9 +500,10 @@ int memory_post_test(int flags) unsigned long i; for (i = 0; i < (memsize >> 20) && ret == 0; i++) { if (ret == 0) - ret = memory_post_tests(i << 20, 0x800); + ret = memory_post_tests(vstart + + (i << 20), 0x800); if (ret == 0) - ret = memory_post_tests( + ret = memory_post_tests(vstart + (i << 20) + 0xff800, 0x800); } } -- 1.7.4.4

3 17

[U-Boot] [PATCH] powerpc/eeprom: cleanup mac command
by York Sun 28 Jul '11

28 Jul '11

Move mac command to board/freescale/common/sys_eeprom.c. Change the help message to be more helpful. Print argument format. Fix MAX_NUM_PORTS to comply with v1 NXID format. Signed-off-by: York Sun <yorksun(a)freescale.com> --- board/freescale/common/sys_eeprom.c | 29 ++++++++++++++++++++- common/Makefile | 1 - common/cmd_mac.c | 49 ----------------------------------- 3 files changed, 28 insertions(+), 51 deletions(-) delete mode 100644 common/cmd_mac.c diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c index d2ed036..b11899e 100644 --- a/board/freescale/common/sys_eeprom.c +++ b/board/freescale/common/sys_eeprom.c @@ -34,7 +34,7 @@ #endif #ifdef CONFIG_SYS_I2C_EEPROM_NXID -#define MAX_NUM_PORTS 23 +#define MAX_NUM_PORTS 31 #define NXID_VERSION 1 #endif @@ -552,3 +552,30 @@ unsigned int get_cpu_board_revision(void) return MPC85XX_CPU_BOARD_REV(be.major, be.minor); } #endif + +U_BOOT_CMD( + mac, 3, 1, do_mac, + "display and program the system ID and MAC addresses in EEPROM", + "without argument\n" + " - show content of system ID and MAC addresses\n" + "read\n" + " - read EEPROM without showing\n" + "mac save\n" + " - save to the EEPROM\n" + "mac id\n" + " - program system id (fixed)\n" + "mac num <string>\n" + " - program <string> as system serial number\n" + "mac errata <string>\n" + " - program <string> as errata data\n" + "mac date <YYMMDDhhmmss>\n" + " - program timestamp\n" + "mac ports <n>\n" + " - program the number of ports\n" + "mac <n> <XX:XX:XX:XX:XX:XX>\n" +#ifdef NXID_VERSION + " - program the MAC address for port n [n=0...22]" +#else + " - program the MAC address for port n [n=0...7]" +#endif +); diff --git a/common/Makefile b/common/Makefile index f81cff9..4a1514a 100644 --- a/common/Makefile +++ b/common/Makefile @@ -110,7 +110,6 @@ COBJS-$(CONFIG_CMD_LDRINFO) += cmd_ldrinfo.o COBJS-$(CONFIG_CMD_LICENSE) += cmd_license.o COBJS-y += cmd_load.o COBJS-$(CONFIG_LOGBUFFER) += cmd_log.o -COBJS-$(CONFIG_ID_EEPROM) += cmd_mac.o COBJS-$(CONFIG_CMD_MD5SUM) += cmd_md5sum.o COBJS-$(CONFIG_CMD_MEMORY) += cmd_mem.o COBJS-$(CONFIG_CMD_MFSL) += cmd_mfsl.o diff --git a/common/cmd_mac.c b/common/cmd_mac.c deleted file mode 100644 index 1884c2a..0000000 --- a/common/cmd_mac.c +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2006 Freescale Semiconductor - * York Sun (yorksun(a)freescale.com) - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#include <common.h> -#include <command.h> - -extern int do_mac(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); - -U_BOOT_CMD( - mac, 3, 1, do_mac, - "display and program the system ID and MAC addresses in EEPROM", - "[read|save|id|num|errata|date|ports|0|1|2|3|4|5|6|7]\n" - "read\n" - " - show content of EEPROM\n" - "mac save\n" - " - save to the EEPROM\n" - "mac id\n" - " - program system id\n" - "mac num\n" - " - program system serial number\n" - "mac errata\n" - " - program errata data\n" - "mac date\n" - " - program date\n" - "mac ports\n" - " - program the number of ports\n" - "mac X\n" - " - program the MAC address for port X [X=0...7]" -); -- 1.7.0.4

2 3

[U-Boot] [PATCH v2 0/2] ext2: Cleanup and simplify sector access code
by Anton Staaf 28 Jul '11

28 Jul '11

This patch set first cleans up all of the checkpatch warnings and errors in fs/ext2/dev.c and then cleans up the partial sector access logic in the ext2fs_devread function. I didn't see a file system or ext2 custodian so I've CC'ed Andy the custodian for MMC as that seems closest. Please let me know if I should bring this to someone elses attention. changes in v2 - Update commit message to include mention of printf and syle cleanup Signed-off-by: Anton Staaf <robotboy(a)chromium.org> Cc: Andy Fleming <afleming(a)freescale.com> Cc: Detlev Zundel <dzu(a)denx.de> Anton Staaf (2): ext2: Fix checkpatch violations ext2: Simplify partial sector access logic fs/ext2/dev.c | 112 ++++++++++++++++++++++++++------------------------------ 1 files changed, 52 insertions(+), 60 deletions(-) -- 1.7.3.1

3 6

[U-Boot] [PATCH 0/3] omap3evm: Generic ethernet fixes
by Sanjeev Premi 28 Jul '11

28 Jul '11

This patchset mainly fixes the ethernet reset sequence on the Rev G EVM board. Function setup_net_chip() is required to detect the board revision. However, steps to reset the ethernet chip now depend upon the board revision. Therefore, steps to reset the ethernet chip have been moved to a new function reset_net_chip() - called after board revision has been detected/ identified. Sanjeev Premi (2): omap3evm: eth: split function setup_net_chip omap3evm: eth: Include functions only when necessary Sriramakrishnan (1): omap3evm: Update ethernet reset sequence for Rev.G board board/ti/evm/evm.c | 37 +++++++++++++++++++++++++++++-------- board/ti/evm/evm.h | 1 + 2 files changed, 30 insertions(+), 8 deletions(-) -- 1.7.2.2

4 11

[U-Boot] Building and Debuging U-Boot in Eclipse Helios On Window XP.pdf
by 梁炎昌 28 Jul '11

28 Jul '11

I've Post an PDF Document to describe how to Build and Debug U-Boot in Eclipse Helios On Window XP. My Target CPU is at91sam9263. Debuger is J-link. here is the download link: http://www.at91.com/forum/viewtopic.php/t,20216/ Any Question?Email me:> liandao ------------------------------------------------------------------------------------- Building and Debuging U-Boot in Eclipse Helios On Window XP.pdf liandao, June 17, 2011 Building U-Boot in MSYS 3 1. MSYS & MINGW 3 a. Download MSYS & MinGW 3 b. Packet MSYS/MinGW and configuration 4 c. Run MSYS 6 2. Unpacket U-Boot source code 7 3. Install SOURCERY CODEBENCH LITE EDITION FOR ARM 7 4. Install NTFS Junction tool 9 5. Modify U-Boot Makefile and mkconfig 10 6. Build U-Boot 11 Building U-Boot in Eclipse 13 1. Install ECLIPSE-CPP-HELIOS-SR2-WIN32 13 2. Install Eclipse plug-in Zylincdt 13 3. Creat U-Boot Eclipse project 16 4. Config U-Boot Eclipse project 18 Step1 18 Step2 18 Step3 19 Step4 20 Step5 21 5. Build U-Boot in Eclipse 22 a. make distclean 22 b. make xxx_config 23 c. Build Project 24 Debuging U-Boot in Eclipse 25 1. Setup a Debug Configuration 25 a. Main tab: 25 b. Debugger tab: 27 c. Commands tab: 27 d. Source tab: 28 2. START DEBUG 29 a. Powerup board 30 b. Start J-link GDB Server 30 c. Start Eclispse Debug sesion 30 APPENDIX A 33 at91sam9263ek GDB "initialize" Command 33 APPENDIX B 37 U-BOOT-2011.03-MAKEFILE.DIFF 37 U-BOOT-2011.03-MKCONFIG.DIFF 38 APPENDIX C 39 links 39 -------------------

2 1

[U-Boot] [PATCH] panic: add noreturn attribute
by Mike Frysinger 28 Jul '11

28 Jul '11

Since panic() never returns, we should add an appropriate attribute to let gcc improve optimization around it. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- include/common.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/common.h b/include/common.h index 1e21b7a..b59079b 100644 --- a/include/common.h +++ b/include/common.h @@ -651,7 +651,7 @@ int strict_strtoul(const char *cp, unsigned int base, unsigned long *res); unsigned long long simple_strtoull(const char *cp,char **endp,unsigned int base); long simple_strtol(const char *cp,char **endp,unsigned int base); void panic(const char *fmt, ...) - __attribute__ ((format (__printf__, 1, 2))); + __attribute__ ((format (__printf__, 1, 2), noreturn)); int sprintf(char * buf, const char *fmt, ...) __attribute__ ((format (__printf__, 2, 3))); int vsprintf(char *buf, const char *fmt, va_list args); -- 1.7.6

3 5

[U-Boot] [PATCH] macb: fix compile warning
by Andreas Bießmann 28 Jul '11

28 Jul '11

This patch fixes following compile warning: ---8<--- macb.c: In function 'macb_write_hwaddr': macb.c:525:2: warning: dereferencing type-punned pointer will break strict-aliasing rules --->8--- Signed-off-by: Andreas Bießmann <andreas.devel(a)gmail.com> --- BEWARE! this patch is only copile tested! drivers/net/macb.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 72ea1fc..da41054 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -522,9 +522,10 @@ static int macb_write_hwaddr(struct eth_device *dev) u16 hwaddr_top; /* set hardware address */ - hwaddr_bottom = cpu_to_le32(*((u32 *)dev->enetaddr)); + hwaddr_bottom = netdev->enetaddr[0] | netdev->enetaddr[1] << 8 | + netdev->enetaddr[2] << 16 | netdev->enetaddr[3] << 24; macb_writel(macb, SA1B, hwaddr_bottom); - hwaddr_top = cpu_to_le16(*((u16 *)(dev->enetaddr + 4))); + hwaddr_top = netdev->enetaddr[4] | netdev->enetaddr[5] << 8; macb_writel(macb, SA1T, hwaddr_top); return 0; } -- 1.7.2.5

3 5

[U-Boot] [PATCH] [v2] video: Add SHARP LQ084S3LG01 LCD support on P1022DS
by Timur Tabi 27 Jul '11

27 Jul '11

The SHARP LQ084S3LG01 is a TFT LCD used on the P1022DS (revision "C") board. This device only supports 800x600 resolution, so if that resolution is selected, assume that this is the device. The device is attached to the LVDS port on the P1022DS board. The existing 800x600 entry (for the PDM360NG board) is actually 800x480, so we fix that. To support two different 800x resolutions, the Y-resolution is now passed to fsl_diu_init() and both values are used to pick the proper fb_videomode structure. The data for the 800x600 video mode is originally from Jiang Yutang. Signed-off-by: Timur Tabi <timur(a)freescale.com> Signed-off-by: Jiang Yutang <b14898(a)freescale.com> --- arch/powerpc/cpu/mpc512x/diu.c | 2 +- board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c | 2 +- board/freescale/p1022ds/diu.c | 2 +- drivers/video/fsl_diu_fb.c | 51 +++++++++++++++++------- include/fsl_diu_fb.h | 2 +- 5 files changed, 40 insertions(+), 19 deletions(-) diff --git a/arch/powerpc/cpu/mpc512x/diu.c b/arch/powerpc/cpu/mpc512x/diu.c index 9dc1e48..b7db249 100644 --- a/arch/powerpc/cpu/mpc512x/diu.c +++ b/arch/powerpc/cpu/mpc512x/diu.c @@ -56,5 +56,5 @@ int platform_diu_init(unsigned int xres, unsigned int yres, const char *port) unsigned int pixel_format = 0x88883316; debug("mpc5121_diu_init\n"); - return fsl_diu_init(xres, pixel_format, 0); + return fsl_diu_init(xres, yres, pixel_format, 0); } diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c index 3011bb8..358a432 100644 --- a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c +++ b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c @@ -83,5 +83,5 @@ int platform_diu_init(unsigned int xres, unsigned int yres, const char *port) printf("DIU: Switching to %s monitor @ %ux%u\n", name, xres, yres); out_8(&pixis->brdcfg0, temp); - return fsl_diu_init(xres, pixel_format, gamma_fix); + return fsl_diu_init(xres, yres, pixel_format, gamma_fix); } diff --git a/board/freescale/p1022ds/diu.c b/board/freescale/p1022ds/diu.c index 7d1f6aa..cef81ce 100644 --- a/board/freescale/p1022ds/diu.c +++ b/board/freescale/p1022ds/diu.c @@ -139,7 +139,7 @@ int platform_diu_init(unsigned int xres, unsigned int yres, const char *port) clrsetbits_be32(&gur->pmuxcr, PMUXCR_ELBCDIU_MASK, PMUXCR_ELBCDIU_DIU); pmuxcr = in_be32(&gur->pmuxcr); - return fsl_diu_init(xres, pixel_format, 0); + return fsl_diu_init(xres, yres, pixel_format, 0); } /* diff --git a/drivers/video/fsl_diu_fb.c b/drivers/video/fsl_diu_fb.c index 0709849..e1d6c26 100644 --- a/drivers/video/fsl_diu_fb.c +++ b/drivers/video/fsl_diu_fb.c @@ -78,13 +78,9 @@ struct fb_videomode { unsigned int flag; }; -#define FB_SYNC_VERT_HIGH_ACT 2 /* vertical sync high active */ -#define FB_SYNC_COMP_HIGH_ACT 8 /* composite sync high active */ -#define FB_VMODE_NONINTERLACED 0 /* non interlaced */ - /* This setting is used for the ifm pdm360ng with PRIMEVIEW PM070WL3 */ -static struct fb_videomode fsl_diu_mode_800 = { - .name = "800x600-60", +static struct fb_videomode fsl_diu_mode_800_480 = { + .name = "800x480-60", .refresh = 60, .xres = 800, .yres = 480, @@ -99,13 +95,30 @@ static struct fb_videomode fsl_diu_mode_800 = { .vmode = FB_VMODE_NONINTERLACED }; +/* For the SHARP LQ084S3LG01, used on the P1022DS board */ +static struct fb_videomode fsl_diu_mode_800_600 = { + .name = "800x600-60", + .refresh = 60, + .xres = 800, + .yres = 600, + .pixclock = 25000, + .left_margin = 88, + .right_margin = 40, + .upper_margin = 23, + .lower_margin = 1, + .hsync_len = 128, + .vsync_len = 4, + .sync = FB_SYNC_COMP_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, + .vmode = FB_VMODE_NONINTERLACED +}; + /* * These parameters give default parameters * for video output 1024x768, * FIXME - change timing to proper amounts * hsync 31.5kHz, vsync 60Hz */ -static struct fb_videomode fsl_diu_mode_1024 = { +static struct fb_videomode fsl_diu_mode_1024_768 = { .name = "1024x768-60", .refresh = 60, .xres = 1024, @@ -121,7 +134,7 @@ static struct fb_videomode fsl_diu_mode_1024 = { .vmode = FB_VMODE_NONINTERLACED }; -static struct fb_videomode fsl_diu_mode_1280 = { +static struct fb_videomode fsl_diu_mode_1280_1024 = { .name = "1280x1024-60", .refresh = 60, .xres = 1280, @@ -263,7 +276,7 @@ static struct diu_ad *allocate_fb(unsigned int xres, unsigned int yres, return ad; } -int fsl_diu_init(int xres, u32 pixel_format, int gamma_fix) +int fsl_diu_init(u16 xres, u16 yres, u32 pixel_format, int gamma_fix) { struct fb_videomode *fsl_diu_mode_db; struct diu_ad *ad; @@ -274,15 +287,23 @@ int fsl_diu_init(int xres, u32 pixel_format, int gamma_fix) struct diu_addr gamma; struct diu_addr cursor; - switch (xres) { - case 800: - fsl_diu_mode_db = &fsl_diu_mode_800; +/* Convert the X,Y resolution pair into a single number */ +#define RESOLUTION(x, y) (((u32)(x) << 16) | (y)) + + switch (RESOLUTION(xres, yres)) { + case RESOLUTION(800, 480): + fsl_diu_mode_db = &fsl_diu_mode_800_480; break; - case 1280: - fsl_diu_mode_db = &fsl_diu_mode_1280; + case RESOLUTION(800, 600): + fsl_diu_mode_db = &fsl_diu_mode_800_600; + case RESOLUTION(1024, 768): + fsl_diu_mode_db = &fsl_diu_mode_1024_768; + case RESOLUTION(1280, 1024): + fsl_diu_mode_db = &fsl_diu_mode_1280_1024; break; default: - fsl_diu_mode_db = &fsl_diu_mode_1024; + printf("DIU: Unsupported resolution %ux%u\n", xres, yres); + return -1; } /* The AD struct for the dummy framebuffer and the FB itself */ diff --git a/include/fsl_diu_fb.h b/include/fsl_diu_fb.h index 4c89f4b..a58e7e2 100644 --- a/include/fsl_diu_fb.h +++ b/include/fsl_diu_fb.h @@ -24,7 +24,7 @@ * MA 02111-1307 USA */ -int fsl_diu_init(int xres, u32 pixel_format, int gamma_fix); +int fsl_diu_init(u16 xres, u16 yres, u32 pixel_format, int gamma_fix); /* Prototypes for external board-specific functions */ int platform_diu_init(unsigned int xres, unsigned int yres, const char *port); -- 1.7.3.4

3 3