February 2011 - U-Boot

[U-Boot] [PATCH] Env. vars fix for lite5200
by Karim Yaghmour 13 Apr '11

13 Apr '11

I still have a few older lite5200 boards around and when I recently tried to upgrade U-Boot I ran into weird problems where "saveenv" would fry the bootloader. Attached is a fix. It seems that somewhere along the way the image size grew larger than 256K and the address for the env vars overlapped with the code. P.S.: Apologies for not putting the patch inline, the email provider I use has a brain-dead policy of enforcing line-wraps on text emails :/ -- Karim Yaghmour CEO - Opersys inc. / www.opersys.com http://twitter.com/karimyaghmour

2 1

[U-Boot] [PATCH] MAINTAINERS: fix email address case
by Fabio Estevam 13 Apr '11

13 Apr '11

Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- MAINTAINERS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 07541bd..7e987b3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -624,7 +624,7 @@ Kristoffer Ericson <kristoffer.ericson(a)gmail.com> jornada SA1110 -Fabio Estevam <Fabio.Estevam(a)freescale.com> +Fabio Estevam <fabio.estevam(a)freescale.com> mx31pdk i.MX31 -- 1.6.0.4

2 1

[U-Boot] [PATCH 1/1] MX53: drop config.mk from mx53evk
by Jason Liu 13 Apr '11

13 Apr '11

The config.mk file in board directory is now obsolete and should be removed. Add option for the IMX image into boards.cfg Signed-off-by: Jason Liu <r64343(a)freescale.com> --- board/freescale/mx53evk/config.mk | 24 ------------------------ boards.cfg | 2 +- 2 files changed, 1 insertions(+), 25 deletions(-) diff --git a/board/freescale/mx53evk/config.mk b/board/freescale/mx53evk/config.mk deleted file mode 100644 index 0e60454..0000000 --- a/board/freescale/mx53evk/config.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright 2010 Freescale Semiconductor, Inc. All Rights Reserved. -# -# 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 -# - -IMX_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/imximage.cfg -ALL += $(obj)u-boot.imx diff --git a/boards.cfg b/boards.cfg index abb66d9..b85ad35 100644 --- a/boards.cfg +++ b/boards.cfg @@ -108,7 +108,7 @@ edminiv2 arm arm926ejs - LaCie ca9x4_ct_vxp arm armv7 vexpress armltd efikamx arm armv7 efikamx - mx5 mx51evk arm armv7 mx51evk freescale mx5 mx51evk:IMX_CONFIG=board/freescale/mx51evk/imximage.cfg -mx53evk arm armv7 mx53evk freescale mx5 +mx53evk arm armv7 mx53evk freescale mx5 mx53evk:IMX_CONFIG=board/freescale/mx53evk/imximage.cfg vision2 arm armv7 vision2 ttcontrol mx5 cm_t35 arm armv7 cm_t35 - omap3 omap3_overo arm armv7 overo - omap3 -- 1.7.0.4

4 5

[U-Boot] [PATCH] Fix bad padding of bootp request packet
by Simon Glass 13 Apr '11

13 Apr '11

This seems to pad to one byte longer than required Change-Id: I86a888a9f5f27356e260c0457d92468d5923a756 Signed-off-by: Simon Glass <sjg(a)chromium.org> --- net/bootp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/bootp.c b/net/bootp.c index 1a71786..87b027e 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -464,7 +464,7 @@ static int DhcpExtended (u8 * e, int message_type, IPaddr_t ServerID, IPaddr_t R /* Pad to minimal length */ #ifdef CONFIG_DHCP_MIN_EXT_LEN - while ((e - start) <= CONFIG_DHCP_MIN_EXT_LEN) + while ((e - start) < CONFIG_DHCP_MIN_EXT_LEN) *e++ = 0; #endif -- 1.7.3.1

2 4

[U-Boot] e1000: Driver additions for eXMeritus HWW-1U-1A
by Kyle Moffett 13 Apr '11

13 Apr '11

Sorry for taking so long to update and re-post these; I've had a lot of other things on my plate for the last several months. I've re-based them against the latest U-Boot master branch as of today. The following 5 patches are a series to provide the necessary support for the onboard Intel 82571 E1000E chips on our eXMeritus HWW-1U-1A boards. There are a few incidental fixups for dual-port NICs, but the main body of these patches is an SPI driver and "e1000 eeprom" commands for programming the configuration EEPROM attached to the 82571 chips. Our manufacturing process directly attaches the unprogrammed EEPROMs to the boards. We then use this code to load the Intel EEPROM and update the MAC address. The overall diffstat is: drivers/net/e1000.c | 848 ++++++++++++++++++++++++++++++++++++++++++++------- drivers/net/e1000.h | 18 +- 2 files changed, 751 insertions(+), 115 deletions(-) Most of the new code is hidden behind a couple of config options, so it won't affect other users of e1000 chips unless they explicitly request it. Cheers, Kyle Moffett

3 13

[U-Boot] [PATCH] mvgbe: enable the reception of packets with an odd number of preamble nibbles
by Klaus Flittner 13 Apr '11

13 Apr '11

With the current hardware initialisation of the driver all packets with an odd number of preamble nibbles are dropped. Some switches seem to send all packets with such an preamble. According to the functional specifications of the marvell 88F6180, 6190, 6192 and 6281 the reception of such packets can be enabled by setting bit 22 in register PSC1. Signed-off-by: Klaus Flittner <klaus(a)flittner.org> --- drivers/net/mvgbe.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c index c701f43..f1081a2 100644 --- a/drivers/net/mvgbe.c +++ b/drivers/net/mvgbe.c @@ -446,6 +446,9 @@ static int mvgbe_init(struct eth_device *dev) MVGBE_REG_WR(regs->psc0, MVGBE_MAX_RX_PACKET_9700BYTE | (MVGBE_REG_RD(regs->psc0) & MRU_MASK)); + /* Receive packets with odd number of preamble nibbles */ + MVGBE_REG_BITS_SET(regs->psc1, 1 << 22); + /* Enable port initially */ MVGBE_REG_BITS_SET(regs->psc0, MVGBE_SERIAL_PORT_EN);

3 2

[U-Boot] [PATCH v3] Divides variable of linker flags to LDFLAGS-u-boot and LDFLAGS
by Nobuhiro Iwamatsu 13 Apr '11

13 Apr '11

Linker needs to use the proper endian/bfd flags even when doing partial linking. LDFLAGS_u-boot sets linker option which is called it when U-boot is built (u-boot final). LDFLAGS sets necessary option by partial linking (use in cmd_link_o_target). CC: Mike Frysinger <vapier(a)gentoo.org> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> --- V3: Remove trailing space. Makefile | 2 +- arch/blackfin/config.mk | 3 ++- arch/i386/config.mk | 3 ++- arch/nios2/config.mk | 2 +- arch/powerpc/config.mk | 4 ++-- arch/sh/config.mk | 2 +- arch/sh/cpu/sh2/config.mk | 4 +++- config.mk | 8 +++++--- 8 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 9055028..d6884ea 100644 --- a/Makefile +++ b/Makefile @@ -369,7 +369,7 @@ $(obj)u-boot.dis: $(obj)u-boot GEN_UBOOT = \ UNDEF_SYM=`$(OBJDUMP) -x $(LIBBOARD) $(LIBS) | \ sed -n -e 's/.*$$(SYM_PREFIX)__u_boot_cmd_.*$/-u\1/p'|sort|uniq`;\ - cd $(LNDIR) && $(LD) $(LDFLAGS) $$UNDEF_SYM $(__OBJS) \ + cd $(LNDIR) && $(LD) $(LDFLAGS) $(LDFLAGS_$(@F)) $$UNDEF_SYM $(__OBJS) \ --start-group $(__LIBS) --end-group $(PLATFORM_LIBS) \ -Map u-boot.map -o u-boot $(obj)u-boot: depend \ diff --git a/arch/blackfin/config.mk b/arch/blackfin/config.mk index ab117ca..0cba294 100644 --- a/arch/blackfin/config.mk +++ b/arch/blackfin/config.mk @@ -30,7 +30,8 @@ CONFIG_BFIN_BOOT_MODE := $(strip $(subst ",,$(CONFIG_BFIN_BOOT_MODE))) PLATFORM_RELFLAGS += -ffixed-P3 -fomit-frame-pointer -mno-fdpic PLATFORM_CPPFLAGS += -DCONFIG_BLACKFIN -LDFLAGS += --gc-sections -m elf32bfin +LDFLAGS_u-boot += --gc-sections +LDFLAGS += -m elf32bfin PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections PLATFORM_CPPFLAGS += -DBFIN_CPU='"$(CONFIG_BFIN_CPU)"' diff --git a/arch/i386/config.mk b/arch/i386/config.mk index 8743f1a..3fb97c1 100644 --- a/arch/i386/config.mk +++ b/arch/i386/config.mk @@ -35,5 +35,6 @@ PLATFORM_CPPFLAGS += $(call cc-option, -fno-stack-protector) PLATFORM_CPPFLAGS += $(call cc-option, -mpreferred-stack-boundary=2) PLATFORM_CPPFLAGS += -DCONFIG_I386 -D__I386__ -LDFLAGS += --cref --gc-sections +LDFLAGS += --cref +LDFLAGS_u-boot += --gc-sections PLATFORM_RELFLAGS += -ffunction-sections diff --git a/arch/nios2/config.mk b/arch/nios2/config.mk index aba96b3..fa93180 100644 --- a/arch/nios2/config.mk +++ b/arch/nios2/config.mk @@ -31,5 +31,5 @@ PLATFORM_CPPFLAGS += -G0 LDSCRIPT ?= $(SRCTREE)/$(CPUDIR)/u-boot.lds -LDFLAGS += --gc-sections +LDFLAGS_u-boot += --gc-sections PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections diff --git a/arch/powerpc/config.mk b/arch/powerpc/config.mk index 2912604..64191c7 100644 --- a/arch/powerpc/config.mk +++ b/arch/powerpc/config.mk @@ -24,10 +24,10 @@ CROSS_COMPILE ?= ppc_8xx- STANDALONE_LOAD_ADDR = 0x40000 - +LDFLAGS_u-boot = --gc-sections PLATFORM_RELFLAGS += -mrelocatable -ffunction-sections -fdata-sections PLATFORM_CPPFLAGS += -DCONFIG_PPC -D__powerpc__ -PLATFORM_LDFLAGS += -n --gc-sections +PLATFORM_LDFLAGS += -n ifdef CONFIG_SYS_LDSCRIPT # need to strip off double quotes diff --git a/arch/sh/config.mk b/arch/sh/config.mk index 415c949..4ef85e3 100644 --- a/arch/sh/config.mk +++ b/arch/sh/config.mk @@ -30,5 +30,5 @@ endif PLATFORM_CPPFLAGS += -DCONFIG_SH -D__SH__ PLATFORM_LDFLAGS += -e $(CONFIG_SYS_TEXT_BASE) --defsym reloc_dst=$(CONFIG_SYS_TEXT_BASE) - +LDFLAGS_u-boot = --gc-sections LDSCRIPT := $(SRCTREE)/$(CPUDIR)/u-boot.lds diff --git a/arch/sh/cpu/sh2/config.mk b/arch/sh/cpu/sh2/config.mk index 52d5a0f..f2d40aa 100644 --- a/arch/sh/cpu/sh2/config.mk +++ b/arch/sh/cpu/sh2/config.mk @@ -21,6 +21,8 @@ # MA 02111-1307 USA # # +ENDIANNESS += -EB + PLATFORM_CPPFLAGS += -m3e -mb PLATFORM_RELFLAGS += -ffixed-r13 -PLATFORM_LDFLAGS += -EB +PLATFORM_LDFLAGS += $(ENDIANNESS) diff --git a/config.mk b/config.mk index 66f8fe6..5147c35 100644 --- a/config.mk +++ b/config.mk @@ -204,9 +204,11 @@ endif AFLAGS := $(AFLAGS_DEBUG) -D__ASSEMBLY__ $(CPPFLAGS) -LDFLAGS += -Bstatic -T $(obj)u-boot.lds $(PLATFORM_LDFLAGS) +LDFLAGS += $(PLATFORM_LDFLAGS) + +LDFLAGS_u-boot += -Bstatic -T $(obj)u-boot.lds $(PLATFORM_LDFLAGS) ifneq ($(CONFIG_SYS_TEXT_BASE),) -LDFLAGS += -Ttext $(CONFIG_SYS_TEXT_BASE) +LDFLAGS_u-boot += -Ttext $(CONFIG_SYS_TEXT_BASE) endif # Location of a usable BFD library, where we define "usable" as @@ -259,7 +261,7 @@ $(obj)%.s: %.c # If the list of objects to link is empty, just create an empty built-in.o cmd_link_o_target = $(if $(strip $1),\ - $(LD) -r -o $@ $1 ,\ + $(LD) $(LDFLAGS) -r -o $@ $1,\ rm -f $@; $(AR) rcs $@ ) ######################################################################### -- 1.7.2.3

4 4

[U-Boot] [PATCH] powerpc: fix LDSCRIPT in NAND boot
by Zhao Chenhui 12 Apr '11

12 Apr '11

ONFIG_NAND_U_BOOT indicates whether the SPL is used, while CONFIG_NAND_SPL is set only when building the SPL itself (and isn't available in makefiles anyway). This is the linker script for the main U-Boot when SPL is in use, so CONFIG_NAND_U_BOOT is the variable to use. Also, refrain from overriding LDSCRIPT with a NAND-specific script, unless such a script exists. Signed-off-by: Zhao Chenhui <b35336(a)freescale.com> Acked-by: Scott Wood <scottwood(a)freescale.com> --- arch/powerpc/config.mk | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/config.mk b/arch/powerpc/config.mk index 2912604..08ad333 100644 --- a/arch/powerpc/config.mk +++ b/arch/powerpc/config.mk @@ -32,8 +32,10 @@ PLATFORM_LDFLAGS += -n --gc-sections ifdef CONFIG_SYS_LDSCRIPT # need to strip off double quotes LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT)) -else ifdef CONFIG_NAND_SPL -LDSCRIPT := $(SRCTREE)/$(CONFIG_BOARDDIR)/u-boot-nand.lds +else ifdef CONFIG_NAND_U_BOOT +ifneq ($(wildcard $(SRCTREE)/$(CPUDIR)/u-boot-nand.lds),) +LDSCRIPT := $(SRCTREE)/$(CPUDIR)/u-boot-nand.lds +endif else ifneq ($(wildcard $(SRCTREE)/arch/powerpc/cpu/$(CPU)/u-boot.lds),) LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/$(CPU)/u-boot.lds -- 1.6.4.1

3 3

[U-Boot] [PATCH] disk/part.c: fix potential stack overflow bug
by Lei Wen 12 Apr '11

12 Apr '11

If the param pass to get_dev is not the one defined in the block_drvr, it could make uboot becomes unstable, for it would continue run after search complete the block_drvr table. Signed-off-by: Lei Wen <leiwen(a)marvell.com> --- disk/part.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/disk/part.c b/disk/part.c index 13723f2..f07a17f 100644 --- a/disk/part.c +++ b/disk/part.c @@ -84,7 +84,7 @@ block_dev_desc_t *get_dev(char* ifname, int dev) #ifdef CONFIG_NEEDS_MANUAL_RELOC name += gd->reloc_off; #endif - while (name) { + while (drvr->name) { name = drvr->name; reloc_get_dev = drvr->get_dev; #ifdef CONFIG_NEEDS_MANUAL_RELOC -- 1.7.0.4

2 1

[U-Boot] [PATCH 1/2] hush: Only run list if it's not empty
by Wolfgang Denk 12 Apr '11

12 Apr '11

Running empty lists causes wrong return status Adapted from Barebox commit 4596d2b Author: Sascha Hauer <s.hauer(a)pengutronix.de> Date: Thu Sep 17 11:11:51 2009 +0200 Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- common/hush.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/common/hush.c b/common/hush.c index 8021a68..c6f8392 100644 --- a/common/hush.c +++ b/common/hush.c @@ -3178,7 +3178,12 @@ int parse_stream_outer(struct in_str *inp, int flag) #ifndef __U_BOOT__ run_list(ctx.list_head); #else - code = run_list(ctx.list_head); + if (ctx.list_head->num_progs) { + code = run_list(ctx.list_head); + } else { + free_pipe_list(ctx.list_head, 0); + continue; + } if (code == -2) { /* exit */ b_free(&temp); code = 0; -- 1.7.4

1 2