January 2012 - U-Boot

[U-Boot] [PATCH] i.MX28: Make the stabilization delays shorter
by Marek Vasut 20 Mar '12

20 Mar '12

Cut down the VDDIO/VDDA regulator stabilization delays to 500 uS. That should be enough according to the datasheet and bootlets. Signed-off-by: Marek Vasut <marek.vasut(a)gmail.com> Cc: Wolfgang Denk <wd(a)denx.de> Cc: Detlev Zundel <dzu(a)denx.de> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Robert Deliën <robert(a)delien.nl> Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Matthias Fuchs <matthias.fuchs(a)esd.eu> --- arch/arm/cpu/arm926ejs/mx28/spl_power_init.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/cpu/arm926ejs/mx28/spl_power_init.c b/arch/arm/cpu/arm926ejs/mx28/spl_power_init.c index c6c25d9..4b09b0c 100644 --- a/arch/arm/cpu/arm926ejs/mx28/spl_power_init.c +++ b/arch/arm/cpu/arm926ejs/mx28/spl_power_init.c @@ -805,7 +805,7 @@ void mx28_power_set_vddio(uint32_t new_target, uint32_t new_brownout) if (powered_by_linreg || (readl(&power_regs->hw_power_sts) & POWER_STS_VDD5V_GT_VDDIO)) - early_delay(1500); + early_delay(500); else { while (!(readl(&power_regs->hw_power_sts) & POWER_STS_DC_OK)) @@ -842,7 +842,7 @@ void mx28_power_set_vddio(uint32_t new_target, uint32_t new_brownout) if (powered_by_linreg || (readl(&power_regs->hw_power_sts) & POWER_STS_VDD5V_GT_VDDIO)) - early_delay(1500); + early_delay(500); else { while (!(readl(&power_regs->hw_power_sts) & POWER_STS_DC_OK)) @@ -902,7 +902,7 @@ void mx28_power_set_vddd(uint32_t new_target, uint32_t new_brownout) if (powered_by_linreg || (readl(&power_regs->hw_power_sts) & POWER_STS_VDD5V_GT_VDDIO)) - early_delay(1500); + early_delay(500); else { while (!(readl(&power_regs->hw_power_sts) & POWER_STS_DC_OK)) @@ -939,7 +939,7 @@ void mx28_power_set_vddd(uint32_t new_target, uint32_t new_brownout) if (powered_by_linreg || (readl(&power_regs->hw_power_sts) & POWER_STS_VDD5V_GT_VDDIO)) - early_delay(1500); + early_delay(500); else { while (!(readl(&power_regs->hw_power_sts) & POWER_STS_DC_OK)) -- 1.7.8.3

2 1

[U-Boot] [PATCH v3 0/15] bootstage: record and publish boot progress timing
by Simon Glass 20 Mar '12

20 Mar '12

This series creates a simple boot progress timing feature in U-Boot. Previous discussion on this is here: http://lists.denx.de/pipermail/u-boot/2011-May/thread.html#92584 A request was made to unify this with show_boot_progress(). As discussed in the v1 RFC patch, this series addresses this the following way: 1. Create bootstage.h with the intent of replacing integers with enums. This will allow the values to be easily changed or rationalised later as required. It also makes it more explicit that (for example) 15 means we are about to run an OS. 2. Change show_boot_progress() to use these enums. This first patch just shows doing this with one (commonly used) integer value. 3. Create bootstage.c file which permits recording of bootstage timestamps. 4. Change the existing show_boot_progress() handlers within board files to use a provided bootstage progress handler instead. This is easy enough as there are few users. 5. Change show_boot_progress() to call into bootstage, which in turns calls the board-provided progress handler, if defined, after recording a timestamp. The function signature will stay the same for now. Ultimately I would like boot timing available from before U-Boot to user space in Linux. See RFC patch for Linux here: http://lwn.net/Articles/460432/ and discussion here: http://comments.gmane.org/gmane.linux.kernel/1194861 Still to do: change the microsecond time printout to use the Linux seconds.microseconds format. Changes in v2: - Unify show_boot_progress() into this series Changes in v3: - Adjust show_boot_progress() comment - Fix 'progres' typo - Fix code style in bootstage_mark_name() - Make main bootstage commit title more explicit - Move file comment above copyright message - Rename timer patch to remove bootstage: tag - Set BOOTSTAGE_ID_START to 0 explicitly - Update commit message to clarify the purpose of CONFIG_BOOTSTAGE_REPORT Simon Glass (15): bootstage: Create an initial header for boot progress integers bootstage: Make use of BOOTSTAGE_ID_RUN_OS in show_boot_progress() bootstage: Use show_boot_error() for -ve progress numbers bootstage: Convert progress numbers 1-9 into enums bootstage: Convert progress numbers 10-19 to enums bootstage: Convert progress numbers 20-41 to enums bootstage: Convert IDE progress numbers to enums bootstage: Convert NAND progress numbers to enums bootstage: Convert net progress numbers to enums bootstage: Convert FIT progress numbers to enums timer: add microsecond boot func bootstage: Replace show_boot_progress/error() with bootstage_...() bootstage: Implement core microsecond boot time measurement bootstage: Plumb in bootstage calls for basic operations bootstage: arm: Add bootstage calls in board and bootm README | 25 +++ arch/arm/lib/board.c | 3 + arch/arm/lib/bootm.c | 6 +- arch/avr32/lib/bootm.c | 2 +- arch/m68k/lib/bootm.c | 2 +- arch/microblaze/lib/bootm.c | 2 +- arch/mips/lib/bootm.c | 2 +- arch/mips/lib/bootm_qemu_mips.c | 2 +- arch/nds32/lib/bootm.c | 2 +- arch/powerpc/lib/board.c | 2 +- arch/powerpc/lib/bootm.c | 2 +- arch/sparc/lib/board.c | 2 +- arch/x86/lib/board.c | 19 +-- board/Seagate/dockstar/dockstar.c | 4 +- board/a4m072/a4m072.c | 2 +- board/bf533-stamp/bf533-stamp.c | 30 ++-- board/hermes/hermes.c | 8 +- board/ivm/ivm.c | 2 +- board/matrix_vision/common/mv_common.c | 2 +- board/matrix_vision/mvbc_p/mvbc_p.c | 8 +- board/pcs440ep/pcs440ep.c | 50 +++--- board/scb9328/scb9328.c | 6 - board/sixnet/sixnet.c | 2 +- board/ti/beagle/beagle.c | 2 +- common/Makefile | 1 + common/bootstage.c | 160 ++++++++++++++++++++ common/cmd_bootm.c | 95 ++++++------ common/cmd_ide.c | 46 +++--- common/cmd_nand.c | 34 ++-- common/cmd_net.c | 23 ++- common/cmd_usb.c | 1 + common/env_common.c | 2 +- common/image.c | 56 ++++---- include/bootstage.h | 259 ++++++++++++++++++++++++++++++++ include/common.h | 13 +- lib/time.c | 17 ++ net/bootp.c | 4 + net/eth.c | 6 +- net/net.c | 1 + post/post.c | 4 +- 40 files changed, 697 insertions(+), 212 deletions(-) create mode 100644 common/bootstage.c create mode 100644 include/bootstage.h -- 1.7.7.3

2 29

[U-Boot] [PATCH 0/7] SPL Linux boot
by Simon Schwarz 19 Mar '12

19 Mar '12

This addds direct Linux boot to SPL. It implements a savebp command to save ATAGS or FDT to NAND flash. The kernel image has to be in place for this! checkpatch whines about not using strict_strtoull - since this is not available I can't change this. based on: - The new SPL layout - OMAP3 new SPL layout (http://article.gmane.org/gmane.comp.boot-loaders.u-boot/105260) Related to: - http://article.gmane.org/gmane.comp.boot-loaders.u-boot/102669 Simon Schwarz (7): arm: Add Prep subcommand support to bootm Add savebp command arm: Add savebp implementation for arm omap-common/spl: Add linux boot to SPL devkit8000/spl: init GPMC for dm9000 in SPL omap-common: Add NAND SPL linux booting omap-common: fixes BSS overwriting problem arch/arm/cpu/armv7/omap-common/spl.c | 49 +++++++++++- arch/arm/cpu/armv7/omap-common/spl_nand.c | 63 +++++++++++---- arch/arm/include/asm/omap_common.h | 2 + arch/arm/include/asm/savebp.h | 27 ++++++ arch/arm/lib/Makefile | 1 + arch/arm/lib/bootm.c | 116 +++++++++++++++------------ arch/arm/lib/savebp.c | 92 +++++++++++++++++++++ board/timll/devkit8000/devkit8000.c | 33 ++++++-- common/Makefile | 1 + common/cmd_bootm.c | 2 +- common/cmd_savebp.c | 123 +++++++++++++++++++++++++++++ include/command.h | 5 + include/configs/devkit8000.h | 14 +++- 13 files changed, 446 insertions(+), 82 deletions(-) create mode 100644 arch/arm/include/asm/savebp.h create mode 100644 arch/arm/lib/savebp.c create mode 100644 common/cmd_savebp.c -- 1.7.4.1

14 239

[U-Boot] [PATCH v2 0/2] Add i2c TPM driver
by Che-Liang Chiou 19 Mar '12

19 Mar '12

This patchset adds an i2c bus based TPM driver. Changes in v1: - Update s-o-b Peter Huewe's email address - Squash patch #3 into patch #2 Changes in v2: - Style improvements Che-Liang Chiou (2): tpm: Rename generic_lpc_tpm to tpm_tis_lpc tpm: Add i2c TPM driver Makefile | 2 +- README | 18 +- drivers/tpm/Makefile | 5 +- drivers/tpm/tpm.c | 466 +++++++++++++++++ drivers/tpm/tpm_private.h | 134 +++++ drivers/tpm/tpm_tis_i2c.c | 587 ++++++++++++++++++++++ drivers/tpm/{generic_lpc_tpm.c => tpm_tis_lpc.c} | 0 7 files changed, 1209 insertions(+), 3 deletions(-) create mode 100644 drivers/tpm/tpm.c create mode 100644 drivers/tpm/tpm_private.h create mode 100644 drivers/tpm/tpm_tis_i2c.c rename drivers/tpm/{generic_lpc_tpm.c => tpm_tis_lpc.c} (100%) -- 1.7.3.1

3 6

[U-Boot] [PATCH] [driver][cfb] Make the software cursor non-destructive
by Gabe Black 18 Mar '12

18 Mar '12

When printing the string "\r\n" to the framebuffer console, the first character of the current line was being replaced with a space. The "boot" prompt would become the "oot" prompt. This change makes the cursor non-destructive so that no matter where it goes on its way to where it's supposed to be, the end result is that the cursor is where it's supposed to be with the other text preserved intact. Signed-off-by: Gabe Black <gabeblack(a)chromium.org> --- drivers/video/cfb_console.c | 92 ++++++++++++++++++++++--------------------- 1 files changed, 47 insertions(+), 45 deletions(-) diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index 561883a..06de04e 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -221,8 +221,7 @@ /* * Cursor definition: * CONFIG_CONSOLE_CURSOR: Uses a timer function (see drivers/input/i8042.c) - * to let the cursor blink. Uses the macros - * CURSOR_OFF and CURSOR_ON. + * to let the cursor blink. * CONFIG_VIDEO_SW_CURSOR: Draws a cursor after the last character. No * blinking is provided. Uses the macros CURSOR_SET * and CURSOR_OFF. @@ -248,9 +247,9 @@ #endif void console_cursor(int state); -#define CURSOR_ON console_cursor(1) +#define CURSOR_ON console_cursor(1) #define CURSOR_OFF console_cursor(0) -#define CURSOR_SET +#define CURSOR_SET video_set_cursor() #ifndef CONFIG_I8042_KBD #warning Cursor drawing on/off needs timer function s.a. drivers/input/i8042.c #endif @@ -265,9 +264,9 @@ void console_cursor(int state); #error only one of CONFIG_CONSOLE_CURSOR, CONFIG_VIDEO_SW_CURSOR, \ or CONFIG_VIDEO_HW_CURSOR can be defined #endif -#define CURSOR_ON -#define CURSOR_OFF video_putchar(console_col * VIDEO_FONT_WIDTH,\ - console_row * VIDEO_FONT_HEIGHT, ' ') +void console_cursor (int state); +#define CURSOR_ON console_cursor(1) +#define CURSOR_OFF console_cursor(0) #define CURSOR_SET video_set_cursor() #endif /* CONFIG_VIDEO_SW_CURSOR */ @@ -374,6 +373,10 @@ static void *video_console_address; /* console buffer start address */ static int video_logo_height = VIDEO_LOGO_HEIGHT; +static int cursor_state = 0; +static int old_col = 0; +static int old_row = 0; + static int console_col; /* cursor col */ static int console_row; /* cursor row */ @@ -433,6 +436,22 @@ static const int video_font_draw_table32[16][4] = { }; +static void video_invertchar (int xx, int yy) +{ + int firstx = xx * VIDEO_PIXEL_SIZE; + int lastx = (xx + VIDEO_FONT_WIDTH) * VIDEO_PIXEL_SIZE; + int firsty = yy * VIDEO_LINE_LEN; + int lasty = (yy + VIDEO_FONT_HEIGHT) * VIDEO_LINE_LEN; + int x, y; + for (y = firsty; y < lasty; y += VIDEO_LINE_LEN) { + for (x = firstx; x < lastx; x++) { + u8 *dest = (u8 *)(video_fb_address) + x + y; + *dest = ~*dest; + } + } +} + + static void video_drawchars(int xx, int yy, unsigned char *s, int count) { u8 *cdat, *dest, *dest0; @@ -608,27 +627,15 @@ static void video_putchar(int xx, int yy, unsigned char c) #if defined(CONFIG_CONSOLE_CURSOR) || defined(CONFIG_VIDEO_SW_CURSOR) static void video_set_cursor(void) { - /* swap drawing colors */ - eorx = fgx; - fgx = bgx; - bgx = eorx; - eorx = fgx ^ bgx; - /* draw cursor */ - video_putchar(console_col * VIDEO_FONT_WIDTH, - console_row * VIDEO_FONT_HEIGHT, ' '); - /* restore drawing colors */ - eorx = fgx; - fgx = bgx; - bgx = eorx; - eorx = fgx ^ bgx; + if (cursor_state) + console_cursor(0); + console_cursor(1); } -#endif -#ifdef CONFIG_CONSOLE_CURSOR + + void console_cursor(int state) { - static int last_state = 0; - #ifdef CONFIG_CONSOLE_TIME struct rtc_time tm; char info[16]; @@ -650,17 +657,20 @@ void console_cursor(int state) } #endif - if (state && (last_state != state)) { - video_set_cursor(); - } - - if (!state && (last_state != state)) { - /* clear cursor */ - video_putchar(console_col * VIDEO_FONT_WIDTH, - console_row * VIDEO_FONT_HEIGHT, ' '); + if (cursor_state != state) { + if (cursor_state) { + /* turn off the cursor */ + video_invertchar(old_col * VIDEO_FONT_WIDTH, + old_row * VIDEO_FONT_HEIGHT); + } else { + /* turn off the cursor and record where it is */ + video_invertchar(console_col * VIDEO_FONT_WIDTH, + console_row * VIDEO_FONT_HEIGHT); + old_col = console_col; + old_row = console_row; + } + cursor_state = state; } - - last_state = state; } #endif @@ -727,19 +737,11 @@ static void console_back(void) if (console_row < 0) console_row = 0; } - video_putchar(console_col * VIDEO_FONT_WIDTH, - console_row * VIDEO_FONT_HEIGHT, ' '); + CURSOR_SET; } static void console_newline(void) { - /* Check if last character in the line was just drawn. If so, cursor was - overwriten and need not to be cleared. Cursor clearing without this - check causes overwriting the 1st character of the line if line lenght - is >= CONSOLE_COLS - */ - if (console_col < CONSOLE_COLS) - CURSOR_OFF; console_row++; console_col = 0; @@ -755,7 +757,6 @@ static void console_newline(void) static void console_cr(void) { - CURSOR_OFF; console_col = 0; } @@ -763,6 +764,8 @@ void video_putc(const char c) { static int nl = 1; + CURSOR_OFF; + switch (c) { case 13: /* back to first column */ console_cr(); @@ -775,7 +778,6 @@ void video_putc(const char c) break; case 9: /* tab 8 */ - CURSOR_OFF; console_col |= 0x0008; console_col &= ~0x0007; -- 1.7.3.1

5 10

[U-Boot] [PATCH v2] bootvx: Clear and disable data cache, and call vxWorks with parameter.
by Reinhard Arlt 18 Mar '12

18 Mar '12

From: Reinhard Arlt <reinhard.arlt(a)esd.eu> This patch clear and disable the data cache for vxWorks. The entry point sysInit(int) intended by Windriver to be called from the vxWorks bootrom, a very small vxWorks system. The routine is called by the go() handler in the bootrom, that clears the cache from start of image to end of usable memory. The PowerPC implementations only invalidates and disable the cache, the ARM implementations also flush it. U-Boot will be on the save side, if it disables the data cache before calling vxWorks sysInit(int). Signed-off-by: Reinhard Arlt <reinhard.arlt(a)esd.eu> -- diff --git a/common/cmd_elf.c b/common/cmd_elf.c index 11ffc1b..8266bba 100644 --- a/common/cmd_elf.c +++ b/common/cmd_elf.c @@ -230,7 +230,8 @@ int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) (char *) bootaddr); printf ("## Starting vxWorks at 0x%08lx ...\n", addr); - ((void (*)(void)) addr) (); + dcache_disable(); + ((void (*)(int)) addr) (0); puts ("## vxWorks terminated\n"); return 1;

3 2

[U-Boot] [PATCH 1/4] net/miiphy/serial: drop duplicate "NAMESIZE" define
by Mike Frysinger 18 Mar '12

18 Mar '12

A few subsystems are using the same define "NAMESIZE". This has been working so far because they define it to the same number. However, I want to change the size of eth_device's NAMESIZE, so rather than tweak the define names, simply drop references to it. Almost no one does, and the handful that do can easily be changed to a sizeof(). Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- board/Marvell/db64360/mv_eth.c | 2 +- board/Marvell/db64460/mv_eth.c | 2 +- board/esd/cpci750/mv_eth.c | 2 +- board/evb64260/eth.c | 2 +- board/prodrive/p3mx/mv_eth.c | 2 +- drivers/net/armada100_fec.c | 2 +- drivers/net/mvgbe.c | 2 +- drivers/qe/uec_phy.c | 2 +- include/miiphy.h | 2 +- include/net.h | 4 +--- include/serial.h | 5 ++--- net/eth.c | 2 +- 12 files changed, 13 insertions(+), 16 deletions(-) diff --git a/board/Marvell/db64360/mv_eth.c b/board/Marvell/db64360/mv_eth.c index 30304b0..82e08a1 100644 --- a/board/Marvell/db64360/mv_eth.c +++ b/board/Marvell/db64360/mv_eth.c @@ -221,7 +221,7 @@ void mv6436x_eth_initialize (bd_t * bis) return; } - /* must be less than NAMESIZE (16) */ + /* must be less than sizeof(dev->name) */ sprintf (dev->name, "mv_enet%d", devnum); #ifdef DEBUG diff --git a/board/Marvell/db64460/mv_eth.c b/board/Marvell/db64460/mv_eth.c index cd9d5a4..e20ca20 100644 --- a/board/Marvell/db64460/mv_eth.c +++ b/board/Marvell/db64460/mv_eth.c @@ -221,7 +221,7 @@ void mv6446x_eth_initialize (bd_t * bis) return; } - /* must be less than NAMESIZE (16) */ + /* must be less than sizeof(dev->name) */ sprintf (dev->name, "mv_enet%d", devnum); #ifdef DEBUG diff --git a/board/esd/cpci750/mv_eth.c b/board/esd/cpci750/mv_eth.c index 781ad23..06ae6ff 100644 --- a/board/esd/cpci750/mv_eth.c +++ b/board/esd/cpci750/mv_eth.c @@ -221,7 +221,7 @@ void mv6436x_eth_initialize (bd_t * bis) return; } - /* must be less than NAMESIZE (16) */ + /* must be less than sizeof(dev->name) */ sprintf (dev->name, "mv_enet%d", devnum); #ifdef DEBUG diff --git a/board/evb64260/eth.c b/board/evb64260/eth.c index 1492ffc..e96b0f4 100644 --- a/board/evb64260/eth.c +++ b/board/evb64260/eth.c @@ -685,7 +685,7 @@ gt6426x_eth_initialize(bd_t *bis) return; } - /* must be less than NAMESIZE (16) */ + /* must be less than sizeof(dev->name) */ sprintf(dev->name, "gal_enet%d", devnum); #ifdef DEBUG diff --git a/board/prodrive/p3mx/mv_eth.c b/board/prodrive/p3mx/mv_eth.c index 15b3bfc..9e3213b 100644 --- a/board/prodrive/p3mx/mv_eth.c +++ b/board/prodrive/p3mx/mv_eth.c @@ -274,7 +274,7 @@ void mv6446x_eth_initialize (bd_t * bis) return; } - /* must be less than NAMESIZE (16) */ + /* must be less than sizeof(dev->name) */ sprintf (dev->name, "mv_enet%d", devnum); #ifdef DEBUG diff --git a/drivers/net/armada100_fec.c b/drivers/net/armada100_fec.c index fbf9763..0a45f17 100644 --- a/drivers/net/armada100_fec.c +++ b/drivers/net/armada100_fec.c @@ -709,7 +709,7 @@ int armada100_fec_register(unsigned long base_addr) /* Assign ARMADA100 Fast Ethernet Controller Base Address */ darmdfec->regs = (void *)base_addr; - /* must be less than NAMESIZE (16) */ + /* must be less than sizeof(dev->name) */ strcpy(dev->name, "armd-fec0"); dev->init = armdfec_init; diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c index fd13428..9ce5f6b 100644 --- a/drivers/net/mvgbe.c +++ b/drivers/net/mvgbe.c @@ -700,7 +700,7 @@ error1: dev = &dmvgbe->dev; - /* must be less than NAMESIZE (16) */ + /* must be less than sizeof(dev->name) */ sprintf(dev->name, "egiga%d", devnum); /* Extract the MAC address from the environment */ diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c index e26218b..ac580a0 100644 --- a/drivers/qe/uec_phy.c +++ b/drivers/qe/uec_phy.c @@ -85,7 +85,7 @@ #endif struct fixed_phy_port { - char name[NAMESIZE]; /* ethernet port name */ + char name[16]; /* ethernet port name */ unsigned int speed; /* specified speed 10,100 or 1000 */ unsigned int duplex; /* specified duplex FULL or HALF */ }; diff --git a/include/miiphy.h b/include/miiphy.h index 7e70cf8..ca5040e 100644 --- a/include/miiphy.h +++ b/include/miiphy.h @@ -86,7 +86,7 @@ void mdio_list_devices(void); #define BB_MII_DEVNAME "bb_miiphy" struct bb_miiphy_bus { - char name[NAMESIZE]; + char name[16]; int (*init)(struct bb_miiphy_bus *bus); int (*mdio_active)(struct bb_miiphy_bus *bus); int (*mdio_tristate)(struct bb_miiphy_bus *bus); diff --git a/include/net.h b/include/net.h index ad9afbf..b4acd8f 100644 --- a/include/net.h +++ b/include/net.h @@ -66,8 +66,6 @@ typedef void rxhand_icmp_f(unsigned type, unsigned code, unsigned dport, */ typedef void thand_f(void); -#define NAMESIZE 16 - enum eth_state_t { ETH_STATE_INIT, ETH_STATE_PASSIVE, @@ -75,7 +73,7 @@ enum eth_state_t { }; struct eth_device { - char name[NAMESIZE]; + char name[16]; unsigned char enetaddr[6]; int iobase; int state; diff --git a/include/serial.h b/include/serial.h index 5926244..2b9e647 100644 --- a/include/serial.h +++ b/include/serial.h @@ -3,10 +3,9 @@ #include <post.h> -#define NAMESIZE 16 - struct serial_device { - char name[NAMESIZE]; + /* enough bytes to match alignment of following func pointer */ + char name[16]; int (*init) (void); int (*uninit) (void); diff --git a/net/eth.c b/net/eth.c index 4280d6d..cdc3234 100644 --- a/net/eth.c +++ b/net/eth.c @@ -220,7 +220,7 @@ int eth_register(struct eth_device *dev) { struct eth_device *d; - assert(strlen(dev->name) < NAMESIZE); + assert(strlen(dev->name) < sizeof(dev->name)); if (!eth_devices) { eth_current = eth_devices = dev; -- 1.7.6.1

4 12

[U-Boot] [PATCH v2] CPCI750: Add CPCI-HD/2 support
by Reinhard Arlt 18 Mar '12

18 Mar '12

From: Reinhard Arlt <reinhard.arlt(a)esd.eu> This patch adds support for the esd CPCI-HD/2 board to u-boot for CPCI-CPU/750. As the primary devices on the CPCI-HD/2 board are connected to device 1 and 3, the device must be swaped. Signed-off-by: Reinhard Arlt <reinhard.arlt(a)esd.eu> -- diff --git a/board/esd/cpci750/ide.c b/board/esd/cpci750/ide.c index a3bd1b7..aa001df 100644 --- a/board/esd/cpci750/ide.c +++ b/board/esd/cpci750/ide.c @@ -31,6 +31,18 @@ #include <pci.h> extern ulong ide_bus_offset[CONFIG_SYS_IDE_MAXBUS]; +int cpci_hd_type; + +int ata_device(int dev) +{ + int retval; + + retval = (dev & 1) << 4; + if (cpci_hd_type == 2) + retval ^= 1 << 4; + return retval; +} + int ide_preinit (void) { @@ -39,14 +51,21 @@ int ide_preinit (void) int l; status = 1; + cpci_hd_type = 0; if (CPCI750_SLAVE_TEST != 0) return status; for (l = 0; l < CONFIG_SYS_IDE_MAXBUS; l++) { ide_bus_offset[l] = -ATA_STATUS; } devbusfn = pci_find_device (0x1103, 0x0004, 0); - if (devbusfn == -1) + if (devbusfn != -1) { + cpci_hd_type = 1; + } else { devbusfn = pci_find_device (0x1095, 0x3114, 0); + if (devbusfn != -1) { + cpci_hd_type = 2; + } + } if (devbusfn != -1) { ulong *ide_bus_offset_ptr; diff --git a/include/ata.h b/include/ata.h index b51475d..3b2d737 100644 --- a/include/ata.h +++ b/include/ata.h @@ -82,7 +82,9 @@ /* * Device / Head Register Bits */ +#ifndef ATA_DEVICE #define ATA_DEVICE(x) ((x & 1)<<4) +#endif /* ATA_DEVICE */ #define ATA_LBA 0xE0 /* diff --git a/include/configs/CPCI750.h b/include/configs/CPCI750.h index d735e61..a6af86c 100644 --- a/include/configs/CPCI750.h +++ b/include/configs/CPCI750.h @@ -187,6 +187,8 @@ #define CONFIG_SYS_I2C_MULTI_EEPROMS #define CONFIG_SYS_I2C_SPEED 80000 /* I2C speed default */ +#define CONFIG_PRAM 0 + #define CONFIG_SYS_GT_DUAL_CPU /* also for JTAG even with one cpu */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_PROMPT "=> " /* Monitor Command Prompt */ @@ -241,11 +243,6 @@ #define CONFIG_SYS_TCLK 133000000 -/*#define CONFIG_SYS_750FX_HID0 0x8000c084*/ -#define CONFIG_SYS_750FX_HID0 0x80008484 -#define CONFIG_SYS_750FX_HID1 0x54800000 -#define CONFIG_SYS_750FX_HID2 0x00000000 - /* * Low Level Configuration Settings * (address mappings, register initial values, etc.) @@ -457,7 +454,11 @@ #define CONFIG_SYS_ATA_DATA_OFFSET 0x0000 /* Offset for data I/O */ #define CONFIG_SYS_ATA_REG_OFFSET 0x0000 /* Offset for normal register accesses */ #define CONFIG_SYS_ATA_ALT_OFFSET 0x0000 /* Offset for alternate registers */ - +#ifndef __ASSEMBLY__ +int ata_device(int dev); +#endif +#define ATA_DEVICE(dev) ata_device(dev) +#define CONFIG_ATAPI 1 /*---------------------------------------------------------------------- * Initial BAT mappings @@ -497,8 +498,8 @@ * IBAT4 and DBAT4 * FIXME: ingo disable BATs for Linux Kernel */ -#undef SETUP_HIGH_BATS_FX750 /* don't initialize BATS 4-7 */ -/*#define SETUP_HIGH_BATS_FX750*/ /* initialize BATS 4-7 */ +/* #undef SETUP_HIGH_BATS_FX750 */ /* don't initialize BATS 4-7 */ +#define SETUP_HIGH_BATS_FX750 /* initialize BATS 4-7 */ #ifdef SETUP_HIGH_BATS_FX750 #define CONFIG_SYS_IBAT4L (CONFIG_SYS_SDRAM1_BASE | BATL_PP_RW | BATL_CACHEINHIBIT) @@ -622,4 +623,6 @@ #define CPCI750_ECC_TEST (((in8(0xf0300000) & 0x02) == 0) ? 1 : 0) #define CONFIG_SYS_PLD_VER 0xf0e00000 +#define CONFIG_OF_LIBFDT 1 + #endif /* __CONFIG_H */

2 1

[U-Boot] [PATCH] ns16550: tegra: Specify debugging serial port at boot.
by Stephen Warren 13 Mar '12

13 Mar '12

From: Doug Anderson <dianders(a)chromium.org> This works together with a kernel change that looks at the scratchpad register to determine which of the many UARTs it should use for early printing: http://www.spinics.net/lists/arm-kernel/msg154633.html While it is unfortunate to need to pass this information in a second way (it's already in the device tree), this does allow the very early boot code (decompressing stub and early assembly code) to print to the right port. At the moment, I'm adding this to the UART init function. Alternatively, we could add a more complex patch to key off of the 'console' setting. Signed-off-by: Doug Anderson <dianders(a)chromium.org> [swarren: Limited the change to Tegra platforms] Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- drivers/serial/ns16550.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index 0c23955..19a28cd 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -62,6 +62,13 @@ void NS16550_init(NS16550_t com_port, int baud_divisor) serial_out(0, &com_port->mdr1); #endif #endif /* CONFIG_OMAP */ +#if defined(CONFIG_TEGRA2) + /* + * Put a 'D' in the scratchpad to let the kernel know which UART + * for earlyprintk [D]ebugging. + */ + serial_out('D', &com_port->spr); +#endif } #ifndef CONFIG_NS16550_MIN_FUNCTIONS -- 1.7.0.4

5 9

[U-Boot] [PATCH v2] ATMEL: switch atmel_mci users to gen_atmel_mci
by Sven Schnelle 13 Mar '12

13 Mar '12

Hi List, this is the second iteration of my patches to switch ATMEL tagets using atmel_mci to gen_atmel_mci. Changes against v1: - fix warnings during build - don't rename gen_atmel_mci to atmel_mci Regards Sven

2 6