[U-Boot] make env now requires a configured tree
Hi Grant, make env worked from an unconfigured u-boot tree until aa701b94336b358798d676eef12a7b90bdac23f5; now it requires a config.h to build. For the Debian/Ubuntu u-boot-tools packages, we're shipping fw_printenv/_setenv along other tools built with no particular config as a convenience for Debian/Ubuntu users. It's also used to generate pre-built installation media including u-boot kernel images or environment. Would you please adjust your changes not to require config.h? If that's not possible for all cases, could you include some flag to build with defaults when config.h isn't present? Thanks! -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] Strip fw_printenv like the other tools
Signed-off-by: Loïc Minier l...@debian.org --- tools/env/Makefile |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/env/Makefile b/tools/env/Makefile index 28b73da..07634bc 100644 --- a/tools/env/Makefile +++ b/tools/env/Makefile @@ -41,6 +41,7 @@ all: $(obj)fw_printenv # Some files complain if compiled with -pedantic, use HOSTCFLAGS_NOPED $(obj)fw_printenv: $(HOSTSRCS) $(HEADERS) $(HOSTCC) $(HOSTCFLAGS_NOPED) $(HOSTLDFLAGS) -o $@ $(HOSTSRCS) + $(HOSTSTRIP) $@ clean: rm -f $(obj)fw_printenv -- 1.7.9 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/2] Build u-boot.imx by default when board uses it
On Fri, Nov 11, 2011, Daniel Schwierzeck wrote: ALL-$(CONFIG_UBOOT_IMG) += $(obj)u-boot.img ALL-$(CONFIG_UBOOT_IMX) += $(obj)u-boot.imx ALL-$(CONFIG_UBOOT_KWB) += $(obj)u-boot.kwb then you can define CONFIG_UBOOT_KWB or CONFIG_UBOOT_IMX in your board config if needed That'd be a fine solution for me if others agree it's the right approach; ideally, we would even set CONFIG_UBOOT_IMX when CONFIG_IMX_CONFIG is set (not sure where though). -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/2] Build u-boot.imx by default when board uses it
On Fri, Nov 11, 2011, Aneesh V wrote: arch/arm/cpu/armv7/omap4/config.mk has this: ifdef CONFIG_SPL_BUILD ALL-y += $(OBJTREE)/MLO else ALL-y += $(obj)u-boot.img endif However, this may have to be duplicated in many such config.mk files. Ah I had seen this snippet and wondered why you hadn't put it in spl/Makefile, but now I realize that only the MLO part could go there, and that you don't want to built u-boot.img when building a spl. I don't really mind whether we set these things in some specific .mk files or in Makefile + spl/Makefile; I care that it's consistent and that related things are kept together as to update them together. I guess we can follow the OMAP approach for other boards. -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/2] Build u-boot.imx by default when board uses it
On Thu, Nov 10, 2011, Mike Frysinger wrote: CONFIG_IMX_CONFIG is set in boards.cfg. ugly undocumented CONFIG's are awesome this really should be in a subdir rather than the top level. we want to keep arch/soc-specific cruft out of the top level Makefile if possible. isn't there a sub-config.mk somewhere you could add the line unconditionally ? Can't see one, but Aneesh proposes the OMAP approach of arch/arm/cpu/**/config.mk files. The CONFIG_IMX_CONFIG actually changes per-board, so the boards.cfg approach to set it seems ok; however we could try defining the u-boot.imx rule in a common i.MX makefile snippet somewhere. Perhaps arch/arm/cpu/armv7/config.mk or arch/arm/cpu/armv7/mx5/Makefile, or a new file; I don't have a strong opinion. -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Improve default make targets (ALL-y)
On Thu, Nov 10, 2011, Tom Rini wrote: Any omap3/omap4/omap5/am335x where you generate MLO you want u-boot.img rather than u-boot.bin, even for panda iirc. Thanks for the hint; I'll follow that rule for OMAP3/OMAP4 boards we build in Debian ATM; Aneesh pointed at the Makefile snippet which adds u-boot.img on omap3 and omap4 platforms, sounds good to me. There are other architectures where it's less obvious: Debian architecture board target -- avr32 hammerhead u-boot.img i386eNETu-boot.bin mipsel dbau1100u-boot.img mipsqemu_mips u-boot.img powerpc ZUMAu-boot.img sh4 r2dplus u-boot.img sh4 sh7785lcr_32bit u-boot.img sparc gr_xc3s_1500u-boot.img I didn't check for each of the single boards above, I wonder whether I can tell from the u-boot source code (if it's correct) whether indeed u-boot.img or u-boot.bin is the correct binary to ship for that board. [ Ideally, make would also build the right one, or perhaps make install or some other special target which represents the final deliverables for that board. ] -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Improve default make targets (ALL-y)
On Fri, Nov 11, 2011, Mike Frysinger wrote: - ignore: u-boot u-boot.{map,lds,srec,ihex} - if there is a file other than u-boot.bin, you probably want that - otherwise, you want u-boot.bin These are decent rules; plus SPL files I guess, and perhaps DTB versions. What did you think of some kind of install or dist rule? -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/2] Build u-boot.kwb by default when board uses it
Signed-off-by: Loïc Minier loic.min...@linaro.org --- Makefile |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 0ccc3bf..be9fadf 100644 --- a/Makefile +++ b/Makefile @@ -369,6 +369,10 @@ ifneq ($(CONFIG_IMX_CONFIG),) ALL-y += $(obj)u-boot.imx endif +ifneq ($(CONFIG_SYS_KWD_CONFIG),) +ALL-y += $(obj)u-boot.kwb +endif + all: $(ALL-y) $(SUBDIR_EXAMPLES) $(obj)u-boot.dtb: $(obj)u-boot -- 1.7.7.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/2] Build u-boot.imx by default when board uses it
Signed-off-by: Loïc Minier loic.min...@linaro.org --- Makefile |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 294c762..0ccc3bf 100644 --- a/Makefile +++ b/Makefile @@ -365,6 +365,10 @@ ALL-$(CONFIG_MMC_U_BOOT) += $(obj)mmc_spl/u-boot-mmc-spl.bin ALL-$(CONFIG_SPL) += $(obj)spl/u-boot-spl.bin ALL-$(CONFIG_OF_SEPARATE) += $(obj)u-boot.dtb $(obj)u-boot-dtb.bin +ifneq ($(CONFIG_IMX_CONFIG),) +ALL-y += $(obj)u-boot.imx +endif + all: $(ALL-y) $(SUBDIR_EXAMPLES) $(obj)u-boot.dtb: $(obj)u-boot -- 1.7.7.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Improve default make targets (ALL-y)
Hey For the Debian package, we currently maintain lists like: dbau1100u-boot.img dockstaru-boot.kwb eNETu-boot.bin efikamx u-boot.imx omap4_panda MLO u-boot.bin [...] for two reasons: - because we need to call make u-boot.kwb explicitly to get it built - to list the files from the obj-dir that we actually want in the .deb it would be nicer for the packaging, but I guess also for u-boot maintainers, if these files were just generated by default when one calls make. The subsequent patches will generate u-boot.imx and u-boot.kwb when it's obvious that these are desired. However, I didn't manage to find hints in the u-boot tree on when u-boot.img should be generated, and when u-boot.bin is enough; apparently one can mkimage -T firmware for any board config. Ideas welcome on how to detect these. Thanks, -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/2] Build u-boot.imx by default when board uses it
On Thu, Nov 10, 2011, Mike Frysinger wrote: +ifneq ($(CONFIG_IMX_CONFIG),) +ALL-y += $(obj)u-boot.imx +endif why won't this work: ALL-$(CONFIG_IMX_CONFIG) += $(obj)u-boot.mix that was the point of naming it ALL-y in the first place ... That's what I tried at first, but CONFIG_IMX_CONFIG is actually the name of the config file to pass to mkimage; same for u-boot.kwb. CONFIG_IMX_CONFIG is set in boards.cfg. -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 3/3] image: Allow images to indicate they're loadable at any address
On Mon, Nov 07, 2011, Simon Glass wrote: How can we give U-Boot what it wants, which is apparently the ability to decompress the kernel itself and arrange everything in memory at the right place? Wolfgang complains that patches to do this have been repeatedly rejected in the kernel. If this is the FIT image, how about adding a 'fitImage' make target? Looking at this thread from the point of view of distributions (e.g. Debian/Fedora/Ubuntu etc.), I see some integration disadvantages in the FIT image approach and to uImage in general. The format itself is nice and handy, but in an ideal world a distribution would provide a SoC-agnostic image, and even a bootloader-agnostic image. Currently, what Debian and Ubuntu do (didn't check Fedora) is: * ship zImage files (vmlinuz-*) in kernel .deb packages * when kernels or initrd related files are installed, generate: - uImage from the right vmlinuz file with the exact load value - an initrd.gz with initramfs-tools, then an uInitrd from it - a boot script for that board, then a boot.scr from it which is an U-Boot script in uImage format This is painful in at least these ways: a) images are not board-agnostic or even bootloader agnostic (I'd love if a single SD card image would boot on multiple OMAP3 boards, or on OMAP3 and OMAP4, or on i.MX51, i.MX53, OMAP3 and OMAP4, whether the firmware uses U-Boot or is just a boot ROM, or UEFI or whatever) b) distributors keep track of load addresses for uImage/uInitrd/boot.scr as to generate correct uImages c) this wastes space for multiple copies of the boot files (uImage + uInitrd + boot.scr + vmlinuz + initrd.gz) I can see how the proposal to use relative load addresses or to set -1 as load address in uImage help with some of the above, but for sure c) will remain a hard issue with FIT images as some distributors will keep generating an initrd when various packages get installed (e.g. for LVM or mdadm support, or encrypted root etc.). There are advantages to the uImage format such as usage in flash, or choice of compression type (whatever you stuff into it), and these remain valid in other use cases, but it seems sensible to support vmlinuz directly from U-Boot to support a more generic distro image boot protocol. Personally, I also like the separation of layers so that vmlinuz is kept opaque; for instance vmlinuz can embed an initrd or a DTB without the bootloader having to care about them, or it could be compressed with LZO or bzip2 even if the bootloader in firmware doesn't support this or that compression type. I think distros would prefer not using these features and having a DTB-aware bootloader though. -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 1/3] image: Make image_get_fdt work like image_get_{ram_disk, kernel}
On Sat, Nov 05, 2011, Marek Vasut wrote: this patchset is good and all, but can we not also introduce cmd_zload to load zImages? Wolfgang, today's ARM hardware will really benefit from that, uImage holds us back a lot these days. Other option is to extend cmd_bootm() to load zImages. Other architectures like x86 and sh seem to use zboot, perhaps we should stick to zboot for all architectures rather than introducing bootm -z or bootz? AFAIK the file formats are slightly different per architecture, but the U-Boot cmdline usage would be the same. -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Fix make tools without a config
Hi This series fixes make tools when u-boot isn't configured which regressed recently (with timestamp_generated.h and ublimage support). This is used in e.g. Debian/Ubuntu to provide a board-independent mkimage. Cheers, -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 3/3] ublimage: NAND block size isn't set at build-time
mkimage's ublimage support can't depend of build-time board configs; instead, this should be set in ublimage.cfg. Since currently no configs in u-boot override the NAND block size, hardcode it as such in ublimage.h to fix a build failure with make tools: gcc [...] -o ublimage.o ublimage.c -c In file included from ublimage.c:37:0: ublimage.h:31:20: fatal error: config.h: No such file or directory Cc: Heiko Schocher h...@denx.de Cc: patc...@linaro.org Signed-off-by: Loïc Minier loic.min...@linaro.org --- tools/ublimage.h | 11 --- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/tools/ublimage.h b/tools/ublimage.h index c926689..93ec8ee 100644 --- a/tools/ublimage.h +++ b/tools/ublimage.h @@ -28,12 +28,6 @@ #ifndef _UBLIMAGE_H_ #define _UBLIMAGE_H_ -#include config.h - -#if !defined(CONFIG_SYS_UBL_BLOCK) -#define CONFIG_SYS_UBL_BLOCK 512 -#endif - enum ublimage_cmd { CMD_INVALID, CMD_BOOT_MODE, @@ -71,6 +65,9 @@ enum ublimage_fld_types { /* Define max UBL image size */ #define UBL_IMAGE_SIZE (0x3800u) +/* one NAND block */ +#define UBL_BLOCK_SIZE 512 + /* from sprufg5a.pdf Table 109 */ struct ubl_header { uint32_tmagic; /* Magic Number, see UBL_* defines */ @@ -97,7 +94,7 @@ struct ubl_header { * Magic Number indicates fast EMIF boot). */ /* to fit in one nand block */ - unsigned char res[CONFIG_SYS_UBL_BLOCK - 8 * 4]; + unsigned char res[UBL_BLOCK_SIZE - 8 * 4]; }; #endif /* _UBLIMAGE_H_ */ -- 1.7.5.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/3] Safer timestamp_autogenerated.h generation
Generate timestamp_autogenerated.h as safely as version_autogenerated.h. Cc: patc...@linaro.org Signed-off-by: Loïc Minier loic.min...@linaro.org --- Makefile |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0892908..2991357 100644 --- a/Makefile +++ b/Makefile @@ -568,8 +568,9 @@ $(VERSION_FILE): $(TIMESTAMP_FILE): @mkdir -p $(dir $(TIMESTAMP_FILE)) - @LC_ALL=C date +'#define U_BOOT_DATE %b %d %C%y' $@ - @LC_ALL=C date +'#define U_BOOT_TIME %T' $@ + @LC_ALL=C date +'#define U_BOOT_DATE %b %d %C%y' $@.tmp + @LC_ALL=C date +'#define U_BOOT_TIME %T' $@.tmp + @cmp -s $@ $@.tmp rm -f $@.tmp || mv -f $@.tmp $@ easylogo env gdb: $(MAKE) -C tools/$@ all MTD_VERSION=${MTD_VERSION} -- 1.7.5.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/3] Build timestamp_autogenerated.h without config
Tools such as mkimage include version information but are config-agnostic; build timestamp_autogenerated.h even when config.mk isn't generated to fix make tools build failure: gcc [...] -o mkimage.o mkimage.c -c In file included from include/version.h:27:0, from mkimage.c:26: include/timestamp.h:27:37: fatal error: timestamp_autogenerated.h: No such file or directory Cc: patc...@linaro.org Signed-off-by: Loïc Minier loic.min...@linaro.org --- Makefile | 19 ++- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 77140eb..0892908 100644 --- a/Makefile +++ b/Makefile @@ -141,7 +141,7 @@ SUBDIRS = tools \ examples/standalone \ examples/api -.PHONY : $(SUBDIRS) $(VERSION_FILE) +.PHONY : $(SUBDIRS) $(VERSION_FILE) $(TIMESTAMP_FILE) ifeq ($(obj)include/config.mk,$(wildcard $(obj)include/config.mk)) @@ -294,7 +294,7 @@ LIBS += $(CPUDIR)/s5p-common/libs5p-common.o endif LIBS := $(addprefix $(obj),$(sort $(LIBS))) -.PHONY : $(LIBS) $(TIMESTAMP_FILE) +.PHONY : $(LIBS) LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).o LIBBOARD := $(addprefix $(obj),$(LIBBOARD)) @@ -453,10 +453,6 @@ $(obj)mmc_spl/u-boot-mmc-spl.bin: mmc_spl $(obj)spl/u-boot-spl.bin: depend $(MAKE) -C spl all -$(TIMESTAMP_FILE): - @LC_ALL=C date +'#define U_BOOT_DATE %b %d %C%y' $@ - @LC_ALL=C date +'#define U_BOOT_TIME %T' $@ - updater: $(MAKE) -C tools/updater all @@ -547,12 +543,12 @@ $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s: $(obj)include/autoconf.mk.dep else # !config.mk all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \ $(obj)u-boot.img $(obj)u-boot.dis $(obj)u-boot \ -$(filter-out tools,$(SUBDIRS)) $(TIMESTAMP_FILE) \ +$(filter-out tools,$(SUBDIRS)) \ updater depend dep tags ctags etags cscope $(obj)System.map: @echo System not configured - see README 2 @ exit 1 -tools: $(VERSION_FILE) +tools: $(VERSION_FILE) $(TIMESTAMP_FILE) $(MAKE) -C $@ all endif # config.mk @@ -570,11 +566,16 @@ $(VERSION_FILE): '$(shell $(LD) -v | head -n 1)' ) $@.tmp @cmp -s $@ $@.tmp rm -f $@.tmp || mv -f $@.tmp $@ +$(TIMESTAMP_FILE): + @mkdir -p $(dir $(TIMESTAMP_FILE)) + @LC_ALL=C date +'#define U_BOOT_DATE %b %d %C%y' $@ + @LC_ALL=C date +'#define U_BOOT_TIME %T' $@ + easylogo env gdb: $(MAKE) -C tools/$@ all MTD_VERSION=${MTD_VERSION} gdbtools: gdb -tools-all: easylogo env gdb $(VERSION_FILE) +tools-all: easylogo env gdb $(VERSION_FILE) $(TIMESTAMP_FILE) $(MAKE) -C tools HOST_TOOLS_ALL=y .PHONY : CHANGELOG -- 1.7.5.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ARM: versatile: fix board support
On Thu, Aug 04, 2011, Albert ARIBAUD wrote: Does this mean Stefano's patch will see a V2, or should I try and apply it as-is? I personally think you should merge it as it makes it work again for Stefano and the board builds again; I guess I should look into the toolchain issue I'm seeing and which I bet others will see in the future too, but I didn't get to that so far. -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ARM: versatile: fix board support
On Fri, Jun 24, 2011, stefano babic wrote: I do not know if depends on the compiler (search in the mailing list against problem with gcc 4.5+). I tested with ELDK-4.2, that means gcc 4.2.2. I tried with arm-linux-gnueabi-gcc-4.5 and arm-linux-gnueabi-gcc-4.4 and using your qemu-system-arm command line, but didn't have more luck than with arm-linux-gnueabi-gcc-4.6. I'll try gdbing into this -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ARM: versatile: fix board support
On Fri, Jul 01, 2011, Stefano Babic wrote: Do you mean the versatile or the vexpress board ? I get the vexpress working, but only mapping the RAM to the address 0 and not to the correct address (0x6000). This only because qemu maps 64MB starting from address 0 as RAM. However, setting the real physical address for SDRAM it does not work - maybe this a qemu related issue ? Vexpress works for me out of the box (not changing any code outside of the QEMU config patch I've sent); the versatile work doesn't work at all, I don't get any serial output. -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [STATUS] v2011.06 release, Merge Window is OPEN
On Tue, Jun 28, 2011, Wolfgang Denk wrote: - The cleanup after the reorganization of the ARM code has not been completed yet. At the moment, approapprox, 100+ ARM boards are *broken* and *do not compile*. Board maintainers or other interested parties are requested to adapt their boards within the current merge window. All boards that have not been fixed within the first week of the merge window are considered unmaintained and without interest to the community and will be removed. It's funny how this reminds me of package build failures in Debian; in such cases, we start by publishing the list of affected packages ideally with links to build logs and the name of corresponding maintainers. After a while, we actually start Cc:ing the maintainers or filing bug reports against each failing package. Would it make sense to publish such a list of broken boards and corresponding maintainers? (Maybe some makeall + scripts magic?) This is a sample list of Debian packages not declaring the upstream Homepage properly: http://lists.debian.org/debian-devel/2011/02/msg00367.html -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ARM: versatile: fix board support
On Fri, Jun 24, 2011, Stefano Babic wrote: Versatile board is used as example to run u-boot under qemu. The patch fixes relocation for all versatile boards and adds a versatileqemu target to be used under qemu. Thanks a lot! Patch tested only under qemu, not on real boards. Tested with QEMU emulator version 0.14.50. I've built u-boot tip with your patch with: make CROSS_COMPILE=arm-linux-gnueabi- O=$PWD/obj-versatileqemu \ versatileqemu_config make CROSS_COMPILE=arm-linux-gnueabi- O=$PWD/obj-versatileqemu -j3 using the Ubuntu (Linaro-based, 4.6.0-14ubuntu1cross1.52) armel cross-compiler but couldn't get this to start with my incantations of: qemu-system-arm -M versatilepb -kernel obj-versatileqemu/u-boot \ -m 128 -serial stdio and other combinations I've tried However, inspired by your changes I added these changes: --- a/boards.cfg +++ b/boards.cfg @@ -138,6 +138,7 @@ omap5912osk arm arm926ejs - ti edminiv2 arm arm926ejs - LaCie orion5x dkb arm arm926ejs - Marvellpantheon ca9x4_ct_vxp arm armv7 vexpressarmltd +qemuvexpressa9 arm armv7 vexpress armltd - ca9x4_ct_vxp:ARCH_QEMU_VEXPRESS efikamx arm armv7 efikamx - mx5mx51evk:IMX_CONFIG=board/efikamx/imximage.cfg mx51evk arm armv7 mx51evk freescale mx5 mx51evk:IMX_CONFIG=board/freescale/mx51evk/imximage.cfg mx53evk arm armv7 mx53evk freescale mx5 mx53evk:IMX_CONFIG=board/freescale/mx53evk/imximage.cfg --- a/include/configs/ca9x4_ct_vxp.h +++ b/include/configs/ca9x4_ct_vxp.h @@ -148,6 +148,12 @@ cp ${initrdaddr} ${initrd} ${maxinitrd}; \ bootm ${kerneladdr} ${initrd}\0 +#ifdef CONFIG_ARCH_QEMU_VEXPRESS +#define CONFIG_ENV_SIZE8192 +#define CONFIG_SYS_NO_FLASH +#define CONFIG_ENV_IS_NOWHERE +#define CONFIG_SYS_MONITOR_LEN 0x8 +#else /* FLASH and environment organization */ #define PHYS_FLASH_SIZE0x0400 /* 64MB */ #define CONFIG_SYS_FLASH_CFI 1 @@ -187,6 +193,7 @@ #define CONFIG_SYS_FLASH_EMPTY_INFO/* flinfo indicates empty blocks */ #define CONFIG_SYS_FLASH_BANKS_LIST{ CONFIG_SYS_FLASH_BASE0, \ CONFIG_SYS_FLASH_BASE1 } +#endif /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ and built with: make CROSS_COMPILE=arm-linux-gnueabi- O=$PWD/obj-qemuvexpressa9 \ qemuvexpressa9_config make CROSS_COMPILE=arm-linux-gnueabi- O=$PWD/obj-qemuvexpressa9 -j3 \ $PWD/obj-qemuvexpressa9/u-boot and this started fine with: qemu-system-arm -M vexpress-a9 -kernel obj-qemuvexpressa9/u-boot \ -m 1024 -serial stdio I wonder whether it would make sense to use the same ifdef for versatile and vexpress boards (QEMU_NO_FLASH?) and prefix the board names with qemu; e.g. qemu_versatile_foo? Could you share your recipe for getting the versatileqemu config to start? I'm using Ubuntu's qemu (Linaro-based, 0.14.50-2011.06-0-0ubuntu1). -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/3] ARM: don't panic if no flash is there
Would it be possible to introduce a QEMU Versatile board in U-Boot derived from the regular Versatile board's config? It would disable the things that aren't (yet) supported in QEMU or too painful to support. -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] Only build fw_printenv if we have mtd/mtd-user.h
On Tue, Apr 12, 2011, Wolfgang Denk wrote: I understand thi is just a RFC, not a patch (yet) intended for inclusion? [In that case it would miss your SoB line...] Correct! was just a RFC (albeit I did include it in the Debian packaging for now, until we have an upstreamable way of doing it) How about this approach? If it's ok, then I could extend it to handle the MTD_VERSION=old case as well, perhaps replacing this MTD_VERSION with a test for linux/mtd/mtd.h. I'm fine with that. Thanks! Ok, will resubmit; thanks for the comment :-) I'll likely replace MTD_OLD with similar logic and hence avoid passing it down; it will just be autodetected. -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] Fix typo in #error: IS_IN_NOWHERE vs. IS_NOWHERE
Signed-off-by: Loïc Minier loic.min...@linaro.org --- common/cmd_nvedit.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index fb69c24..c9ee3ed 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -65,7 +65,7 @@ DECLARE_GLOBAL_DATA_PTR; !defined(CONFIG_ENV_IS_IN_SPI_FLASH)\ !defined(CONFIG_ENV_IS_NOWHERE) # error Define one of CONFIG_ENV_IS_IN_{EEPROM|FLASH|DATAFLASH|ONENAND|\ -SPI_FLASH|MG_DISK|NVRAM|MMC|NOWHERE} +SPI_FLASH|MG_DISK|NVRAM|MMC} or CONFIG_ENV_IS_NOWHERE #endif #define XMK_STR(x) #x -- 1.7.4.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RFC PATCH 1/2] armv7: enable Thumb build for armv7
On Tue, Mar 15, 2011, Aneesh V wrote: Please note that I am enabling armv7-a in the second patch in omap4 config.mk file. The reason I didn't do this here was some ARMv7 SoCs do not want to use -march=armv7-a even if the compiler supports it. Tegra2 is an example. Please see the below from Tegra2 config.mk: # Use ARMv4 for Tegra2 - initial code runs on the AVP, which is an ARM7TDI. PLATFORM_CPPFLAGS += -march=armv4 Good point, I wonder whether it would make sense to have arch/arm/cpu/armv7/config.mk default to -march=armv7 and Tegra2 to override this with -march=armv4. Maybe this code doesn't belong under armv7 though; or perhaps -march=armv4 should only be set when building a subset of the files rather than by default. This being the case I would have had to define another CONFIG flag if I had to add -march=armv7-a in arch/arm/cpu/armv7/config.mk. I thought it un-necessary and instead put it in the SoC specific file. So, Tegra2 can continue to use -march=armv4 and will get Thumb-1 if they enable CONFIG_SYS_THUMB_BUILD. Or do you think we should define something like CONFIG_SYS_MARCH_ARMV7 Up to you, but I would expect that code udner arch/arm/cpu/armv7/ would build with -march=armv7 (maybe not -a though), with specific overrides where that's not the case; it would feel a bit odd to me to have this as a config option. -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RFC PATCH 1/2] armv7: enable Thumb build for armv7
On Mon, Mar 14, 2011, Aneesh V wrote: +- ARM Options: + CONFIG_SYS_THUMB_BUILD + + Use this flag to build U-Boot using the Thumb instruction + set for ARM architectures. Thumb instruction set provides + better code density. For ARM architectures that support + Thumb2 this flag will result in Thumb2 code generated by + GCC. + - Linux Kernel Interface: CONFIG_CLOCKS_IN_MHZ The above README changes suggest that Thumb-1 would also be possible but you patch an armv7 file: --- a/arch/arm/cpu/armv7/config.mk +++ b/arch/arm/cpu/armv7/config.mk so I suspect only armv7 CPUs would be affected? Consider patching arch/arm/config.mk instead which is where -marm is currently set: # Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb: PLATFORM_CPPFLAGS += $(call cc-option,-marm,) In fact, I would find it less confusing if the flags were -mthumb or -marm and never -marm -mthumb, so you probably want to patch the code setting -marm above to be in your else clause. @@ -31,3 +31,8 @@ PLATFORM_CPPFLAGS += -march=armv5 This suggests that u-boot is actually built in ARMv5 mode, which means we're missing out actual Thumb-2 instructions (v6+). Perhaps arch/arm/cpu/armv7/config.mk should also $(call cc-option,-march=armv7). (I've never used -march=armv7 but it seems to exist and is probably more correct than -march=armv7-a). # = PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,\ $(call cc-option,-malignment-traps,)) + +ifeq ($(CONFIG_SYS_THUMB_BUILD),y) +# Enable Thumb mode build if compiler supports it +PLATFORM_CPPFLAGS += $(call cc-option,-mthumb -mthumb-interwork) +endif -- 1.7.0.4 -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] eNET / x86 build fails with ld: -r and -shared may not be used together
Hi Since 2011.03-rc1, the eNET / x86 build fails with: [...] ld --cref -pic --emit-relocs -Bsymbolic -Bsymbolic-functions --cref -pic --emit-relocs -Bsymbolic -Bsymbolic-functions -r -o /build/buildd-u-boot_2011.03~rc1-1-i386-1CnrCx/u-boot-2011.03~rc1/debian/build/eNET/examples/standalone/libstubs.o /build/buildd-u-boot_2011.03~rc1-1-i386-1CnrCx/u-boot-2011.03~rc1/debian/build/eNET/examples/standalone/stubs.o ld: -r and -shared may not be used together https://buildd.debian.org/fetch.cgi?pkg=u-bootver=2011.03~rc1-1arch=i386stamp=1296819667file=log This sounds similar to the ARM failure, but -pie isn't used here. Thanks, -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] eNET / x86 build fails with ld: -r and -shared may not be used together
On Wed, Feb 09, 2011, Graeme Russ wrote: This has been fixed in the latest x86 patch series sent to the list Great! I had flagged this patch series, but for some reason I thought this had been merged already. I had checked the u-boot-x86.git tree before reporting this to the mailing-list, but it only had patches from October. Is there another git tree where you usually stage your series? Thanks! -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] eNET / x86 build fails with ld: -r and -shared may not be used together
FTR, the patch I picked for the Debian package was: x86: Align config.mk and linker scripts with other arches -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Can't build dbau1x00 anymore
On Tue, Feb 08, 2011, Thomas Lange wrote: See patch from daniel.schwierz...@googlemail.com sent 2011-02-03. Aha, I'll try with 17a990b55008fd79636e4880d9d10b7172ca87ce from u-boot-mips.git which seems to be the V2 of the patch (removing board/dbau1x00/flash.c entirely) Thanks! -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] kfreebsd build failure - fw_env.c:43:27: error: mtd/mtd-user.h: No such file or directory
Hey make tools-all fails under Debian kfreebsd-amd64 and -i386 due to the lack of MTD headers: make[2]: Entering directory `/build/buildd-u-boot_2010.12-2-kfreebsd-i386-yWW1BA/u-boot-2010.12/tools/env' gcc -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -idirafter /build/buildd-u-boot_2010.12-2-kfreebsd-i386-yWW1BA/u-boot-2010.12/include -idirafter /build/buildd-u-boot_2010.12-2-kfreebsd-i386-yWW1BA/u-boot-2010.12/include2 -idirafter /build/buildd-u-boot_2010.12-2-kfreebsd-i386-yWW1BA/u-boot-2010.12/include -DUSE_HOSTCC -o fw_printenv crc32.c fw_env.c fw_env_main.c fw_env.c:43:27: error: mtd/mtd-user.h: No such file or directory [...] https://buildd.debian.org/fetch.cgi?pkg=u-bootarch=kfreebsd-i386ver=2010.12-2stamp=1295512921file=logas=raw I didn't find any MTD header in the kfreebsd package. Would someone know whether this is supposed to build under freebsd? If not, does it make sense to ifdef out the MTD uses in fw_env.c? (I think it's also possible to interact with real files containing the environment.) If not, I guess this should be removed from tools-all is mtd/mtd-user.h isn't found; is there any recommendation in doing this? Cheers, -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Can't build dbau1x00 anymore
/drivers/usb/phy/libusb_phy.o /build/buildd-u-boot_2010.12-2-mipsel-Q8UfBj/u-boot-2010.12/debian/build/dbau1100/drivers/video/libvideo.o /build/buildd-u-boot_2010.12-2-mipsel-Q8UfBj/u-boot-2010.12/debian/build/dbau1100/drivers/watchdog/libwatchdog.o /build/buildd-u-boot_2010.12-2-mipsel-Q8UfBj/u-boot-2010.12/debian/build/dbau1100/fs/cramfs/libcramfs.o /build/buildd-u-boot_2010.12-2-mipsel-Q8UfBj/u-boot-2010.12/debian/build/dbau1100/fs/ext2/libext2fs.o /build/buildd-u-boot_2010.12-2-mipsel-Q8UfBj/u-boot-2010.12/debian/build/dbau1100/fs/fat/libfat.o /build/buildd-u-boot_2010.12-2-mipsel-Q8UfBj/u-boot-2010.12/debian/build/dbau1100/fs/fdos/libfdos.o /build/buildd-u-boot_2010.12-2-mipsel-Q8UfBj/u-boot-2010.12/debian/build/dbau1100/fs/jffs2/libjffs2.o /build/buildd-u-boot_2010.12-2-mipsel-Q8UfBj/u-boot-2010.12/debian/build/dbau1100/fs/reiserfs/libreiserfs.o /build/buildd-u-boot_2010.12-2-mipsel-Q8UfBj/u-boot-2010.12/debian/build/dbau1100/fs/ubifs/libubifs.o /build/buildd-u-boot_2010.12-2-mipsel-Q8UfBj/u-boot-2010.12/debian/build/dbau1100/fs/yaffs2/libyaffs2.o /build/buildd-u-boot_2010.12-2-mipsel-Q8UfBj/u-boot-2010.12/debian/build/dbau1100/lib/libfdt/libfdt.o /build/buildd-u-boot_2010.12-2-mipsel-Q8UfBj/u-boot-2010.12/debian/build/dbau1100/lib/libgeneric.o /build/buildd-u-boot_2010.12-2-mipsel-Q8UfBj/u-boot-2010.12/debian/build/dbau1100/lib/lzma/liblzma.o /build/buildd-u-boot_2010.12-2-mipsel-Q8UfBj/u-boot-2010.12/debian/build/dbau1100/lib/lzo/liblzo.o /build/buildd-u-boot_2010.12-2-mipsel-Q8UfBj/u-boot-2010.12/debian/build/dbau1100/net/libnet.o /build/buildd-u-boot_2010.12-2-mipsel-Q8UfBj/u-boot-2010.12/debian/build/dbau1100/post/libpost.o | sed -n -e 's/.*\(__u_boot_cmd_.*\)/-u\1/p'|sort|uniq`; cd /build/buildd-u-boot_2010.12-2-mipsel-Q8UfBj/u-boot-2010.12/debian/build/dbau1100 ld -Bstatic -T /build/buildd-u-boot_2010.12-2-mipsel-Q8UfBj/u-boot-2010.12/debian/build/dbau1100/u-boot.lds -G 0 -static -n -nostdlib -Ttext 0xbfc0 $UNDEF_SYM arch/mips/cpu/start.o --start-group api/libapi.o arch/mips/cpu/libmips.o arch/mips/lib/libmips.o common/libcommon.o disk/libdisk.o drivers/bios_emulator/libatibiosemu.o drivers/block/libblock.o drivers/dma/libdma.o drivers/fpga/libfpga.o drivers/gpio/libgpio.o drivers/hwmon/libhwmon.o drivers/i2c/libi2c.o drivers/input/libinput.o drivers/misc/libmisc.o drivers/mmc/libmmc.o drivers/mtd/libmtd.o drivers/mtd/nand/libnand.o drivers/mtd/onenand/libonenand.o drivers/mtd/spi/libspi_flash.o drivers/mtd/ubi/libubi.o drivers/net/libnet.o drivers/net/phy/libphy.o drivers/pci/libpci.o drivers/pcmcia/libpcmcia.o drivers/power/libpower.o drivers/rtc/librtc.o drivers/serial/libserial.o drivers/spi/libspi.o drivers/twserial/libtws.o drivers/usb/gadget/libusb_gadget.o drivers/usb/host/libusb_host.o drivers/usb/musb/libusb_musb.o drivers/usb/phy/libusb_phy.o drivers/video/libvideo.o drivers/watchdog/libwatchdog.o fs/cramfs/libcramfs.o fs/ext2/libext2fs.o fs/fat/libfat.o fs/fdos/libfdos.o fs/jffs2/libjffs2.o fs/reiserfs/libreiserfs.o fs/ubifs/libubifs.o fs/yaffs2/libyaffs2.o lib/libfdt/libfdt.o lib/libgeneric.o lib/lzma/liblzma.o lib/lzo/liblzo.o net/libnet.o post/libpost.o board/dbau1x00/libdbau1x00.o --end-group -L /usr/lib/gcc/mipsel-linux-gnu/4.4.5 -lgcc -Map u-boot.map -o u-boot board/dbau1x00/libdbau1x00.o: In function `flash_init': /build/buildd-u-boot_2010.12-2-mipsel-Q8UfBj/u-boot-2010.12/board/dbau1x00/flash.c:34: multiple definition of `flash_init' drivers/mtd/libmtd.o:/build/buildd-u-boot_2010.12-2-mipsel-Q8UfBj/u-boot-2010.12/drivers/mtd/cfi_flash.c:2027: first defined here board/dbau1x00/libdbau1x00.o: In function `write_buff': /build/buildd-u-boot_2010.12-2-mipsel-Q8UfBj/u-boot-2010.12/board/dbau1x00/flash.c:40: multiple definition of `write_buff' drivers/mtd/libmtd.o:/build/buildd-u-boot_2010.12-2-mipsel-Q8UfBj/u-boot-2010.12/drivers/mtd/cfi_flash.c:1247: first defined here ld: Warning: /usr/lib/gcc/mipsel-linux-gnu/4.4.5/libgcc.a(_lshrdi3.o) uses hard float, u-boot uses soft float ld: Warning: /usr/lib/gcc/mipsel-linux-gnu/4.4.5/libgcc.a(_ashldi3.o) uses hard float, u-boot uses soft float make[1]: *** [/build/buildd-u-boot_2010.12-2-mipsel-Q8UfBj/u-boot-2010.12/debian/build/dbau1100/u-boot] Error 1 The soft-float/hard-float stuff is just a warning; I'm not sure what broke this -- Cc:ing Thomas Lange, the board's maintainer, in case he has an idea Thanks, -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] kfreebsd build failure - fw_env.c:43:27: error: mtd/mtd-user.h: No such file or directory
On Mon, Feb 07, 2011, Wolfgang Denk wrote: If not, I guess this should be removed from tools-all is mtd/mtd-user.h isn't found; is there any recommendation in doing this? Even if you are building in a *BSD environment, you could still be building for a Linux target system. After all, the fw_env.* tools are target tools, which should not depend on the host environment. Yes; I mean if this target header is not found (if you're cross-building, you should have the headers for your target) (BTW, some tools are kind of both host and target tools, like mkimage which might be used during the build but are also interesting to build for the target architecture. Ideally when cross-compiling these should be built twice, but I realize it's a pain to implement) -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] Only build fw_printenv if we have mtd/mtd-user.h
mtd/mtd-user.h is missing on FreeBSD hosts; add a macro to test whether a specific host header is present and use it to decide to build fw_printenv if mtd/mtd-user.h is present. --- How about this approach? If it's ok, then I could extend it to handle the MTD_VERSION=old case as well, perhaps replacing this MTD_VERSION with a test for linux/mtd/mtd.h. I would have preferred putting this in /Makefile to disable the make -C tools/env altogether, but config.mk isn't included by default so HOSTCC isn't available for the test. tools/env/Makefile | 11 +++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/tools/env/Makefile b/tools/env/Makefile index 2f7a59c..294bb95 100644 --- a/tools/env/Makefile +++ b/tools/env/Makefile @@ -36,7 +36,18 @@ ifeq ($(MTD_VERSION),old) HOSTCPPFLAGS += -DMTD_OLD endif +# macro to check whether a host header is present; outputs 1 if present, 0 if +# not +check_include = $(shell echo | $(HOSTCC) $(HOSTCFLAGS_NOPED) -E -include $(1) -o /dev/null - 2/dev/null echo 1 || echo 0) + +# whether to build tools/env or not +has_mtd_user := $(call check_include, mtd/mtd-user.h) + +ifeq ($(has_mtd_user),1) all: $(obj)fw_printenv +else +all: +endif # Some files complain if compiled with -pedantic, use HOSTCFLAGS_NOPED $(obj)fw_printenv: $(HOSTSRCS) $(HEADERS) -- 1.7.2.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] EfikaMX: switch to MACH_TYPE_MX51_EFIKAMX
Upstream linux moved from MACH_TYPE_MX51_LANGE51 to MACH_TYPE_MX51_EFIKAMX. --- board/efikamx/efikamx.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/board/efikamx/efikamx.c b/board/efikamx/efikamx.c index 4efbeaf..f735260 100644 --- a/board/efikamx/efikamx.c +++ b/board/efikamx/efikamx.c @@ -621,7 +621,7 @@ int board_early_init_f(void) int board_init(void) { - gd-bd-bi_arch_number = MACH_TYPE_MX51_LANGE51; + gd-bd-bi_arch_number = MACH_TYPE_MX51_EFIKAMX; gd-bd-bi_boot_params = PHYS_SDRAM_1 + 0x100; return 0; -- 1.7.2.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] Fix misc spelling errors found by lintian
--- arch/arm/cpu/arm920t/at91rm9200/ether.c |2 +- arch/sparc/cpu/leon2/cpu_init.c |4 ++-- arch/sparc/cpu/leon3/cpu_init.c |4 ++-- common/cmd_usb.c|2 +- common/usb_storage.c|2 +- drivers/net/at91_emac.c |2 +- fs/jffs2/jffs2_1pass.c |2 +- fs/jffs2/jffs2_nand_1pass.c |2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/cpu/arm920t/at91rm9200/ether.c b/arch/arm/cpu/arm920t/at91rm9200/ether.c index e1cdeba..d7135c5 100644 --- a/arch/arm/cpu/arm920t/at91rm9200/ether.c +++ b/arch/arm/cpu/arm920t/at91rm9200/ether.c @@ -39,7 +39,7 @@ typedef struct { #define RBF_MULTICAST (130) #define RBF_UNICAST (129) #define RBF_EXTERNAL (128) -#define RBF_UNKOWN(127) +#define RBF_UNKNOWN (127) #define RBF_SIZE 0x07ff #define RBF_LOCAL4(126) #define RBF_LOCAL3(125) diff --git a/arch/sparc/cpu/leon2/cpu_init.c b/arch/sparc/cpu/leon2/cpu_init.c index a24f778..795c7d7 100644 --- a/arch/sparc/cpu/leon2/cpu_init.c +++ b/arch/sparc/cpu/leon2/cpu_init.c @@ -47,9 +47,9 @@ struct { * initialize a bunch of registers. * * Run from FLASH/PROM: - * - until memory controller is set up, only registers avaiable + * - until memory controller is set up, only registers available * - no global variables available for writing - * - constants avaiable + * - constants available */ void cpu_init_f(void) diff --git a/arch/sparc/cpu/leon3/cpu_init.c b/arch/sparc/cpu/leon3/cpu_init.c index be22ec2..cba9d0e 100644 --- a/arch/sparc/cpu/leon3/cpu_init.c +++ b/arch/sparc/cpu/leon3/cpu_init.c @@ -57,9 +57,9 @@ struct { * initialize a bunch of registers. * * Run from FLASH/PROM: - * - until memory controller is set up, only registers avaiable + * - until memory controller is set up, only registers available * - no global variables available for writing - * - constants avaiable + * - constants available */ void cpu_init_f(void) diff --git a/common/cmd_usb.c b/common/cmd_usb.c index b04a8df..7fcc61a 100644 --- a/common/cmd_usb.c +++ b/common/cmd_usb.c @@ -580,7 +580,7 @@ int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) break; } if (dev == NULL) { - printf(*** NO Device avaiable ***\n); + printf(*** NO Device available ***\n); return 0; } else { usb_display_desc(dev); diff --git a/common/usb_storage.c b/common/usb_storage.c index 1e6cd6a..de48c5a 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -254,7 +254,7 @@ int usb_stor_scan(int mode) dev = usb_get_dev_index(i); /* get device */ USB_STOR_PRINTF(i=%d\n, i); if (dev == NULL) - break; /* no more devices avaiable */ + break; /* no more devices available */ if (usb_storage_probe(dev, 0, usb_stor[usb_max_devs])) { /* OK, it's a storage device. Iterate over its LUNs diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c index 4e5685c..90eb515 100644 --- a/drivers/net/at91_emac.c +++ b/drivers/net/at91_emac.c @@ -93,7 +93,7 @@ #define RBF_MULTICAST (130) #define RBF_UNICAST (129) #define RBF_EXTERNAL (128) -#define RBF_UNKOWN(127) +#define RBF_UNKNOWN (127) #define RBF_SIZE 0x07ff #define RBF_LOCAL4(126) #define RBF_LOCAL3(125) diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index c4f7445..5ddc2b9 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -794,7 +794,7 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 inode, char *dest) #endif default: /* unknown */ - putLabeledWord(UNKOWN COMPRESSION METHOD = , jNode-compr); + putLabeledWord(UNKNOWN COMPRESSION METHOD = , jNode-compr); put_fl_mem(jNode, pL-readbuf); return -1; break; diff --git a/fs/jffs2/jffs2_nand_1pass.c b/fs/jffs2/jffs2_nand_1pass.c index 3982003..740f787 100644 --- a/fs/jffs2/jffs2_nand_1pass.c +++ b/fs/jffs2/jffs2_nand_1pass.c @@ -350,7 +350,7 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 ino, char *dest, #endif default: /* unknown */ - putLabeledWord(UNKOWN COMPRESSION METHOD = , inode-compr); + putLabeledWord(UNKNOWN COMPRESSION METHOD = , inode-compr); return -1; } } -- 1.7.2.3
[U-Boot] [PATCH] Drop config.h include in tools/imximage.h
make tools-all should allow building tools such as mkimage and the new imximage without any config, but imximage.c currently fails to build with: imximage.h:27:20: error: config.h: No such file or directory config.h is not needed in imximage.h nor in imximage.c, and imximage.h is only included from imximage.c, so drop this include to fix the build. Signed-off-by: Loïc Minier loic.min...@linaro.org --- tools/imximage.h |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/tools/imximage.h b/tools/imximage.h index 38ca6be..d126a46 100644 --- a/tools/imximage.h +++ b/tools/imximage.h @@ -24,8 +24,6 @@ #ifndef _IMXIMAGE_H_ #define _IMXIMAGE_H_ -#include config.h - #define MAX_HW_CFG_SIZE_V2 121 /* Max number of registers imx can set for v2 */ #define MAX_HW_CFG_SIZE_V1 60 /* Max number of registers imx can set for v1 */ #define APP_CODE_BARKER0xB1 -- 1.7.2.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2] Fix misc spelling errors found by lintian
Signed-off-by: Loïc Minier loic.min...@linaro.org --- Changes for V2: * add Signed-off-by arch/arm/cpu/arm920t/at91rm9200/ether.c |2 +- arch/sparc/cpu/leon2/cpu_init.c |4 ++-- arch/sparc/cpu/leon3/cpu_init.c |4 ++-- common/cmd_usb.c|2 +- common/usb_storage.c|2 +- drivers/net/at91_emac.c |2 +- fs/jffs2/jffs2_1pass.c |2 +- fs/jffs2/jffs2_nand_1pass.c |2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/cpu/arm920t/at91rm9200/ether.c b/arch/arm/cpu/arm920t/at91rm9200/ether.c index e1cdeba..d7135c5 100644 --- a/arch/arm/cpu/arm920t/at91rm9200/ether.c +++ b/arch/arm/cpu/arm920t/at91rm9200/ether.c @@ -39,7 +39,7 @@ typedef struct { #define RBF_MULTICAST (130) #define RBF_UNICAST (129) #define RBF_EXTERNAL (128) -#define RBF_UNKOWN(127) +#define RBF_UNKNOWN (127) #define RBF_SIZE 0x07ff #define RBF_LOCAL4(126) #define RBF_LOCAL3(125) diff --git a/arch/sparc/cpu/leon2/cpu_init.c b/arch/sparc/cpu/leon2/cpu_init.c index a24f778..795c7d7 100644 --- a/arch/sparc/cpu/leon2/cpu_init.c +++ b/arch/sparc/cpu/leon2/cpu_init.c @@ -47,9 +47,9 @@ struct { * initialize a bunch of registers. * * Run from FLASH/PROM: - * - until memory controller is set up, only registers avaiable + * - until memory controller is set up, only registers available * - no global variables available for writing - * - constants avaiable + * - constants available */ void cpu_init_f(void) diff --git a/arch/sparc/cpu/leon3/cpu_init.c b/arch/sparc/cpu/leon3/cpu_init.c index be22ec2..cba9d0e 100644 --- a/arch/sparc/cpu/leon3/cpu_init.c +++ b/arch/sparc/cpu/leon3/cpu_init.c @@ -57,9 +57,9 @@ struct { * initialize a bunch of registers. * * Run from FLASH/PROM: - * - until memory controller is set up, only registers avaiable + * - until memory controller is set up, only registers available * - no global variables available for writing - * - constants avaiable + * - constants available */ void cpu_init_f(void) diff --git a/common/cmd_usb.c b/common/cmd_usb.c index b04a8df..7fcc61a 100644 --- a/common/cmd_usb.c +++ b/common/cmd_usb.c @@ -580,7 +580,7 @@ int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) break; } if (dev == NULL) { - printf(*** NO Device avaiable ***\n); + printf(*** NO Device available ***\n); return 0; } else { usb_display_desc(dev); diff --git a/common/usb_storage.c b/common/usb_storage.c index 1e6cd6a..de48c5a 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -254,7 +254,7 @@ int usb_stor_scan(int mode) dev = usb_get_dev_index(i); /* get device */ USB_STOR_PRINTF(i=%d\n, i); if (dev == NULL) - break; /* no more devices avaiable */ + break; /* no more devices available */ if (usb_storage_probe(dev, 0, usb_stor[usb_max_devs])) { /* OK, it's a storage device. Iterate over its LUNs diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c index 4e5685c..90eb515 100644 --- a/drivers/net/at91_emac.c +++ b/drivers/net/at91_emac.c @@ -93,7 +93,7 @@ #define RBF_MULTICAST (130) #define RBF_UNICAST (129) #define RBF_EXTERNAL (128) -#define RBF_UNKOWN(127) +#define RBF_UNKNOWN (127) #define RBF_SIZE 0x07ff #define RBF_LOCAL4(126) #define RBF_LOCAL3(125) diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index c4f7445..5ddc2b9 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -794,7 +794,7 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 inode, char *dest) #endif default: /* unknown */ - putLabeledWord(UNKOWN COMPRESSION METHOD = , jNode-compr); + putLabeledWord(UNKNOWN COMPRESSION METHOD = , jNode-compr); put_fl_mem(jNode, pL-readbuf); return -1; break; diff --git a/fs/jffs2/jffs2_nand_1pass.c b/fs/jffs2/jffs2_nand_1pass.c index 3982003..740f787 100644 --- a/fs/jffs2/jffs2_nand_1pass.c +++ b/fs/jffs2/jffs2_nand_1pass.c @@ -350,7 +350,7 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 ino, char *dest, #endif default: /* unknown */ - putLabeledWord(UNKOWN COMPRESSION METHOD = , inode-compr); + putLabeledWord(UNKNOWN COMPRESSION METHOD = , inode-compr
[U-Boot] [PATCH V2] EfikaMX: switch to MACH_TYPE_MX51_EFIKAMX
Upstream linux moved from MACH_TYPE_MX51_LANGE51 to MACH_TYPE_MX51_EFIKAMX. Signed-off-by: Loïc Minier loic.min...@linaro.org --- Changes for V2: * Add Signed-off-by board/efikamx/efikamx.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/board/efikamx/efikamx.c b/board/efikamx/efikamx.c index 4efbeaf..f735260 100644 --- a/board/efikamx/efikamx.c +++ b/board/efikamx/efikamx.c @@ -621,7 +621,7 @@ int board_early_init_f(void) int board_init(void) { - gd-bd-bi_arch_number = MACH_TYPE_MX51_LANGE51; + gd-bd-bi_arch_number = MACH_TYPE_MX51_EFIKAMX; gd-bd-bi_boot_params = PHYS_SDRAM_1 + 0x100; return 0; -- 1.7.2.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V2] Fix misc spelling errors found by lintian
On Thu, Feb 03, 2011, Andy Pont wrote: Should this be further amended to be all upper case or all words starting with an upper case character rather than the current random looking collection? I wasn't sure whether it was extra emphasis on NO, and there was no other similarly looking message in the file (with ***) so I didn't change the casing. -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V3] Fix misc spelling errors found by lintian
Signed-off-by: Loïc Minier loic.min...@linaro.org --- Changes for V3: * tweak casing of string in common/cmd_usb.c to No device available Changes for V2: * add Signed-off-by arch/arm/cpu/arm920t/at91rm9200/ether.c |2 +- arch/sparc/cpu/leon2/cpu_init.c |4 ++-- arch/sparc/cpu/leon3/cpu_init.c |4 ++-- common/cmd_usb.c|2 +- common/usb_storage.c|2 +- drivers/net/at91_emac.c |2 +- fs/jffs2/jffs2_1pass.c |2 +- fs/jffs2/jffs2_nand_1pass.c |2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/cpu/arm920t/at91rm9200/ether.c b/arch/arm/cpu/arm920t/at91rm9200/ether.c index e1cdeba..d7135c5 100644 --- a/arch/arm/cpu/arm920t/at91rm9200/ether.c +++ b/arch/arm/cpu/arm920t/at91rm9200/ether.c @@ -39,7 +39,7 @@ typedef struct { #define RBF_MULTICAST (130) #define RBF_UNICAST (129) #define RBF_EXTERNAL (128) -#define RBF_UNKOWN(127) +#define RBF_UNKNOWN (127) #define RBF_SIZE 0x07ff #define RBF_LOCAL4(126) #define RBF_LOCAL3(125) diff --git a/arch/sparc/cpu/leon2/cpu_init.c b/arch/sparc/cpu/leon2/cpu_init.c index a24f778..795c7d7 100644 --- a/arch/sparc/cpu/leon2/cpu_init.c +++ b/arch/sparc/cpu/leon2/cpu_init.c @@ -47,9 +47,9 @@ struct { * initialize a bunch of registers. * * Run from FLASH/PROM: - * - until memory controller is set up, only registers avaiable + * - until memory controller is set up, only registers available * - no global variables available for writing - * - constants avaiable + * - constants available */ void cpu_init_f(void) diff --git a/arch/sparc/cpu/leon3/cpu_init.c b/arch/sparc/cpu/leon3/cpu_init.c index be22ec2..cba9d0e 100644 --- a/arch/sparc/cpu/leon3/cpu_init.c +++ b/arch/sparc/cpu/leon3/cpu_init.c @@ -57,9 +57,9 @@ struct { * initialize a bunch of registers. * * Run from FLASH/PROM: - * - until memory controller is set up, only registers avaiable + * - until memory controller is set up, only registers available * - no global variables available for writing - * - constants avaiable + * - constants available */ void cpu_init_f(void) diff --git a/common/cmd_usb.c b/common/cmd_usb.c index b04a8df..ced818a 100644 --- a/common/cmd_usb.c +++ b/common/cmd_usb.c @@ -580,7 +580,7 @@ int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) break; } if (dev == NULL) { - printf(*** NO Device avaiable ***\n); + printf(*** No device available ***\n); return 0; } else { usb_display_desc(dev); diff --git a/common/usb_storage.c b/common/usb_storage.c index 1e6cd6a..de48c5a 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -254,7 +254,7 @@ int usb_stor_scan(int mode) dev = usb_get_dev_index(i); /* get device */ USB_STOR_PRINTF(i=%d\n, i); if (dev == NULL) - break; /* no more devices avaiable */ + break; /* no more devices available */ if (usb_storage_probe(dev, 0, usb_stor[usb_max_devs])) { /* OK, it's a storage device. Iterate over its LUNs diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c index 4e5685c..90eb515 100644 --- a/drivers/net/at91_emac.c +++ b/drivers/net/at91_emac.c @@ -93,7 +93,7 @@ #define RBF_MULTICAST (130) #define RBF_UNICAST (129) #define RBF_EXTERNAL (128) -#define RBF_UNKOWN(127) +#define RBF_UNKNOWN (127) #define RBF_SIZE 0x07ff #define RBF_LOCAL4(126) #define RBF_LOCAL3(125) diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index c4f7445..5ddc2b9 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -794,7 +794,7 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 inode, char *dest) #endif default: /* unknown */ - putLabeledWord(UNKOWN COMPRESSION METHOD = , jNode-compr); + putLabeledWord(UNKNOWN COMPRESSION METHOD = , jNode-compr); put_fl_mem(jNode, pL-readbuf); return -1; break; diff --git a/fs/jffs2/jffs2_nand_1pass.c b/fs/jffs2/jffs2_nand_1pass.c index 3982003..740f787 100644 --- a/fs/jffs2/jffs2_nand_1pass.c +++ b/fs/jffs2/jffs2_nand_1pass.c @@ -350,7 +350,7 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 ino, char *dest, #endif default: /* unknown */ - putLabeledWord(UNKOWN COMPRESSION METHOD = , inode-compr
[U-Boot] mach-type #define mismatch for lange51/efikamx
Hey! iMX5: EfikaMX: Preliminary board support u-boot-imx has: #define MACH_TYPE_MX51_LANGE51 2336 #define MACH_TYPE_MX51_LANGE52 2337 u-boot-arm has: #define MACH_TYPE_MX51_EFIKAMX 2336 #define MACH_TYPE_MX51_LANGE52 2337 and linux has: mx51_efikamxMACH_MX51_EFIKAMX MX51_EFIKAMX 2336 mx51_lange52MACH_MX51_LANGE52 MX51_LANGE52 2337 but board/efikamx/efikamx.c uses MACH_TYPE_MX51_LANGE51 (and hence fails to build in u-boot-arm.git and u-boot.git). So while (Pegatron?) Lange 5.1 and 5.2 might have been more consistent, I think we need to switch board/efikamx/efikamx.c to the linux name MACH_MX51_EFIKAMX. Thanks! -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Build error with the master branch
On Thu, Jan 27, 2011, Jason Liu wrote: arm-none-linux-gnueabi-ld -pie -r -o libstubs.o stubs.o arm-none-linux-gnueabi-ld: -r and -shared may not be used together I found this error is related with the following commit: commit 8aba9dceebb14144e07d19593111ee3a999c37fc I've noticed the same thing, this seems to break all ARM configs for me [ full build logs at: http://hudson.dooz.org/job/u-boot_master/63/ ] -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2 1/2] Don't add symlink in srctree when using an objtree
When building with srctree != objtree, the build creates arch/soc/cpu specific symlinks in the source tree. This means that the same source tree can't be used for multiple builds at the same time. Also, these symlinks in the source tree are only cleaned up if one passes the same O= to distclean. When srctree != objtree, mkconfig creates an $objtree/include2 directory in the objtree to host the asm - arch/$arch/include/asm symlink so that #include asm can be used. But it also creates another identical symlink in $objtree/include. Then, mkconfig creates two symlinks: $objtree/include/asm/arch - arch/$arch/include/asm/arch-$cpu (or $soc) $objtree/include/asm/proc - arch/$arch/include/asm/proc-armv (on arm) but because $objtree/include/asm points at $srctree already, the two symlinks are created under $srctree. To fix this, create a real $objtree/include/asm directory, instead of a symlink. Update cleanup code accordingly. Signed-off-by: Loïc Minier loic.min...@linaro.org --- Makefile |2 +- mkconfig |3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9055028..7c02096 100644 --- a/Makefile +++ b/Makefile @@ -1243,7 +1243,7 @@ clobber: clean @rm -f $(obj)u-boot.imx @rm -f $(obj)tools/{env/crc32.c,inca-swap-bytes} @rm -f $(obj)arch/powerpc/cpu/mpc824x/bedbug_603e.c - @rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm + @rm -fr $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm @rm -fr $(obj)include/generated @[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -name * -type l -print | xargs rm -f @[ ! -d $(obj)onenand_ipl ] || find $(obj)onenand_ipl -name * -type l -print | xargs rm -f diff --git a/mkconfig b/mkconfig index db69336..6ff533f 100755 --- a/mkconfig +++ b/mkconfig @@ -98,8 +98,7 @@ if [ $SRCTREE != $OBJTREE ] ; then ln -s ${SRCTREE}/arch/${arch}/include/asm asm LNPREFIX=${SRCTREE}/arch/${arch}/include/asm/ cd ../include - rm -f asm - ln -s ${SRCTREE}/arch/${arch}/include/asm asm + mkdir -p asm else cd ./include rm -f asm -- 1.7.2.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2 2/2] Cleanup .boards.depend when using an objtree
.boards.depend was created in the source tree even when calling make with O=objtree, and distclean O=objtree wouldn't clean it. Create .boards.depend in objtree instead as to clean it up properly. --- Makefile |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 7c02096..e819e56 100644 --- a/Makefile +++ b/Makefile @@ -526,7 +526,7 @@ unconfig: @$(MKCONFIG) -A $(@:_config=) sinclude .boards.depend -.boards.depend:boards.cfg +$(obj).boards.depend: boards.cfg awk '(NF $$1 !~ /^#/) { print $$1 : $$1 _config; $$(MAKE) }' $ $@ # -- 1.7.2.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] Don't add symlink in srctree when using an objtree
On Sat, Dec 18, 2010, Loïc Minier wrote: Don't make it that complicated. Just change the line into @rm -fr$(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm I think I had this in my first version, but had an issue with it; I will retest This works just fine and is much simpler; thanks. I will send an updated patch to use this Also a question: how has this change been tested? I'm attaching a test script which, starting from a clean tree, will try to distclean, to configure + distclean, and finally to configure + build + distclean. It tries both with and without an objdir in all make calls, and checks whether the tree is really clean with: git clean -d -x -n. This script uncovered another issue with .boards.depend which was not cleaned up by distclean O=foo because it's created in the srctree. I will send a separate patch for this issue as well. -- Loïc Minier #!/bin/sh set -e self=$(basename $0) do_make() { make CROSS_COMPILE=arm-linux-gnueabi- $@ } distclean() { do_make distclean $@ } config() { do_make omap3_beagle_config $@ } build() { do_make -j2 $@ } check_clean() { clean_output=$(git clean -x -d -n $@ 21) if [ -n $clean_output ]; then echo Expected a clean tree but got: $clean_output 2 exit 1 fi } objdir= cleanup() { if [ -n $objdir ]; then rm -rf $objdir fi } trap cleanup 0 1 2 3 9 11 13 15 objdir=$(mktemp -dt) # this will stop the test if the tree isn't clean to start with check_clean for with_objdir in yes no; do echo I: objdir: $with_objdir 2 for seq in distclean config distclean config build distclean; do echo I: sequence: $seq 2 for step in $seq; do echo I: step: $step 2 if [ $with_objdir = yes ]; then $step O=$objdir /dev/null 21 else $step /dev/null 21 fi done check_clean done done ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] Use sizeof(gd_t), not sizeof(struct global_data)
The eNET (x86) build fails with invalid application of 'sizeof' to incomplete type 'struct global_data' because x86 doesn't define struct global_data. Change sizeof(struct global_data) to sizeof(gd_t) which is always available. Cc: Graeme Russ graeme.r...@gmail.com Signed-off-by: Loïc Minier loic.min...@linaro.org --- lib/asm-offsets.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/asm-offsets.c b/lib/asm-offsets.c index 2209561..6a4084e 100644 --- a/lib/asm-offsets.c +++ b/lib/asm-offsets.c @@ -23,7 +23,7 @@ int main(void) { /* Round up to make sure size gives nice stack alignment */ DEFINE(GENERATED_GBL_DATA_SIZE, - (sizeof(struct global_data)+15) ~15); + (sizeof(gd_t)+15) ~15); return 0; } -- 1.7.2.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/2] i386: Define struct global_data as on other arches
The eNET (x86) build was failing to build with invalid application of 'sizeof' to incomplete type 'struct global_data' because x86 didn't define struct global_data. lib/asm-offsets.c was changed to use sizeof(gd_t) as gd_t is more commonly used outside of arch/*/include/asm/global_data.h, but it is still useful to define struct global_data in arch/i386/include/asm/global_data.h for consistency. Signed-off-by: Loïc Minier loic.min...@linaro.org Cc: Graeme Russ graeme.r...@gmail.com --- arch/i386/include/asm/global_data.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/i386/include/asm/global_data.h b/arch/i386/include/asm/global_data.h index e3f8a25..6b7e101 100644 --- a/arch/i386/include/asm/global_data.h +++ b/arch/i386/include/asm/global_data.h @@ -35,7 +35,7 @@ #ifndef __ASSEMBLY__ -typedefstruct { +typedefstruct global_data { bd_t*bd; unsigned long flags; unsigned long baudrate; -- 1.7.2.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] Use sizeof(gd_t), not sizeof(struct global_data)
On Mon, Jan 03, 2011, Mike Frysinger wrote: why not change x86's global_data.h to define the struct ? all other arches define 'struct global_data'. We could implement both fixes; there are two reasons I preferred sending this fix instead of the one you mention: * gd_t is used across the tree, while struct global_data is only used in arch/*/include/asm/global_data.h headers * the global_data.h header suggested that sizeof(gd_t) was an acceptable construct in a comment: GENERATED_GBL_DATA_SIZE sizeof(gd_t) I'll send an additional patch to also add struct global_data to arch/i386/include/asm/global_data.h. -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] Use sizeof(gd_t), not sizeof(struct global_data)
On Mon, Jan 03, 2011, Wolfgang Denk wrote: Um... I do not like this change; the resulting code is harder to read. I don't mind either way; I had asked 20101220111358.ga28...@bee.dooz.org which one was the preferred approach, but didn't get comments on this particular point; see 20110103170050.gb10...@bee.dooz.org for the rationale for picking this option rather than the other one. I've sent a second patch to also define struct global_data; feel free to cherry pick any of the two patches or both Thanks! -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/2] Fix typo (comand instead of command)
Signed-off-by: Loïc Minier loic.min...@linaro.org --- tools/kwbimage.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/kwbimage.c b/tools/kwbimage.c index 7b26920..964796e 100644 --- a/tools/kwbimage.c +++ b/tools/kwbimage.c @@ -33,7 +33,7 @@ * Supported commands for configuration file */ static table_entry_t kwbimage_cmds[] = { - {CMD_BOOT_FROM, BOOT_FROM,boot comand, }, + {CMD_BOOT_FROM, BOOT_FROM,boot command, }, {CMD_NAND_ECC_MODE, NAND_ECC_MODE,NAND mode,}, {CMD_NAND_PAGE_SIZE,NAND_PAGE_SIZE, NAND size,}, {CMD_SATA_PIO_MODE, SATA_PIO_MODE,SATA mode,}, -- 1.7.2.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/2] Escape minus signs in manpage
By default, - chars are interpreted as hyphens (U+2010) by groff, not as minus signs (U+002D). Since options to programs use minus signs (U+002D), this means for example in UTF-8 locales that you cannot cut and paste options, nor search for them easily. (Reported by lintian.) Signed-off-by: Loïc Minier loic.min...@linaro.org --- doc/mkimage.1 |8 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/mkimage.1 b/doc/mkimage.1 index 7985f5a..f27da6b 100644 --- a/doc/mkimage.1 +++ b/doc/mkimage.1 @@ -41,22 +41,22 @@ mkimage lists the information contained in the header of an existing U-Boot imag .TP .BI \-A [ architecture ] -Set architecture. Pass -h as the architecture to see the list of supported architectures. +Set architecture. Pass \-h as the architecture to see the list of supported architectures. .TP .BI \-O [ os ] Set operating system. bootm command of u-boot changes boot method by os type. -Pass -h as the OS to see the list of supported OS. +Pass \-h as the OS to see the list of supported OS. .TP .BI \-T [ image type ] Set image type. -Pass -h as the image to see the list of supported image type. +Pass \-h as the image to see the list of supported image type. .TP .BI \-C [ compression type ] Set compression type. -Pass -h as the compression to see the list of supported compression type. +Pass \-h as the compression to see the list of supported compression type. .TP .BI \-a [ load addess ] -- 1.7.2.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] eNET build fails with invalid application of 'sizeof' to incomplete type 'struct global_data'
Hey There is now a u-boot package in Debian and Ubuntu and it fails to build the i386 eNET board with: gcc -DDO_DEPS_ONLY \ -g -Os -ffunction-sections -fvisibility=hidden -D__KERNEL__ -DCONFIG_SYS_TEXT_BASE=0x0600 -I/build/buildd-u-boot_2010.12~rc3-1-i386-qoDl82/u-boot-2010.12~rc3/include -fno-builtin -ffreestanding -nostdinc -isystem /usr/lib/gcc/i486-linux-gnu/4.4.5/include -pipe -fno-strict-aliasing -Wstrict-prototypes -mregparm=3 -fomit-frame-pointer -ffreestanding -fno-toplevel-reorder -fno-stack-protector -mpreferred-stack-boundary=2 -DCONFIG_I386 -D__I386__ -march=i386 -Werror -fno-dwarf2-cfi-asm -Wall -Wstrict-prototypes -fno-stack-protector \ -o lib/asm-offsets.s lib/asm-offsets.c -c -S lib/asm-offsets.c: In function 'main': lib/asm-offsets.c:25: error: invalid application of 'sizeof' to incomplete type 'struct global_data' The build proceeds much further if I replace sizeof(struct global_data) with sizeof(gd_t) in lib/asm-offsets.c. I'm not sure which way this should be fixed: * add struct global_data to arches which only have gd_t * use sizeof(gd_t) in lib/asm-offsets.c instead of sizeof(struct global_data) -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RFC 2/3] tools/env: Support writing to files
On Sat, Dec 04, 2010, Steve Sakoman wrote: I don't have a big endian target for testing, but perhaps Loïc has access to one. Otherwise we'll come back to the list with a request for testing help. (I don't have access to one either) -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] Don't add symlink in srctree when using an objtree
When building with srctree != objtree, the build creates arch/soc/cpu specific symlinks in the source tree. This means that the same source tree can't be used for multiple builds at the same time. Also, these symlinks in the source tree are only cleaned up if one passes the same O= to distclean. When srctree != objtree, mkconfig creates an $objtree/include2 directory in the objtree to host the asm - arch/$arch/include/asm symlink so that #include asm can be used. But it also creates another identical symlink in $objtree/include. Then, mkconfig creates two symlinks: $objtree/include/asm/arch - arch/$arch/include/asm/arch-$cpu (or $soc) $objtree/include/asm/proc - arch/$arch/include/asm/proc-armv (on arm) but because $objtree/include/asm points at $srctree already, the two symlinks are created under $srctree. To fix this, create a real $objtree/include/asm directory, instead of a symlink. Update cleanup code accordingly. Signed-off-by: Loïc Minier loic.min...@linaro.org --- Makefile |4 +++- mkconfig |3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 87a383d..8a3f3e0 100644 --- a/Makefile +++ b/Makefile @@ -1246,7 +1246,9 @@ clobber: clean @rm -f $(obj)u-boot.imx @rm -f $(obj)tools/{env/crc32.c,inca-swap-bytes} @rm -f $(obj)arch/powerpc/cpu/mpc824x/bedbug_603e.c - @rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm + @rm -f $(obj)include/asm/proc $(obj)include/asm/arch + @[ ! -h $(obj)include/asm ] || rm -f $(obj)include/asm + @[ ! -d $(obj)include/asm ] || rmdir $(obj)include/asm @rm -fr $(obj)include/generated @[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -name * -type l -print | xargs rm -f @[ ! -d $(obj)onenand_ipl ] || find $(obj)onenand_ipl -name * -type l -print | xargs rm -f diff --git a/mkconfig b/mkconfig index 2fda1d4..1408b53 100755 --- a/mkconfig +++ b/mkconfig @@ -98,8 +98,7 @@ if [ $SRCTREE != $OBJTREE ] ; then ln -s ${SRCTREE}/arch/${arch}/include/asm asm LNPREFIX=${SRCTREE}/arch/${arch}/include/asm/ cd ../include - rm -f asm - ln -s ${SRCTREE}/arch/${arch}/include/asm asm + mkdir -p asm else cd ./include rm -f asm -- 1.7.2.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [STATUS] Using Patchwork
On Thu, Nov 18, 2010, Wolfgang Denk wrote: Unfortunately there is basicly no documentation available about Patchwork, it seems. I tried to document what I figured out myself in Patch Tracking at http://www.denx.de/wiki/view/U-Boot/Patches#Patch_Tracking Jeremy Kerr presented Patchwork recently at Plumbers, the slides are at http://www.linuxplumbersconf.org/2010/ocw//system/presentations/297/original/patchwork-lpc2010.pdf maybe this helps a bit? Videos weren't uploaded yet -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request: u-boot-arm
Hey On Wed, Nov 17, 2010, Wolfgang Denk wrote: Sanjeev Premi (3): omap3evm: Support relocation omap3evm: Wrap function under CONFIG_USB_OMAP3 omap3evm: Fix mechanism to identify board revision I was expecting this would fix the build of omap3_evm, but it still fails for me: http://hudson.dooz.org/job/u-boot_master/BOARD=omap3_evm/39/console make[1]: Entering directory `/srv/hudson.dooz.org/home/jobs/u-boot_master/workspace/BOARD/omap3_evm/arch/arm/cpu/armv7' arm-linux-gnueabi-gcc -D__ASSEMBLY__ -g -Os -fno-common -ffixed-r8 -msoft-float -D__KERNEL__ -DCONFIG_SYS_TEXT_BASE=0x80008000 -I/srv/hudson.dooz.org/home/jobs/u-boot_master/workspace/BOARD/omap3_evm/include -fno-builtin -ffreestanding -nostdinc -isystem /usr/lib/gcc/arm-linux-gnueabi/4.4.5/include -pipe -DCONFIG_ARM -D__ARM__ -marm -mabi=aapcs-linux -mno-thumb-interwork -march=armv5 \ -o start.o start.S -c start.S: Assembler messages: start.S:144: Error: constant expression expected -- `ldr sp,=((0x4020FFFC-CONFIG_SYS_GBL_DATA_SIZE))' make[1]: *** [start.o] Error 1 make[1]: Leaving directory `/srv/hudson.dooz.org/home/jobs/u-boot_master/workspace/BOARD/omap3_evm/arch/arm/cpu/armv7' Thanks, -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 0/2] ARMV7: Fixing Vexpress build errors and warnings
Hey Wolfgang! Would you mind considering these patches from earlier this month for u-boot-arm? These fixes the build of ca9x4_ct_vxp which currently fails for me: http://hudson.dooz.org/job/u-boot_master/BOARD=ca9x4_ct_vxp/39/console arm-linux-gnueabi-gcc -g -Os -fno-common -ffixed-r8 -msoft-float -D__KERNEL__ -I/srv/hudson.dooz.org/home/jobs/u-boot_master/workspace/BOARD/ca9x4_ct_vxp/include -fno-builtin -ffreestanding -nostdinc -isystem /usr/lib/gcc/arm-linux-gnueabi/4.4.5/include -pipe -DCONFIG_ARM -D__ARM__ -marm -mabi=aapcs-linux -mno-thumb-interwork -march=armv5 -Wall -Wstrict-prototypes -DBUILD_TAG='hudson-BOARD=ca9x4_ct_vxp-39' -fno-stack-protector \ -o syslib.o syslib.c -c syslib.c:26: fatal error: asm/arch/sys_proto.h: No such file or directory compilation terminated. Thanks! On Tue, Nov 02, 2010, Matt Waddel wrote: From: Matt Waddel matt.wad...@linaro.org These patches fix several build errors and warnings. A successful build for this platform depends on Steve Sakoman's ARMV7: Fix build for non-OMAP3 boards patch. Matt Waddel (2): ARMV7: Vexpress build errors ARMV7: Vexpress compile warnings arch/arm/include/asm/arch-armv7/sys_proto.h | 29 board/armltd/vexpress/ca9x4_ct_vxp.c|9 +++- board/armltd/vexpress/config.mk |3 +- board/armltd/vexpress/u-boot.lds| 65 --- 4 files changed, 36 insertions(+), 70 deletions(-) create mode 100644 arch/arm/include/asm/arch-armv7/sys_proto.h delete mode 100644 board/armltd/vexpress/u-boot.lds -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V4 1/2] arm926ejs: fix linker file for newer ld support
On Mon, Nov 15, 2010, Albert ARIBAUD wrote: I can make the changes for other cpus, but I cannot perform even basic testing beyond making sure it still builds. Would qemu be of any help there? You could use e.g. versatile or integrator, and pretend that they use any CPU by changing their config and passing -cpu on the qemu command-line -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V4 1/2] arm926ejs: fix linker file for newer ld support
On Mon, Nov 15, 2010, Wolfgang Denk wrote: Do you have a working qemu setup and/or documentation how to run U-Boot on such an ARM config? Sometimes I do ;-) I use either: * Ubuntu QEMU packages - qemu-kvm-extras package has qemu-system-arm; it's usually fairly old because it's built from the qemu-kvm trees/releases * Linaro QEMU packages - currently the qemu-maemo package in this PPA https://launchpad.net/~linaro-maintainers/+archive/tools/+packages provides the qemu-maemo-system-arm command; can be installed along qemu-kvm-extras; this has patches to support OMAP machines from the qemu-maemo/-meego projects, hence the name; in the future, this might be a qemu-linaro instead * upstream QEMU built from git While U-Boot supports integrator, versatile and vexpress, QEMU only supports the first two. I get varying success depending on the exact combination of emulated machine and version of QEMU. Today, I tried the binary u-boot downloads from http://arm.com/community/software-enablement/linux.php (Linux OS Downloads tab) with with qemu-maemo 0.0~20100921+871d996-0ubuntu1~linaro1 and qemu-kvm-extras 0.13.0+noroms-0ubuntu3: machine: | realview-eb realview-pbx-a9 versatilepb QEMU: | + qemu-maemo | partial[1] works works qemu-kvm-extras | partial[1] works crash[2] Unfortunately, these are not built from upstream u-boot sources; I tried building some ARM boards from upstream u-boot with v2010.09 and got these results: machine: | integratorcp versatilepb QEMU: | +- qemu-maemo | crash[3]partial[4] qemu-kvm-extras | crash[3]partial[4] So I'm afraid I couldn't find a fully working combination of U-Boot supported board + QEMU, but I didn't try QEMU tip; I'm Cc:ing Peter who cares for QEMU in Linaro, maybe he has more idea or is tempted to try a tip QEMU :-) If you want to reproduce, run something like: qemu-system-arm -M versatilepb -serial stdio \ -kernel u-boot_bin_u-boot_versatilepb.axf or: qemu-system-arm -nographic -M versatilepb \ -kernel u-boot_bin_u-boot_versatilepb.axf replace qemu-system-arm with qemu-maemo-system-arm if you use qemu-maemo [1] crashes while initializing the NIC; qemu: hardware error: smc91c111_write: Bad reg 0:6 [2] qemu: hardware error: arm_timer_write: Bad offset 101e1fe0 [3] qemu: hardware error: pl011_write: Bad offset 14 [4] crashes after detecting 0 Bytes of DRAM: DRAM: 0 Bytes qemu: fatal: Trying to execute code outside RAM or ROM at 0x3400 -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V4 1/2] arm926ejs: fix linker file for newer ld support
On Mon, Nov 15, 2010, Albert ARIBAUD wrote: I assume that the -kernel option indicates the executable to run. Correct, IOW u-boot.bin Would it take an ELF executable? a binary? You can pass an ELF as well How would one go about testing running u-boot from RAM, NOR, NAND? I guess you could only test from RAM with the way support for ARM boards is implemented Hmm another option would be OMAP emulation. It might allow you to test all of this; it's a bit more tricky to setup as you need to generate the flash contents, or some SD card. Also, things are a bit messier because this still uses x-loader. Problem is that x-loader probably requires armv7 itself ATM; this becomes quite far-fetched :-/ This seems to mean the HW is not 100% simulated, right? Well, these are either missing simulation or bugs; yes One last question: qemu: fatal: Trying to execute code outside RAM or ROM at 0x3400 Does this mean that qemu does not simulate data or instruction aborts? Not that it is required for u-boot, but it *could* be useful sometimes. I think the only thing it can do is halt :-) -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/1] omap3evm: Support for fast boot
On Tue, Oct 26, 2010, Premi, Sanjeev wrote: [sp] Didn't hear any other suggestions. But I had one more, CONFIG_QUICK_BOOT. I don't have a strong feeling either way; I just wanted fastboot to be used in a confusing way. Your patch seems to be largely a tuned u-boot config stripping down u-boot to be smaller and faster; I'm not sure whether there's anything similar in u-boot. -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/1] omap3evm: Support for fast boot
On Tue, Oct 19, 2010, Sanjeev Premi wrote: +#undef CONFIG_FAST_BOOT I wonder whether CONFIG_FAST_BOOT would cause confusion if u-boot gains support for Android fastboot someday? http://en.wikipedia.org/wiki/Fastboot http://android-dls.com/wiki/index.php?title=Fastboot -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] zImage on ARM
; I wonder if we could just have an IMAGE_FORMAT_ZIMAGE and CONFIG_ZIMAGE instead? But I don't think that this solves your problem - you still need information at least about the entry point address, which then has to be stored separate from the image file, which just shifts the problem to another area. Isn't it always at offset 0 for an ARM zImage payload? The main thing I'd like the bootloader to keep track of is the physical load address at which to load the kernel; usually this is 0x8000 when possible. I am not sure it needs to track anything else. -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] zImage on ARM
On Wed, Sep 08, 2010, Wolfgang Denk wrote: zImage does not contain any visible information about what it is, when it was build, etc. It is not checksum protected so you cannot verify if the image you just downloaded is good enough to erase what you have in flash, etc. etc. These are indeed nice features of uImages (checksums + build date information); but they are not needed in all use cases for U-Boot. Distributions are shipping zImage for ARM nowadays and when shipping zImage files withing packages (.deb for instance), there are already checksums, file timestamps, public build logs etc. as part of the distro toolkit. Also, this means end-user systems need mkimage installed (because uImage differ slightly across boards). Not a problem for an embedded developer obviously, but would prefer avoiding this need on an end-user system. (Nitpick: if you want an accurate time for the kernel build, them this should rather be recorded during the upstream linux kernel build rather than at the time the uImage is created, which could be quite some time later!) Seems zImage is quite widespread now; would it make sense to allow builing u-boot without that code and rely on the kernel code to unpack? Why duplicating the stuff again and again and again? Well, I'm proposing skipping one copy ;-) the U-Boot one Or should u-boot just gain a new image type for zImage? Why not use uImage like we do with other architectures? Why is it that ARM always has to try to reinvent the wheels? Eh, zImage has been around for a while! I guess it's just that we don't /need/ the couple extra uImage features, and would rather ship zImage directly. It would also remove the need for maintaining the table of magic values for uImage / uInitrd generation; a problem I described recently on another list: http://lists.linaro.org/pipermail/linaro-dev/2010-August/000493.html So we'd be happy if you'd take patches to have U-Boot accept this dumber format. Cheers, -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] zImage on ARM
On Fri, Sep 03, 2010, Wolfgang Denk wrote: I have a client that has asked me to look into loading zImage files instead of uImage for some ARM based boards. Why? It's the direct output of the kernel build process; typically, distributions ship a /boot/zImage-foo which gets converted into an uImage and flashed if the bootloader is u-boot. If that step could be skipped, it would make things easier! Anyone familiar with the history of why uImage is the preferred format? Just trying to learn . . . uImage, when done correctly, avoids that you have to add a pre-loader (including all of gzip and what else is needed to copy the uncom- pressed image to it's final location in RAM) to each and every kernel image - which is just a waste of time and resources as we already have all that code present in U-Boot. Note that the mainline ARM kernel does not make use of this; instead, it adds the preloader anyway. I never understood why. Seems zImage is quite widespread now; would it make sense to allow builing u-boot without that code and rely on the kernel code to unpack? Or should u-boot just gain a new image type for zImage? -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot