October 2010 - U-Boot

[U-Boot] [PATCH] env: don't set to default env twice when use CONFIG_ENV_IS_NOWHERE
by Lei Wen 12 Oct '10

12 Oct '10

When use the CONFIG_ENV_IS_NOWHERE, I met such issue: Using default environment *** Warning - bad CRC, using default environment Signed-off-by: Lei Wen <leiwen(a)marvell.com> --- common/env_common.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/common/env_common.c b/common/env_common.c index 88f068c..10131c7 100644 --- a/common/env_common.c +++ b/common/env_common.c @@ -238,7 +238,6 @@ void env_relocate (void) #else show_boot_progress (-60); #endif - set_default_env("!bad CRC"); } else { env_relocate_spec (); } -- 1.7.0.4

3 4

[U-Boot] [PATCH] arch/arm/include/asm/sizes.h: cleanups
by Andreas Bießmann 12 Oct '10

12 Oct '10

Merge several sizes.h in asm/arch subdirectories into a single asm/sizes.h file. Fixup usage of asm/arch/sizes.h in some files to use the merged file. Signed-off-by: Andreas Bießmann <andreas.devel(a)googlemail.com> --- These changes where submitted in 2008 but never applied. See http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/44229 It is not necessary to have several copies of files with nearly the same content. arch/arm/include/asm/arch-arm925t/sizes.h | 50 ------------------------ arch/arm/include/asm/arch-arm926ejs/sizes.h | 51 ------------------------ arch/arm/include/asm/arch-omap/sizes.h | 52 ------------------------- arch/arm/include/asm/arch-omap24xx/omap2420.h | 2 +- arch/arm/include/asm/arch-omap24xx/sizes.h | 49 ----------------------- arch/arm/include/asm/sizes.h | 5 +- include/configs/h2_p2_dbg_board.h | 2 +- include/configs/omap1510.h | 2 +- include/configs/omap730.h | 2 +- 9 files changed, 6 insertions(+), 209 deletions(-) delete mode 100644 arch/arm/include/asm/arch-arm925t/sizes.h delete mode 100644 arch/arm/include/asm/arch-arm926ejs/sizes.h delete mode 100644 arch/arm/include/asm/arch-omap/sizes.h delete mode 100644 arch/arm/include/asm/arch-omap24xx/sizes.h diff --git a/arch/arm/include/asm/arch-arm925t/sizes.h b/arch/arm/include/asm/arch-arm925t/sizes.h deleted file mode 100644 index 7319bd9..0000000 --- a/arch/arm/include/asm/arch-arm925t/sizes.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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 - */ -/* DO NOT EDIT!! - this file automatically generated - * from .s file by awk -f s2h.awk - */ -/* Size defintions - * Copyright (C) ARM Limited 1998. All rights reserved. - */ - -#ifndef __sizes_h -#define __sizes_h 1 - -/* handy sizes */ -#define SZ_1K 0x00000400 -#define SZ_4K 0x00001000 -#define SZ_8K 0x00002000 -#define SZ_16K 0x00004000 -#define SZ_64K 0x00010000 -#define SZ_128K 0x00020000 -#define SZ_256K 0x00040000 -#define SZ_512K 0x00080000 - -#define SZ_1M 0x00100000 -#define SZ_2M 0x00200000 -#define SZ_4M 0x00400000 -#define SZ_8M 0x00800000 -#define SZ_16M 0x01000000 -#define SZ_32M 0x02000000 -#define SZ_64M 0x04000000 -#define SZ_128M 0x08000000 -#define SZ_256M 0x10000000 -#define SZ_512M 0x20000000 - -#define SZ_1G 0x40000000 -#define SZ_2G 0x80000000 - -#endif /* __sizes_h */ diff --git a/arch/arm/include/asm/arch-arm926ejs/sizes.h b/arch/arm/include/asm/arch-arm926ejs/sizes.h deleted file mode 100644 index ef0b99b..0000000 --- a/arch/arm/include/asm/arch-arm926ejs/sizes.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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, MA0 2111-1307 - * USA - */ -/* DO NOT EDIT!! - this file automatically generated - * from .s file by awk -f s2h.awk - */ -/* Size defintions - * Copyright (C) ARM Limited 1998. All rights reserved. - */ - -#ifndef __sizes_h -#define __sizes_h 1 - -/* handy sizes */ -#define SZ_1K 0x00000400 -#define SZ_4K 0x00001000 -#define SZ_8K 0x00002000 -#define SZ_16K 0x00004000 -#define SZ_64K 0x00010000 -#define SZ_128K 0x00020000 -#define SZ_256K 0x00040000 -#define SZ_512K 0x00080000 - -#define SZ_1M 0x00100000 -#define SZ_2M 0x00200000 -#define SZ_4M 0x00400000 -#define SZ_8M 0x00800000 -#define SZ_16M 0x01000000 -#define SZ_32M 0x02000000 -#define SZ_64M 0x04000000 -#define SZ_128M 0x08000000 -#define SZ_256M 0x10000000 -#define SZ_512M 0x20000000 - -#define SZ_1G 0x40000000 -#define SZ_2G 0x80000000 - -#endif /* __sizes_h */ diff --git a/arch/arm/include/asm/arch-omap/sizes.h b/arch/arm/include/asm/arch-omap/sizes.h deleted file mode 100644 index f8d92ca..0000000 --- a/arch/arm/include/asm/arch-omap/sizes.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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 - */ -/* DO NOT EDIT!! - this file automatically generated - * from .s file by awk -f s2h.awk - */ -/* Size defintions - * Copyright (C) ARM Limited 1998. All rights reserved. - */ - -#ifndef __sizes_h -#define __sizes_h 1 - -/* handy sizes */ -#define SZ_1K 0x00000400 -#define SZ_4K 0x00001000 -#define SZ_8K 0x00002000 -#define SZ_16K 0x00004000 -#define SZ_64K 0x00010000 -#define SZ_128K 0x00020000 -#define SZ_256K 0x00040000 -#define SZ_512K 0x00080000 - -#define SZ_1M 0x00100000 -#define SZ_2M 0x00200000 -#define SZ_4M 0x00400000 -#define SZ_8M 0x00800000 -#define SZ_16M 0x01000000 -#define SZ_32M 0x02000000 -#define SZ_64M 0x04000000 -#define SZ_128M 0x08000000 -#define SZ_256M 0x10000000 -#define SZ_512M 0x20000000 - -#define SZ_1G 0x40000000 -#define SZ_2G 0x80000000 - -#endif - -/* END */ diff --git a/arch/arm/include/asm/arch-omap24xx/omap2420.h b/arch/arm/include/asm/arch-omap24xx/omap2420.h index 0c11bec..6032419 100644 --- a/arch/arm/include/asm/arch-omap24xx/omap2420.h +++ b/arch/arm/include/asm/arch-omap24xx/omap2420.h @@ -25,7 +25,7 @@ #ifndef _OMAP2420_SYS_H_ #define _OMAP2420_SYS_H_ -#include <asm/arch/sizes.h> +#include <asm/sizes.h> /* * 2420 specific Section diff --git a/arch/arm/include/asm/arch-omap24xx/sizes.h b/arch/arm/include/asm/arch-omap24xx/sizes.h deleted file mode 100644 index aaba18f..0000000 --- a/arch/arm/include/asm/arch-omap24xx/sizes.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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 - */ -/* Size defintions - * Copyright (C) ARM Limited 1998. All rights reserved. - */ - -#ifndef __sizes_h -#define __sizes_h 1 - -/* handy sizes */ -#define SZ_1K 0x00000400 -#define SZ_4K 0x00001000 -#define SZ_8K 0x00002000 -#define SZ_16K 0x00004000 -#define SZ_32K 0x00008000 -#define SZ_64K 0x00010000 -#define SZ_128K 0x00020000 -#define SZ_256K 0x00040000 -#define SZ_512K 0x00080000 - -#define SZ_1M 0x00100000 -#define SZ_2M 0x00200000 -#define SZ_4M 0x00400000 -#define SZ_8M 0x00800000 -#define SZ_16M 0x01000000 -#define SZ_31M 0x01F00000 -#define SZ_32M 0x02000000 -#define SZ_64M 0x04000000 -#define SZ_128M 0x08000000 -#define SZ_256M 0x10000000 -#define SZ_512M 0x20000000 - -#define SZ_1G 0x40000000 -#define SZ_2G 0x80000000 - -#endif /* __sizes_h */ diff --git a/arch/arm/include/asm/sizes.h b/arch/arm/include/asm/sizes.h index f8d92ca..b0b4f6a 100644 --- a/arch/arm/include/asm/sizes.h +++ b/arch/arm/include/asm/sizes.h @@ -13,9 +13,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* DO NOT EDIT!! - this file automatically generated - * from .s file by awk -f s2h.awk - */ /* Size defintions * Copyright (C) ARM Limited 1998. All rights reserved. */ @@ -28,6 +25,7 @@ #define SZ_4K 0x00001000 #define SZ_8K 0x00002000 #define SZ_16K 0x00004000 +#define SZ_32K 0x00008000 #define SZ_64K 0x00010000 #define SZ_128K 0x00020000 #define SZ_256K 0x00040000 @@ -38,6 +36,7 @@ #define SZ_4M 0x00400000 #define SZ_8M 0x00800000 #define SZ_16M 0x01000000 +#define SZ_31M 0x01F00000 #define SZ_32M 0x02000000 #define SZ_64M 0x04000000 #define SZ_128M 0x08000000 diff --git a/include/configs/h2_p2_dbg_board.h b/include/configs/h2_p2_dbg_board.h index e0d823f..a4dea7d 100644 --- a/include/configs/h2_p2_dbg_board.h +++ b/include/configs/h2_p2_dbg_board.h @@ -31,7 +31,7 @@ #ifndef __INCLUDED_H2_P2_DBH_BOARD_H #define __INCLUDED_H2_P2_DBH_BOARD_H -#include <asm/arch/sizes.h> +#include <asm/sizes.h> /* * The Debug board is designed to function with the P2 Sample, H2 diff --git a/include/configs/omap1510.h b/include/configs/omap1510.h index 931560c..e6d9c7a 100644 --- a/include/configs/omap1510.h +++ b/include/configs/omap1510.h @@ -28,7 +28,7 @@ * 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <asm/arch/sizes.h> +#include <asm/sizes.h> /* There are 2 sets of general I/O --> diff --git a/include/configs/omap730.h b/include/configs/omap730.h index 04d5144..c7682a1 100644 --- a/include/configs/omap730.h +++ b/include/configs/omap730.h @@ -31,7 +31,7 @@ #ifndef __INCLUDED_OMAP730_H #define __INCLUDED_OMAP730_H -#include <asm/arch/sizes.h> +#include <asm/sizes.h> /*************************************************************************** * OMAP730 Configuration Registers -- 1.7.3

2 3

[U-Boot] [PATCH 2/2 v2] zlib: Add further watchdog reset calls
by Stefan Roese 12 Oct '10

12 Oct '10

Patch 253cb831 [zlib: add watchdog reset call] added already a few watchdog reset calls to the new zlib U-Boot port. But on some boards this is not enough. Additional calls are needed on boards with short watchdog timeouts. This was detected and tested on the lwmon5 board with a very short watchdog timeout. Without this patch, the board resets during Linux kernel decompression. With it, the decompression succeeds. Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Detlev Zundel <dzu(a)denx.de> --- v2: - Changed to use WATCHDOG_RESET macro instead of function pointer lib/zlib.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/lib/zlib.c b/lib/zlib.c index 2b31dba..e19484a 100644 --- a/lib/zlib.c +++ b/lib/zlib.c @@ -1599,6 +1599,7 @@ int flush; strm->adler = state->check = adler32(0L, Z_NULL, 0); state->mode = TYPE; case TYPE: + WATCHDOG_RESET(); if (flush == Z_BLOCK) goto inf_leave; case TYPEDO: if (state->last) { -- 1.7.2.3

3 2

[U-Boot] [PATCH 1/2] zlib/gunzip: Use WATCHDOG_RESET macro
by Stefan Roese 12 Oct '10

12 Oct '10

As usually done in U-Boot, the watchdog_reset code is called via a macro (WATCHDOG_RESET). In zlib.c this was done differently, by using a function pointer which is initialized with WATCHDOG_RESET upon watchdog usage or with NULL otherwise. This patch now uses the plain WATCHDOG_RESET macros to call the function resulting in slightly smaller U-Boot images and simpler code. U-Boot code size reduction: PowerPC board with watchdog support (lwmon5): -> 80 bytes smaller image size PowerPC board without watchdog support (sequoia): -> 112 bytes smaller image size Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Detlev Zundel <dzu(a)denx.de> Cc: Wolfgang Denk <wd(a)denx.de> --- lib/gunzip.c | 5 ----- lib/zlib.c | 10 ++++------ 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/lib/gunzip.c b/lib/gunzip.c index d2b7ad4..482a476 100644 --- a/lib/gunzip.c +++ b/lib/gunzip.c @@ -96,11 +96,6 @@ int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp, s.zalloc = zalloc; s.zfree = zfree; -#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) - s.outcb = (cb_func)WATCHDOG_RESET; -#else - s.outcb = Z_NULL; -#endif /* CONFIG_HW_WATCHDOG */ r = inflateInit2(&s, -MAX_WBITS); if (r != Z_OK) { diff --git a/lib/zlib.c b/lib/zlib.c index 26e5af1..2b31dba 100644 --- a/lib/zlib.c +++ b/lib/zlib.c @@ -29,6 +29,7 @@ #include <common.h> #include <compiler.h> #include <asm/unaligned.h> +#include <watchdog.h> #include "u-boot/zlib.h" #undef OFF /* avoid conflicts */ @@ -1075,8 +1076,7 @@ z_streamp strm; state->hold = 0; state->bits = 0; state->lencode = state->distcode = state->next = state->codes; - if (strm->outcb != Z_NULL) - (*strm->outcb)(Z_NULL, 0); + WATCHDOG_RESET(); Tracev((stderr, "inflate: reset\n")); return Z_OK; } @@ -1776,8 +1776,7 @@ int flush; Tracev((stderr, "inflate: codes ok\n")); state->mode = LEN; case LEN: - if (strm->outcb != Z_NULL) /* for watchdog (U-Boot) */ - (*strm->outcb)(Z_NULL, 0); + WATCHDOG_RESET(); if (have >= 6 && left >= 258) { RESTORE(); inflate_fast(strm, out); @@ -1990,8 +1989,7 @@ z_streamp strm; return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; if (state->window != Z_NULL) { - if (strm->outcb != Z_NULL) - (*strm->outcb)(Z_NULL, 0); + WATCHDOG_RESET(); ZFREE(strm, state->window); } ZFREE(strm, strm->state); -- 1.7.2.3

3 2

[U-Boot] [PATCH 1/2] fdt_support: support adding EDID property to FDT display nodes
by Anatolij Gustschin 12 Oct '10

12 Oct '10

Boards can pass display timing info for drivers using EDID block. Provide common function to add board specific EDID data to the device tree. Subsequent patch makes use of this functionality. Signed-off-by: Anatolij Gustschin <agust(a)denx.de> Cc: Gerald Van Baren <vanbaren(a)cideas.com> --- common/fdt_support.c | 29 +++++++++++++++++++++++++++++ include/fdt_support.h | 1 + 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/common/fdt_support.c b/common/fdt_support.c index 33336be..13c8882 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -1171,3 +1171,32 @@ int fdt_alloc_phandle(void *blob) return phandle + 1; } + +#if defined(CONFIG_VIDEO) +int fdt_add_edid(void *blob, const char *compat, unsigned char *edid_buf) +{ + int noff; + int ret; + + noff = fdt_node_offset_by_compatible(blob, -1, compat); + if (noff != -FDT_ERR_NOTFOUND) { + debug("%s: %s\n", fdt_get_name(blob, noff, 0), compat); +add_edid: + ret = fdt_setprop(blob, noff, "edid", edid_buf, 128); + if (ret == -FDT_ERR_NOSPACE) { + ret = fdt_increase_size(blob, 512); + if (!ret) + goto add_edid; + else + goto err_size; + } else if (ret < 0) { + printf("Can't add property: %s\n", fdt_strerror(ret)); + return ret; + } + } + return 0; +err_size: + printf("Can't increase blob size: %s\n", fdt_strerror(ret)); + return ret; +} +#endif diff --git a/include/fdt_support.h b/include/fdt_support.h index 871ef45..b2a7a0c 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -87,6 +87,7 @@ u64 fdt_translate_address(void *blob, int node_offset, const u32 *in_addr); int fdt_node_offset_by_compat_reg(void *blob, const char *compat, phys_addr_t compat_off); int fdt_alloc_phandle(void *blob); +int fdt_add_edid(void *blob, const char *compat, unsigned char *buf); #endif /* ifdef CONFIG_OF_LIBFDT */ #endif /* ifndef __FDT_SUPPORT_H */ -- 1.7.0.4

4 11

[U-Boot] [PATCH 0/2 v5][U-BOOT] Zoom3: Add support for OMAP3630 Zoom3 board.
by Aldo Cedillo 12 Oct '10

12 Oct '10

From: Aldo Brett Cedillo Martinez <aldo.cedillo(a)ti.com> This patch set gives basic functionality to Omap3630 Zoom3 board. And unifies serial_devices for zoom2 and zoom3 since both use the same struct. Thanks Wolfgang for your comments, the modifications done were: - Added entry to MAINTAINERS in proper order. - Macro for UART1_RX pin. - Left include for status led unconditional. - Unindented preprocessor statements. - Made CONFIG_SYS_HZ a constant with value 1000. - Zoom2 and Zoom3 devices now use the same serial device. Aldo Brett Cedillo Martinez (2): [U-BOOT] Zoom3: Add support for OMAP3630 Zoom3 board. [U-BOOT] Unify serial_device for zoom2 and zoom3. MAINTAINERS | 4 + MAKEALL | 1 + board/logicpd/zoom2/zoom2_serial.h | 2 +- board/logicpd/zoom3/Makefile | 54 +++++++ board/logicpd/zoom3/config.mk | 33 +++++ board/logicpd/zoom3/debug_board.c | 68 +++++++++ board/logicpd/zoom3/led.c | 133 +++++++++++++++++ board/logicpd/zoom3/zoom3.c | 199 ++++++++++++++++++++++++++ board/logicpd/zoom3/zoom3.h | 164 +++++++++++++++++++++ board/logicpd/zoom3/zoom3_serial.c | 132 +++++++++++++++++ board/logicpd/zoom3/zoom3_serial.h | 76 ++++++++++ boards.cfg | 1 + common/serial.c | 2 + include/configs/omap3_zoom2.h | 2 +- include/configs/omap3_zoom3.h | 274 ++++++++++++++++++++++++++++++++++++ include/serial.h | 11 +- 16 files changed, 1148 insertions(+), 8 deletions(-) create mode 100644 board/logicpd/zoom3/Makefile create mode 100644 board/logicpd/zoom3/config.mk create mode 100644 board/logicpd/zoom3/debug_board.c create mode 100644 board/logicpd/zoom3/led.c create mode 100644 board/logicpd/zoom3/zoom3.c create mode 100644 board/logicpd/zoom3/zoom3.h create mode 100644 board/logicpd/zoom3/zoom3_serial.c create mode 100644 board/logicpd/zoom3/zoom3_serial.h create mode 100644 include/configs/omap3_zoom3.h

6 16

[U-Boot] [PATCH] CONFIG_CMD_JFFS2 is not necessary to use mtdparts on erase & protect on/off
by Alexander Stein 12 Oct '10

12 Oct '10

The include <jffs2/jffs2.h> is still necessary though. Signed-off-by: Alexander Stein <alexander.stein(a)systec-electronic.com> --- common/cmd_flash.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/cmd_flash.c b/common/cmd_flash.c index ff43965..3e6bab2 100644 --- a/common/cmd_flash.c +++ b/common/cmd_flash.c @@ -31,7 +31,7 @@ #include <dataflash.h> #endif -#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS) +#if defined(CONFIG_CMD_MTDPARTS) #include <jffs2/jffs2.h> /* partition handling routines */ @@ -325,7 +325,7 @@ int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) flash_info_t *info; ulong bank, addr_first, addr_last; int n, sect_first, sect_last; -#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS) +#if defined(CONFIG_CMD_MTDPARTS) struct mtd_device *dev; struct part_info *part; u8 dev_type, dev_num, pnum; @@ -355,7 +355,7 @@ int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return rcode; } -#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS) +#if defined(CONFIG_CMD_MTDPARTS) /* erase <part-id> - erase partition */ if ((argc == 2) && (mtd_id_parse(argv[1], NULL, &dev_type, &dev_num) == 0)) { mtdparts_init(); @@ -465,7 +465,7 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #if !defined(CONFIG_SYS_NO_FLASH) || defined(CONFIG_HAS_DATAFLASH) ulong addr_first, addr_last; #endif -#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS) +#if defined(CONFIG_CMD_MTDPARTS) struct mtd_device *dev; struct part_info *part; u8 dev_type, dev_num, pnum; @@ -555,7 +555,7 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return rcode; } -#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS) +#if defined(CONFIG_CMD_MTDPARTS) /* protect on/off <part-id> */ if ((argc == 3) && (mtd_id_parse(argv[2], NULL, &dev_type, &dev_num) == 0)) { mtdparts_init(); @@ -687,7 +687,7 @@ int flash_sect_protect (int p, ulong addr_first, ulong addr_last) /**************************************************/ -#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS) +#if defined(CONFIG_CMD_MTDPARTS) # define TMP_ERASE "erase <part-id>\n - erase partition\n" # define TMP_PROT_ON "protect on <part-id>\n - protect partition\n" # define TMP_PROT_OFF "protect off <part-id>\n - make partition writable\n" -- 1.7.1

3 2

[U-Boot] Please pull u-boot-cfi-flash/master
by Stefan Roese 12 Oct '10

12 Oct '10

The following changes since commit bfc7bea6adc46e1db2f5a5e3464d7652ed67c864: Merge branch 'master' of git://git.denx.de/u-boot-x86 (2010-10-11 10:00:34 +0200) are available in the git repository at: git://www.denx.de/git/u-boot-cfi-flash.git master John Schmoller (1): cfi_flash: Fix "Unknown FLASH" error message drivers/mtd/cfi_flash.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

2 1

[U-Boot] Pull request - net
by Ben Warren 12 Oct '10

12 Oct '10

Wolfgang, The following changes since commit bfc7bea6adc46e1db2f5a5e3464d7652ed67c864: Wolfgang Denk (1): Merge branch 'master' of git://git.denx.de/u-boot-x86 are available in the git repository at: git://git.denx.de/u-boot-net.git master Andreas Bießmann (2): drivers/net/at91_emac.c: increase timeout for autonegotiation drivers/net/at91_emac.c: change return values Ben Gardiner (1): davinci_emac: davinci_eth_set_mac_addr to ->write_hwaddr Ben Warren (1): Net: Remove redundant CONFIG_NET_MULTI directives Ilya Yanok (1): mpc5xxx_fec: add call to reset_phy() after PHY initialization Joakim Tjernlund (4): net: Fix faulty definition of uec_initialize() UEC: Don't udelay needlessly UEC PHY: Remove strange 0.5 sec delay UEC PHY: Speed up initial PHY neg. Michal Simek (2): net: Fix emaclite driver to support little-endian microblaze net: Move Emaclite to NET_MULTI Peter Tyser (1): rarp: Condtionally compile rarp support Reinhard Meyer (1): NET: add ENC28J60 driver using SPI framework Reinhard Meyer (-VC) (1): NET: move legacy enc28j60.c to sidetrack as enc28j60_lpc2292.c Thomas Chou (1): smc91111: add write_hwaddr arch/arm/include/asm/arch-davinci/emac_defs.h | 1 - arch/arm/lib/board.c | 19 - board/davinci/common/misc.c | 41 +- board/davinci/common/misc.h | 2 +- board/davinci/da8xxevm/da830evm.c | 12 +- board/davinci/dm365evm/dm365evm.c | 2 +- board/davinci/dvevm/dvevm.c | 2 +- board/davinci/sffsdr/sffsdr.c | 2 +- board/davinci/sonata/sonata.c | 2 +- common/cmd_net.c | 2 + drivers/net/Makefile | 1 + drivers/net/at91_emac.c | 20 +- drivers/net/davinci_emac.c | 80 +- drivers/net/enc28j60.c | 1548 ++++++++++++------------- drivers/net/enc28j60.h | 251 ++++ drivers/net/enc28j60_lpc2292.c | 983 ++++++++++++++++ drivers/net/mpc5xxx_fec.c | 7 + drivers/net/smc91111.c | 40 +- drivers/net/xilinx_emaclite.c | 88 +- drivers/qe/uec.c | 4 +- drivers/qe/uec_phy.c | 10 +- include/config_cmd_all.h | 1 + include/configs/SMN42.h | 2 +- include/configs/lpc2292sodimm.h | 2 +- include/netdev.h | 4 +- net/Makefile | 2 +- net/eth.c | 16 +- net/net.c | 11 +- 28 files changed, 2192 insertions(+), 963 deletions(-) create mode 100644 drivers/net/enc28j60.h create mode 100644 drivers/net/enc28j60_lpc2292.c

2 1

[U-Boot] [PATCH] da850evm: fix linux bootparam address
by Ben Gardiner 12 Oct '10

12 Oct '10

This patch fixes the LINUX_BOOT_PARAM_ADDR define to be based off of PHYS_SDRAM_1 instead of CONFIG_SYS_MEMTEST_START. On da830 they are the same thing but on da850 the CONFIG_SYS_MEMSTART define is offset from the PHYS_SDRAM_1 start. Without this patch it is not possible to boot linux on da850 -- bootm hangs at "Uncompressing Linux... done, booting the kernel." Signed-off-by: Ben Gardiner <bengardiner(a)nanometrics.ca> CC: Sudhakar Rajashekhara <sudhakar.raj(a)ti.com> --- I'm not sure if this is a bugfix or not -- there is currently no way to load a uImage from anywhere in the da850evm config on master. But if you did modify the configuration enough to load one then your bootm command would hang at "Uncompressing Linux... done, booting the kernel." I'm submitting it for inclusion into 2010.09 since the definiion of LINUX_BOOT_PARAM_ADDR is wrong for da850. But it's OK to push off to next since you couldn't load a uImage with the default config anyways. --- include/configs/da850evm.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 1b6fe72..21db022 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -139,7 +139,7 @@ /* * Linux Information */ -#define LINUX_BOOT_PARAM_ADDR (CONFIG_SYS_MEMTEST_START + 0x100) +#define LINUX_BOOT_PARAM_ADDR (PHYS_SDRAM_1 + 0x100) #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_BOOTARGS \ -- 1.7.0.4

1 1