June 2011 - U-Boot

[U-Boot] From Mrs Theresa Joshua
by joshua 26 Jun '11

26 Jun '11

>From Mrs Theresa Joshua DEAREST ONE OF GOD I am the above named person from Kuwait . I am married to Mr Hasim Joshua, who worked with Kuwait embassy in Ivory Coast for nine years before he died in the year 2004. We were married for eleven years without a child. He died after a brief illness that lasted for only four days.Before his death we were both born again Christian. Since his death I decided not to remarry or get a child outside my matrimonial home which the Bible is against. When my late husband was alive he deposited the sum of $2. 5 Million (Two Million Five Hundred U.S. Dollars) in the bank here in Abidjan in suspense account. Presently, the fund is still with the bank. Recently, my Doctor told me that i have serious sickness which is cancer problem. The one that disturbs me most is my stroke sickness. Having known my condition I decided to donate this fund to a church or individual that will utilize this money the way I am going to instruct herein. I want a church that will use this fund for orphanages, widows, propagating the word of God and to endeavour that the house of God is maintained. The Bible made us to understand that blessed is the hand that giveth. I took this decision because I don’t have any child that will inherit this money and my husband relatives are not Christians and I don’t want my husband’s efforts to be used by unbelievers. I don’t want a situation where this money will be used in an ungodly way. This is why I am taking this decision. I am not afraid of death hence i know where I am going. I know that I am going to be in the bosom of the Lord. Exodus 14 VS 14 says that the Lord will fight my case and I shall hold my peace. I don’t need any telephone communication in this regard because of my health hence the presence of my husband’s relatives is around me always I don't want them to know about this development. With God all things are possible. As soon as I receive your reply I shall give you the contact of the bank here in Abidjan .I await your soonest response with your full information, example. (1}Your full name ------(2}Address ----(3}Age ----(4)Occupation ---- (5)Sex --- I will use the above information to obtain an authorization letter that will legally and officially approve you as the new beneficiary of this fund from the Federal Ministry of Justice Cote D’Ivoire . I want you and the church to always pray for me because the lord is my shepherd. Please assure me that you will act accordingly as I Stated herein. Remain blessed in the Lord Yours Sister in Christ Mrs Theresa Joshua.

1 0

[U-Boot] leon2/leon3 build failure with O
by Clint Adams 26 Jun '11

26 Jun '11

arch/sparc/cpu/leon[23]/Makefile do not tolerate the use of an external object directory because it looks for start.S in the obj directory.

1 0

[U-Boot] Pull request: u-boot-usb
by Remy Bohmer 25 Jun '11

25 Jun '11

The following changes since commit 9623c158f6a5150a21c25026bfba79e7ff7912f5: Merge branch 'master' of git://git.denx.de/u-boot-arm (2011-06-23 15:37:33 +0200) are available in the git repository at: git://git.denx.de/u-boot-usb.git master Cliff Cai (1): musb: process control messages after roothub accepted it Mike Frysinger (1): usb: convert to partial linking Zhao Chenhui (1): ehci-pci: Fix PCI EHCI driver for 36-bit Makefile | 2 +- drivers/usb/eth/Makefile | 4 ++-- drivers/usb/host/ehci-pci.c | 5 ++--- drivers/usb/musb/musb_hcd.c | 7 +++++-- 4 files changed, 10 insertions(+), 8 deletions(-)

3 2

[U-Boot] [PATCH] USB: Move USB_PRINTF() out of ifdef in usb_scan_devices()
by Marek Vasut 25 Jun '11

25 Jun '11

Signed-off-by: Marek Vasut <marek.vasut(a)gmail.com> --- common/usb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/common/usb.c b/common/usb.c index 4f7c520..8e84266 100644 --- a/common/usb.c +++ b/common/usb.c @@ -957,8 +957,8 @@ void usb_scan_devices(void) /* insert "driver" if possible */ #ifdef CONFIG_USB_KEYBOARD drv_usb_kbd_init(); - USB_PRINTF("scan end\n"); #endif + USB_PRINTF("scan end\n"); } -- 1.7.5.3

1 0

[U-Boot] Hi dear
by sekani2011＠libero.it 25 Jun '11

25 Jun '11

Hi dear With Due Respect And Humanity, I was compelled to write to you under humanitarian grounds.I introducing my self as Miss kitni Sekani.I got your contact from an online Directory and was delighted to contact you. I need your help and I have a secured secret proposal and I seek a trust honest foreign person to assist me. Please is very important you contact me immediately on my private email below for further explanation on how we will proceed. Thanks Yours Miss kitni. Contact:-(sekanikitni@hotmail.com)

1 0

[U-Boot] [PATCH] usb: convert to partial linking
by Mike Frysinger 25 Jun '11

25 Jun '11

Looks like this was missed during the conversion to partial linking. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- Makefile | 2 +- drivers/usb/eth/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index bb1958a..a368f56 100644 --- a/Makefile +++ b/Makefile @@ -236,7 +236,7 @@ endif LIBS += drivers/rtc/librtc.o LIBS += drivers/serial/libserial.o LIBS += drivers/twserial/libtws.o -LIBS += drivers/usb/eth/libusb_eth.a +LIBS += drivers/usb/eth/libusb_eth.o LIBS += drivers/usb/gadget/libusb_gadget.o LIBS += drivers/usb/host/libusb_host.o LIBS += drivers/usb/musb/libusb_musb.o diff --git a/drivers/usb/eth/Makefile b/drivers/usb/eth/Makefile index 6a5f25a..a8e9eff 100644 --- a/drivers/usb/eth/Makefile +++ b/drivers/usb/eth/Makefile @@ -21,7 +21,7 @@ include $(TOPDIR)/config.mk -LIB := $(obj)libusb_eth.a +LIB := $(obj)libusb_eth.o # new USB host ethernet layer dependencies COBJS-$(CONFIG_USB_HOST_ETHER) += usb_ether.o @@ -36,7 +36,7 @@ OBJS := $(addprefix $(obj),$(COBJS)) all: $(LIB) $(LIB): $(obj).depend $(OBJS) - $(AR) $(ARFLAGS) $@ $(OBJS) + $(call cmd_link_o_target, $(OBJS)) ######################################################################### -- 1.7.5.3

2 1

[U-Boot] [PATCH] [PoC] basic kbuild output support
by Mike Frysinger 25 Jun '11

25 Jun '11

I know at first blush this isn't going to be supported, but it's just a PoC that things are (mostly) possible without much effort. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- Makefile | 54 ++++++++++++++++++++++------------------- common/kgdb.c | 52 +++++++++++++++++++++------------------ config.mk | 30 ++++++++++++++++++---- examples/api/Makefile | 11 +++++--- examples/standalone/Makefile | 9 ++++-- tools/Makefile | 48 +++++++++++++++++++++---------------- 6 files changed, 121 insertions(+), 83 deletions(-) diff --git a/Makefile b/Makefile index 43a9145..407bf22 100644 --- a/Makefile +++ b/Makefile @@ -53,18 +53,12 @@ SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ export HOSTARCH HOSTOS SHELL +MAKEFLAGS += --no-print-directory + # Deal with colliding definitions from tcsh etc. VENDOR= ######################################################################### -# Allow for silent builds -ifeq (,$(findstring s,$(MAKEFLAGS))) -XECHO = echo -else -XECHO = : -endif - -######################################################################### # # U-boot build supports producing a object files to the separate external # directory. Two use cases are supported: @@ -327,25 +321,31 @@ ALL += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map $(U_BOOT_NAND) $(U_BO all: $(ALL) $(obj)u-boot.hex: $(obj)u-boot - $(OBJCOPY) ${OBJCFLAGS} -O ihex $< $@ + @$(XECHO) " OBJCOPY $@" + $(Q)$(OBJCOPY) ${OBJCFLAGS} -O ihex $< $@ $(obj)u-boot.srec: $(obj)u-boot - $(OBJCOPY) -O srec $< $@ + @$(XECHO) " OBJCOPY $@" + $(Q)$(OBJCOPY) -O srec $< $@ $(obj)u-boot.bin: $(obj)u-boot - $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@ + @$(XECHO) " OBJCOPY $@" + $(Q)$(OBJCOPY) ${OBJCFLAGS} -O binary $< $@ $(BOARD_SIZE_CHECK) $(obj)u-boot.ldr: $(obj)u-boot - $(CREATE_LDR_ENV) - $(LDR) -T $(CONFIG_BFIN_CPU) -c $@ $< $(LDR_FLAGS) + @$(XECHO) " LDR $@" + $(Q)$(CREATE_LDR_ENV) + $(Q)$(LDR) -T $(CONFIG_BFIN_CPU) -c $@ $< $(LDR_FLAGS) $(BOARD_SIZE_CHECK) $(obj)u-boot.ldr.hex: $(obj)u-boot.ldr - $(OBJCOPY) ${OBJCFLAGS} -O ihex $< $@ -I binary + @$(XECHO) " OBJCOPY $@" + $(Q)$(OBJCOPY) ${OBJCFLAGS} -O ihex $< $@ -I binary $(obj)u-boot.ldr.srec: $(obj)u-boot.ldr - $(OBJCOPY) ${OBJCFLAGS} -O srec $< $@ -I binary + @$(XECHO) " OBJCOPY $@" + $(Q)$(OBJCOPY) ${OBJCFLAGS} -O srec $< $@ -I binary $(obj)u-boot.img: $(obj)u-boot.bin $(obj)tools/mkimage -A $(ARCH) -T firmware -C none \ @@ -376,29 +376,32 @@ GEN_UBOOT = \ -Map u-boot.map -o u-boot $(obj)u-boot: depend \ $(SUBDIRS) $(OBJS) $(LIBBOARD) $(LIBS) $(LDSCRIPT) $(obj)u-boot.lds - $(GEN_UBOOT) + @$(XECHO) " LD $@" + $(Q)$(GEN_UBOOT) ifeq ($(CONFIG_KALLSYMS),y) - smap=`$(call SYSTEM_MAP,u-boot) | \ + @$(XECHO) " SYMMAP $@" + $(Q)smap=`$(call SYSTEM_MAP,u-boot) | \ awk '$$2 ~ /[tTwW]/ {printf $$1 $$3 "\\\\000"}'` ; \ $(CC) $(CFLAGS) -DSYSTEM_MAP="\"$${smap}\"" \ -c common/system_map.c -o $(obj)common/system_map.o - $(GEN_UBOOT) $(obj)common/system_map.o + @$(XECHO) " LD $@" + $(Q)$(GEN_UBOOT) $(obj)common/system_map.o endif $(OBJS): depend - $(MAKE) -C $(CPUDIR) $(if $(REMOTE_BUILD),$@,$(notdir $@)) + $(Q)$(MAKE) -C $(CPUDIR) $(if $(REMOTE_BUILD),$@,$(notdir $@)) $(LIBS): depend $(SUBDIRS) - $(MAKE) -C $(dir $(subst $(obj),,$@)) + $(Q)$(MAKE) -C $(dir $(subst $(obj),,$@)) $(LIBBOARD): depend $(LIBS) - $(MAKE) -C $(dir $(subst $(obj),,$@)) + $(Q)$(MAKE) -C $(dir $(subst $(obj),,$@)) $(SUBDIRS): depend - $(MAKE) -C $@ all + $(Q)$(MAKE) -C $@ all $(LDSCRIPT): depend - $(MAKE) -C $(dir $@) $(notdir $@) + $(Q)$(MAKE) -C $(dir $@) $(notdir $@) # The linker script lacks proper dependency information atm, so force it # to be regenerated on every link. This shouldn't be to big of an issue @@ -407,7 +410,8 @@ $(LDSCRIPT): depend # board config file ... .PHONY: $(obj)u-boot.lds $(obj)u-boot.lds: $(LDSCRIPT) - $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@ + @$(XECHO) " CPP $@" + $(Q)$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@ $(NAND_SPL): $(TIMESTAMP_FILE) $(VERSION_FILE) depend $(MAKE) -C nand_spl/board/$(BOARDDIR) all @@ -442,7 +446,7 @@ updater: depend dep: $(TIMESTAMP_FILE) $(VERSION_FILE) \ $(obj)include/autoconf.mk \ $(obj)include/generated/generic-asm-offsets.h - for dir in $(SUBDIRS) $(CPUDIR) $(dir $(LDSCRIPT)) ; do \ + $(Q)for dir in $(SUBDIRS) $(CPUDIR) $(dir $(LDSCRIPT)) ; do \ $(MAKE) -C $$dir _depend ; done TAG_SUBDIRS = $(SUBDIRS) diff --git a/common/kgdb.c b/common/kgdb.c index 8a621ad..5bfd58d 100644 --- a/common/kgdb.c +++ b/common/kgdb.c @@ -87,13 +87,13 @@ * ****************************************************************************/ +#define DEBUG 1 + #include <common.h> #include <kgdb.h> #include <command.h> -#undef KGDB_DEBUG - /* * BUFMAX defines the maximum number of characters in inbound/outbound buffers */ @@ -107,7 +107,8 @@ static int kgdb_active = 0, first_entry = 1; static struct pt_regs entry_regs; static long error_jmp_buf[BUFMAX/2]; static int longjmp_on_fault = 0; -#ifdef KGDB_DEBUG + +#ifdef DEBUG static int kdebug = 1; #endif @@ -230,16 +231,13 @@ getpacket(char *buffer) int count; unsigned char ch; + debugX(kdebug, "waiting for $...# packet\n"); + do { /* wait around for the start character, ignore all other * characters */ - while ((ch = (getDebugChar() & 0x7f)) != '$') { -#ifdef KGDB_DEBUG - if (kdebug) - putc(ch); -#endif + while ((ch = (getDebugChar() & 0x7f)) != '$') ; - } checksum = 0; xmitcsum = -1; @@ -287,8 +285,12 @@ static void putpacket(unsigned char *buffer) { unsigned char checksum; - int count; + int count, i, j; unsigned char ch, recv; + char buf[256]; + + i = 0; + debugX(kdebug, "waiting for '+' ack packet\n"); /* $<packet info>#<checksum>. */ do { @@ -306,7 +308,15 @@ putpacket(unsigned char *buffer) putDebugChar(hexchars[checksum >> 4]); putDebugChar(hexchars[checksum & 0xf]); recv = getDebugChar(); + buf[i++] = recv; +// if ((recv & 0x7f) != '+') +// debugX(kdebug, "waiting for '+', but got %i:%c\n", recv, recv); } while ((recv & 0x7f) != '+'); + + debug("got back: "); + for (j = 0; j < i; ++j) + debug("%i:%c ", buf[j], buf[j]); + debug("\n"); } /* @@ -378,12 +388,12 @@ handle_exception (struct pt_regs *regs) *ptr = 0; -#ifdef KGDB_DEBUG - if (kdebug) - printf("kgdb: remcomOutBuffer: %s\n", remcomOutBuffer); -#endif + debugX(kdebug, "kgdb: remcomOutBuffer: %s\n", remcomOutBuffer); - putpacket((unsigned char *)&remcomOutBuffer); + while (serial_tstc()) + serial_getc(); + +// putpacket((unsigned char *)&remcomOutBuffer); while (1) { volatile int errnum; @@ -393,10 +403,7 @@ handle_exception (struct pt_regs *regs) getpacket(remcomInBuffer); ptr = &remcomInBuffer[1]; -#ifdef KGDB_DEBUG - if (kdebug) - printf("kgdb: remcomInBuffer: %s\n", remcomInBuffer); -#endif + debugX(kdebug, "kgdb: remcomInBuffer: %s\n", remcomInBuffer); errnum = kgdb_setjmp(error_jmp_buf); @@ -409,7 +416,7 @@ handle_exception (struct pt_regs *regs) remcomOutBuffer[3] = 0; break; -#ifdef KGDB_DEBUG +#ifdef DEBUG case 'd': /* toggle debug flag */ kdebug ^= 1; @@ -521,10 +528,7 @@ handle_exception (struct pt_regs *regs) if (errnum != 0) sprintf(remcomOutBuffer, "E%02d", errnum); -#ifdef KGDB_DEBUG - if (kdebug) - printf("kgdb: remcomOutBuffer: %s\n", remcomOutBuffer); -#endif + debugX(kdebug, "kgdb: remcomOutBuffer: %s\n", remcomOutBuffer); /* reply to the request */ putpacket((unsigned char *)&remcomOutBuffer); diff --git a/config.mk b/config.mk index 97d2631..653d52d 100644 --- a/config.mk +++ b/config.mk @@ -45,6 +45,16 @@ PLATFORM_CPPFLAGS = PLATFORM_LDFLAGS = ######################################################################### +# Allow for silent builds +ifeq (,$(findstring s,$(MAKEFLAGS))) +XECHO = echo +Q = @ +else +XECHO = : +Q = +endif + +######################################################################### HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer \ $(HOSTCPPFLAGS) @@ -253,21 +263,29 @@ BCURDIR = $(subst $(SRCTREE)/,,$(CURDIR:$(obj)%=%)) ALL_AFLAGS = $(AFLAGS) $(AFLAGS_$(BCURDIR)/$(@F)) $(AFLAGS_$(BCURDIR)) ALL_CFLAGS = $(CFLAGS) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) $(obj)%.s: %.S - $(CPP) $(ALL_AFLAGS) -o $@ $< + @$(XECHO) " CPP $@" + $(Q)$(CPP) $(ALL_AFLAGS) -o $@ $< $(obj)%.o: %.S - $(CC) $(ALL_AFLAGS) -o $@ $< -c + @$(XECHO) " CC $@" + $(Q)$(CC) $(ALL_AFLAGS) -o $@ $< -c $(obj)%.o: %.c - $(CC) $(ALL_CFLAGS) -o $@ $< -c + @$(XECHO) " CC $@" + $(Q)$(CC) $(ALL_CFLAGS) -o $@ $< -c $(obj)%.i: %.c - $(CPP) $(ALL_CFLAGS) -o $@ $< -c + @$(XECHO) " CPP $@" + $(Q)$(CPP) $(ALL_CFLAGS) -o $@ $< -c $(obj)%.s: %.c - $(CC) $(ALL_CFLAGS) -o $@ $< -c -S + @$(XECHO) " CC $@" + $(Q)$(CC) $(ALL_CFLAGS) -o $@ $< -c -S ######################################################################### # If the list of objects to link is empty, just create an empty built-in.o cmd_link_o_target = $(if $(strip $1),\ + @$(XECHO) " LD $@"; \ $(LD) $(LDFLAGS) -r -o $@ $1,\ - rm -f $@; $(AR) rcs $@ ) + @rm -f $@; \ + $(XECHO) " LD $@"; \ + $(AR) rcs $@) ######################################################################### diff --git a/examples/api/Makefile b/examples/api/Makefile index 5b5f7a6..9b3757c 100644 --- a/examples/api/Makefile +++ b/examples/api/Makefile @@ -71,16 +71,19 @@ all: $(obj).depend $(OUTPUT) ######################################################################### $(OUTPUT): $(OBJS) - $(LD) -Ttext $(LOAD_ADDR) -o $@ $^ -L$(gcclibdir) -lgcc - $(OBJCOPY) -O binary $@ $(OUTPUT).bin 2>/dev/null + @$(XECHO) " LD $@" + $(Q)$(LD) -Ttext $(LOAD_ADDR) -o $@ $^ -L$(gcclibdir) -lgcc + $(Q)$(OBJCOPY) -O binary $@ $(OUTPUT).bin 2>/dev/null # Rule to build generic library C files $(obj)%.o: $(SRCTREE)/lib/%.c - $(CC) -g $(CFLAGS) -c -o $@ $< + @$(XECHO) " CC $@" + $(Q)$(CC) -g $(CFLAGS) -c -o $@ $< # Rule to build architecture-specific library assembly files $(obj)%.o: $(SRCTREE)/arch/$(ARCH)/lib/%.S - $(CC) -g $(CFLAGS) -c -o $@ $< + @$(XECHO) " CC $@" + $(Q)$(CC) -g $(CFLAGS) -c -o $@ $< ######################################################################### diff --git a/examples/standalone/Makefile b/examples/standalone/Makefile index c1dfdce..6b97d00 100644 --- a/examples/standalone/Makefile +++ b/examples/standalone/Makefile @@ -95,17 +95,20 @@ $(LIB): $(obj).depend $(LIBOBJS) $(ELF): $(obj)%: $(obj)%.o $(LIB) - $(LD) -g -Ttext $(STANDALONE_LOAD_ADDR) \ + @$(XECHO) " CC $@" + $(Q)$(LD) -g -Ttext $(STANDALONE_LOAD_ADDR) \ -o $@ -e $(SYM_PREFIX)$(notdir $(<:.o=)) $< $(LIB) \ -L$(gcclibdir) -lgcc $(SREC): $(obj)%.srec: $(obj)% - $(OBJCOPY) -O srec $< $@ 2>/dev/null + @$(XECHO) " OBJCOPY $@" + $(Q)$(OBJCOPY) -O srec $< $@ 2>/dev/null $(BIN): $(obj)%.bin: $(obj)% - $(OBJCOPY) -O binary $< $@ 2>/dev/null + @$(XECHO) " OBJCOPY $@" + $(Q)$(OBJCOPY) -O binary $< $@ 2>/dev/null ######################################################################### diff --git a/tools/Makefile b/tools/Makefile index 97f83f8..121cc62 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -156,28 +156,37 @@ HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \ all: $(obj).depend $(BINS) $(LOGO-y) subdirs -$(obj)bin2header$(SFX): $(obj)bin2header.o - $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ +cmd_host_link = \ + @set -e; \ + $(XECHO) " HOSTCC $@"; \ + $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^; \ $(HOSTSTRIP) $@ +cmd_host_cc_noped = \ + @set -e; \ + $(XECHO) " HOSTCC $@"; \ + $(HOSTCC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $< +cmd_host_cc = \ + @set -e; \ + $(XECHO) " HOSTCC $@"; \ + $(HOSTCC) -g $(HOSTCFLAGS) -c -o $@ $< + +$(obj)bin2header$(SFX): $(obj)bin2header.o + $(cmd_host_link) $(obj)bmp_logo$(SFX): $(obj)bmp_logo.o - $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ - $(HOSTSTRIP) $@ + $(cmd_host_link) $(obj)envcrc$(SFX): $(obj)crc32.o $(obj)env_embedded.o $(obj)envcrc.o $(obj)sha1.o - $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ + $(cmd_host_link) $(obj)gen_eth_addr$(SFX): $(obj)gen_eth_addr.o - $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ - $(HOSTSTRIP) $@ + $(cmd_host_link) $(obj)img2srec$(SFX): $(obj)img2srec.o - $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ - $(HOSTSTRIP) $@ + $(cmd_host_link) $(obj)inca-swap-bytes$(SFX): $(obj)inca-swap-bytes.o - $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ - $(HOSTSTRIP) $@ + $(cmd_host_link) $(obj)mkimage$(SFX): $(obj)crc32.o \ $(obj)default_image.o \ @@ -190,29 +199,26 @@ $(obj)mkimage$(SFX): $(obj)crc32.o \ $(obj)os_support.o \ $(obj)sha1.o \ $(LIBFDT_OBJS) - $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ - $(HOSTSTRIP) $@ + $(cmd_host_link) $(obj)mpc86x_clk$(SFX): $(obj)mpc86x_clk.o - $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ - $(HOSTSTRIP) $@ + $(cmd_host_link) $(obj)ncb$(SFX): $(obj)ncb.o - $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ - $(HOSTSTRIP) $@ + $(cmd_host_link) $(obj)ubsha1$(SFX): $(obj)os_support.o $(obj)sha1.o $(obj)ubsha1.o - $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ + $(cmd_host_link) # Some of the tool objects need to be accessed from outside the tools directory $(obj)%.o: $(SRCTREE)/common/%.c - $(HOSTCC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $< + $(cmd_host_cc_noped) $(obj)%.o: $(SRCTREE)/lib/%.c - $(HOSTCC) -g $(HOSTCFLAGS) -c -o $@ $< + $(cmd_host_cc) $(obj)%.o: $(SRCTREE)/lib/libfdt/%.c - $(HOSTCC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $< + $(cmd_host_cc_noped) subdirs: ifeq ($(TOOLSUBDIRS),) -- 1.7.5.3

1 0

[U-Boot] Reg. CFI flash_init and hardware write protected devices
by Frank Svendsbøe 24 Jun '11

24 Jun '11

We have a board that feature NOR flash and hardware write protection is handled by controlling the write enable pin. When write protection is enabled, the nWE pin is forced high by external logic. The memory controller and/or CFI logic is unaware of this, and since CFI uses write enable as part of the CFI command set, a CFI probing will fail when write protection is enabled. The rationale for controlling nWE and not WP (write protection) is that WP only protects the first sector of the device. In our case this is less than the size of the bootloader (U-boot), since that occupies two sectors. Due to this the built-in NOR write protection is rather useless. Our current solution based on controlling nWE is to hardcode flash geometry in board code when flash protection is enabled. In order to use CFI as intended when write protection is disabled, we call the generic flash_init function as defined in drivers/mtd/cfi_flash.c. When protection is enabled we hardcode the geometry info in board code. In order separate our flash_init and the generic flash_init, and be able to call both, we've introduced a new ifdef to cfi_flash.c called CONFIG_CFI_FLASH_OVERRIDE_INIT. Like this: ---- diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index 6039e1f..772096e 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -176,6 +176,10 @@ u64 flash_read64(void *addr)__attribute__((weak, alias("__flash_read64"))); #define flash_read64 __flash_read64 #endif +#ifdef CONFIG_CFI_FLASH_OVERRIDE_INIT +#define flash_init __flash_init +#endif + /*----------------------------------------------------------------------- */ #if defined(CONFIG_ENV_IS_IN_FLASH) || defined(CONFIG_ENV_ADDR_REDUND) || (CONFIG_SYS_MONITOR_BASE >= ---- Now, in board code our redefined flash_init will be called. But if write protection is off, we call the original function, eg. __flash_init. Using the preprocessor is often considered bad design. However, the alternatives here such as adding a weak attribute to flash_init will not make us able to call the generic/original function. Therefore we consider adding an ifdef as better design than making the function weak, and it'll reduce the amount of redundant code in board code. What do you think about this? Best regards, Frank E. Svendsbøe

4 19

[U-Boot] [PATCH v2 0/6] Add support for pxecfg commands
by Jason Hobbs 24 Jun '11

24 Jun '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. Jason Hobbs (6): cosmetic, main: correct indentation/spacing issues common: add run_command2 for running simple or hush commands common: make abortboot available for menu use Add generic, reusable menu code Add pxecfg command arm: ca9x4_ct_vxp: enable pxecfg support common/Makefile | 2 + common/cmd_pxecfg.c | 924 ++++++++++++++++++++++++++++++++++++++++ common/hush.c | 2 +- common/main.c | 60 ++-- common/menu.c | 338 +++++++++++++++ doc/README.pxecfg | 238 +++++++++++ include/common.h | 7 + include/configs/ca9x4_ct_vxp.h | 5 + include/hush.h | 2 +- include/menu.h | 40 ++ 10 files changed, 1584 insertions(+), 34 deletions(-) create mode 100644 common/cmd_pxecfg.c create mode 100644 common/menu.c create mode 100644 doc/README.pxecfg create mode 100644 include/menu.h

3 13

[U-Boot] [PATCH v2] Add assert() for debug assertions
by Simon Glass 24 Jun '11

24 Jun '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> --- V2: * Changed macros so that all code is compiled even if DEBUG is disabled --- common/dlmalloc.c | 7 ------- include/common.h | 19 +++++++++++++++++++ include/malloc.h | 8 -------- lib/qsort.c | 5 ----- 4 files changed, 19 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..6181e07 100644 --- a/include/common.h +++ b/include/common.h @@ -124,6 +124,25 @@ 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. It does not BUG or halt U-Boot, but tries to + * continue execution in any case. 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 + * BUG-type reset (which may just do the same assertion again). + */ +#define assert(x) \ + ({ if (!(x) && _DEBUG) \ + printf("Assertion failure '%s' %s line %d\n", \ + #x, __FILE__, __LINE__); }) + #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, -- 1.7.3.1

3 4