August 2010 - U-Boot

[U-Boot] [PATCH] fdt relocate: have more attention to use a bootmap or not
by Stephan Linz 08 Aug '10

08 Aug '10

Platforms with flat device tree support can use a bootmap to relocate the fdt_blob. This is not a must. That's why the relocation function boot_relocate_fdt() should be use only if CONFIG_OF_LIBFDT was defined together with CONFIG_SYS_BOOTMAPSZ (see common/cmd_bootm.c). On MicroBlaze platforms there is no need to use a bootmap to relocate a fdt blob. So we need a more precise focus on the compilation and usage of boot_relocate_fdt(). In general it is valid to exclude the function boot_relocate_fdt() if the bootmap size CONFIG_SYS_BOOTMAPSZ is not defined. Signed-off-by: Stephan Linz <linz(a)li-pro.net> --- arch/powerpc/lib/bootm.c | 4 ++-- common/image.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c index 6702df5..0efd66c 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -253,7 +253,7 @@ static int boot_body_linux(bootm_headers_t *images) if (ret) return ret; -#if defined(CONFIG_OF_LIBFDT) +#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_SYS_BOOTMAPSZ) ret = boot_relocate_fdt(lmb, bootmap_base, of_flat_tree, &of_size); if (ret) return ret; @@ -292,7 +292,7 @@ static int boot_body_linux(bootm_headers_t *images) if (*initrd_start && *initrd_end) fdt_initrd(*of_flat_tree, *initrd_start, *initrd_end, 1); } -#endif /* CONFIG_OF_LIBFDT */ +#endif /* CONFIG_OF_LIBFDT && CONFIG_SYS_BOOTMAPSZ */ return 0; } diff --git a/common/image.c b/common/image.c index 2b6007e..b23b6a8 100644 --- a/common/image.c +++ b/common/image.c @@ -1178,6 +1178,7 @@ static int fit_check_fdt (const void *fit, int fdt_noffset, int verify) * 0 - success * 1 - failure */ +#if defined(CONFIG_SYS_BOOTMAPSZ) int boot_relocate_fdt (struct lmb *lmb, ulong bootmap_base, char **of_flat_tree, ulong *of_size) { @@ -1257,6 +1258,7 @@ int boot_relocate_fdt (struct lmb *lmb, ulong bootmap_base, error: return 1; } +#endif /* CONFIG_SYS_BOOTMAPSZ */ /** * boot_get_fdt - main fdt handling routine -- 1.6.0.4

2 1

[U-Boot] [U-BOOT][PATCH]mmc: modify setting tran_speed and change csd's instead of response value
by Jaehoon Chung 08 Aug '10

08 Aug '10

This patch do the following 1. we need not use cmd.response, because we assinged cmd.response value to mmc->csd. 2. mmc_set_clock() is hard setting, that is not good solution and if mmc is not MMC_MODE_HS, mmc will set card's tran_speed. Signed-off-by: Jaehoon Chung <jh80.chung(a)samsung.com> --- drivers/mmc/mmc.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index cf4ea16..fd80a27 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -666,7 +666,7 @@ int mmc_startup(struct mmc *mmc) mmc->csd[3] = cmd.response[3]; if (mmc->version == MMC_VERSION_UNKNOWN) { - int version = (cmd.response[0] >> 26) & 0xf; + int version = (mmc->csd[0] >> 26) & 0xf; switch (version) { case 0: @@ -691,17 +691,17 @@ int mmc_startup(struct mmc *mmc) } /* divide frequency by 10, since the mults are 10x bigger */ - freq = fbase[(cmd.response[0] & 0x7)]; - mult = multipliers[((cmd.response[0] >> 3) & 0xf)]; + freq = fbase[(mmc->csd[0] & 0x7)]; + mult = multipliers[((mmc->csd[0] >> 3) & 0xf)]; mmc->tran_speed = freq * mult; - mmc->read_bl_len = 1 << ((cmd.response[1] >> 16) & 0xf); + mmc->read_bl_len = 1 << ((mmc->csd[1] >> 16) & 0xf); if (IS_SD(mmc)) mmc->write_bl_len = mmc->read_bl_len; else - mmc->write_bl_len = 1 << ((cmd.response[3] >> 22) & 0xf); + mmc->write_bl_len = 1 << ((mmc->csd[3] >> 22) & 0xf); if (mmc->high_capacity) { csize = (mmc->csd[1] & 0x3f) << 16 @@ -794,11 +794,12 @@ int mmc_startup(struct mmc *mmc) if (mmc->card_caps & MMC_MODE_HS) { if (mmc->card_caps & MMC_MODE_HS_52MHz) - mmc_set_clock(mmc, 52000000); + mmc->tran_speed = 52000000; else - mmc_set_clock(mmc, 26000000); - } else - mmc_set_clock(mmc, 20000000); + mmc->tran_speed = 26000000; + } + + mmc_set_clock(mmc, mmc->tran_speed); } /* fill in device description */ -- 1.6.0.4

3 3

[U-Boot] [PATCH v2] Add mkimage manpage
by Nobuhiro Iwamatsu 08 Aug '10

08 Aug '10

As for some distribution, a mkimage command is made a package. However, there was not manual of mkimage. This provides manual of mkimage. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> --- tools/mkimage.1 | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) create mode 100644 tools/mkimage.1 diff --git a/tools/mkimage.1 b/tools/mkimage.1 new file mode 100644 index 0000000..d8079bb --- /dev/null +++ b/tools/mkimage.1 @@ -0,0 +1,65 @@ +.TH MKIMAGE 1 "2010-05-16" + +.SH NAME +mkimage \- Generate image for U-Boot +.SH SYNOPSIS +.B mkimage +.RB [\fIoptions\fP] +.SH "DESCRIPTION" +.B mkimage +can also be used to create images for use with U-Boot, either +separated from the Linux kernel image, or combined into one file. +mkimage encapsulates the images with header containing information +about target architecture, operating system, image type, compression method, +entry points, time stamp, checksums, etc. + +.SH "OPTIONS" + +.TP +.BI "\-l [" "uimage file name" "]" +mkimage lists the information contained in the header of an existing U-Boot image. + +.TP +.BI "\-A [" "architecture" "]" +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. + +.TP +.BI "\-T [" "image type" "]" +Set 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. + +.TP +.BI "\-a [" "load addess" "]" +Set load address with a hex number. + +.TP +.BI "\-e [" "entry point" "]" +Set entry point with a hex number. + +.TP +.BI "\-n [" "image name" "]" +Set image name to 'image name'. + +.TP +.BI "\-d [" "image data file" "]" +Use image data from 'image data file'. + +.TP +.BI "\-x" +Set XIP (execute in place) flag. + +.SH HOMEPAGE +http://www.denx.de/wiki/U-Boot/WebHome +.PP +.SH AUTHOR +This manual page was written by Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> -- 1.7.1

3 2

[U-Boot] Bug in IP/UDP defragment?
by Fillod Stephane 08 Aug '10

08 Aug '10

Hi, I'm encountering a problem when tftp'ing a file of size 1747851 bytes with CONFIG_IP_DEFRAG defined and CONFIG_TFTP_BLOCKSIZE set to 4096. U-Boot's tftp times out on the last chunk. Undefining CONFIG_IP_DEFRAG/CONFIG_TFTP_BLOCKSIZE or downloading with a Linux tftp client are all well, so it does not look like a server problem. In fact, a file size between 1747845 and 1747851 bytes (incl.) makes the tftp client to timeout. File sizes slightly below or higher than the before mentioned range are fine. tcpdump trace of the last chunk yielding a timeout: 16:58:32.289427 IP 10.12.48.32.3285 > 10.12.48.10.33088: UDP, length 4 16:58:32.289449 IP 10.12.48.10.33088 > 10.12.48.32.3285: UDP, length 4100 16:58:32.289452 IP 10.12.48.10 > 10.12.48.32: udp 16:58:32.289454 IP 10.12.48.10 > 10.12.48.32: udp 16:58:32.290386 IP 10.12.48.32.3285 > 10.12.48.10.33088: UDP, length 4 16:58:32.290407 IP 10.12.48.10.33088 > 10.12.48.32.3285: UDP, length 2959 16:58:32.290410 IP 10.12.48.10 > 10.12.48.32: udp 16:58:32.290412 IP 10.12.48.10 > 10.12.48.32: udp The patch below appears to solve my problem. WARNING: since I haven't rolled my mind yet around the NetDefragment IP/UDP stack, I don't know yet what are the side effects of my patch. --- a/net/net.c 31 Mar 2010 21:54:39 +++ b/net/net.c 4 Jun 2010 15:09:08 @@ -1201,7 +1201,7 @@ static IP_t *__NetDefragment(IP_t *ip, i h = payload + h->next_hole; } - if (offset8 + (len / 8) <= h - payload) { + if (offset8 + (len / 8) < h - payload) { /* no overlap with holes (dup fragment?) */ return NULL; } The same problem should exist for NFS fragments. The arch is powerpc, U-Boot version 2010.03 (no fix seen in 2010.06-rc). Best Regards -- Stephane

3 4

[U-Boot] [PATCH 1/3] PXA: Fix off-the-tree build problems
by Marek Vasut 08 Aug '10

08 Aug '10

Signed-off-by: Marek Vasut <marek.vasut(a)gmail.com> --- board/colibri_pxa270/Makefile | 18 +++++++++++------- board/vpac270/Makefile | 18 +++++++++++------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/board/colibri_pxa270/Makefile b/board/colibri_pxa270/Makefile index 44d73cc..59575ca 100644 --- a/board/colibri_pxa270/Makefile +++ b/board/colibri_pxa270/Makefile @@ -21,13 +21,17 @@ include $(TOPDIR)/config.mk -LIB = lib$(BOARD).a +LIB = $(obj)lib$(BOARD).a -OBJS := colibri_pxa270.o +COBJS := colibri_pxa270.o SOBJS := lowlevel_init.o -$(LIB): $(OBJS) $(SOBJS) - $(AR) crv $@ $(OBJS) $(SOBJS) +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) clean: rm -f $(SOBJS) $(OBJS) @@ -37,9 +41,9 @@ distclean: clean ######################################################################### -.depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c) - $(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@ +# defines $(obj).depend target +include $(SRCTREE)/rules.mk --include .depend +sinclude $(obj).depend ######################################################################### diff --git a/board/vpac270/Makefile b/board/vpac270/Makefile index 0f3eacd..92fc3a0 100644 --- a/board/vpac270/Makefile +++ b/board/vpac270/Makefile @@ -24,13 +24,17 @@ include $(TOPDIR)/config.mk -LIB = lib$(BOARD).a +LIB = $(obj)lib$(BOARD).a -OBJS := vpac270.o +COBJS := vpac270.o SOBJS := lowlevel_init.o -$(LIB): $(OBJS) $(SOBJS) - $(AR) crv $@ $(OBJS) $(SOBJS) +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) clean: rm -f $(SOBJS) $(OBJS) @@ -40,9 +44,9 @@ distclean: clean ######################################################################### -.depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c) - $(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@ +# defines $(obj).depend target +include $(SRCTREE)/rules.mk --include .depend +sinclude $(obj).depend ######################################################################### -- 1.7.1

1 2

[U-Boot] cannot load file from ext2 partition on OMAP3 evm
by Mickael LANOE 08 Aug '10

08 Aug '10

Hi, The command ext2load does not work on the OMAP3 EVM. The command line is: # ext2load mmc 0:2 0x82000000 /boot/uImage The error is: ext2fs_devread() read error - block After reading the u-boot source code, I see that the function mmc_bread() in file drivers/mmc/omap3_mmc.c does not return the good value. So I apply this small patch to fix the problem Best regards, Mickael LANOE diff --git a/drivers/mmc/omap3_mmc.c b/drivers/mmc/omap3_mmc.c index 96c0e65..b555c73 100644 --- a/drivers/mmc/omap3_mmc.c +++ b/drivers/mmc/omap3_mmc.c @@ -507,9 +507,10 @@ unsigned char configure_mmc(mmc_card_data *mmc_card_cur) unsigned long mmc_bread(int dev_num, unsigned long blknr, lbaint_t blkcnt, void *dst) { - omap_mmc_read_sect(blknr, (blkcnt * MMCSD_SECTOR_SIZE), &cur_card_data, - (unsigned long *) dst); - return 1; + if(omap_mmc_read_sect(blknr, (blkcnt * MMCSD_SECTOR_SIZE), &cur_card_data, + (unsigned long *) dst) != 1) + return 0; + return blkcnt; } int mmc_legacy_init(int verbose)

2 1

[U-Boot] [PATCH] LZMA and LZO causes compile error
by Matthias Weisser 07 Aug '10

07 Aug '10

If both LZMA and LZO compressions are used there is a compile error in cmd_bootm.c Signed-off-by: Matthias Weisser <weisserm(a)arcor.de> --- common/cmd_bootm.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index adfa6cd..4562957 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -333,6 +333,9 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress) ulong image_start = os.image_start; ulong image_len = os.image_len; uint unc_len = CONFIG_SYS_BOOTM_LEN; +#if defined(CONFIG_LZMA) || defined(CONFIG_LZO) + int ret; +#endif /* defined(CONFIG_LZMA) || defined(CONFIG_LZO) */ const char *type_name = genimg_get_type_name (os.type); @@ -389,7 +392,7 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress) case IH_COMP_LZMA: printf (" Uncompressing %s ... ", type_name); - int ret = lzmaBuffToBuffDecompress( + ret = lzmaBuffToBuffDecompress( (unsigned char *)load, &unc_len, (unsigned char *)image_start, image_len); if (ret != SZ_OK) { @@ -405,7 +408,7 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress) case IH_COMP_LZO: printf (" Uncompressing %s ... ", type_name); - int ret = lzop_decompress((const unsigned char *)image_start, + ret = lzop_decompress((const unsigned char *)image_start, image_len, (unsigned char *)load, &unc_len); if (ret != LZO_E_OK) { -- 1.7.0.4

2 1

[U-Boot] [RFC][PATCH 00/19] arm: add full relocation / cache support
by Heiko Schocher 07 Aug '10

07 Aug '10

This patch series add full relocation and cache support for arm based boards. I did this for arm1136, arm_cortexa8 and arm926ejs based boards. As this change is not compatible to old code, before this can go to mainline *all* plattforms and boards have to be converted! As I don;t have access to all plattforms/ boards I need help here! Also I couldn;t test all boards, so please test and report, send bugfixes! Relocation support: changed arch/arm/lib/board.c to get in sync with arch/powerpc/lib/board.c maybe it is possible to merge them to one arch/generic/lib/board.c? This approach is similiar to powerpc, so there is a need for an initial stack pointer addr defined through CONFIG_SYS_INIT_SP_ADDR. As I don;t know all architectures/boards, I set this value where I didn;t find such a stack, for example in the processor, to RAM, as RAM is actual setup in low_level_init.S. Please check this for boards where this is in RAM to find a "better" place. Please also read doc/README.arm-relocation There is more info what is done, and maybe should be done. Cache support: I used the patches from Alessandro Rubini: http://lists.denx.de/pipermail/u-boot/2010-January/067099.html and rebased them to actual code. Also, in case of full relocation, the position of the TLB can not be set on compile time, instead it is calculated in board_init_f() and stored in gd. Also added support for arm_cortexa8 and arm1136. As this is a RFC, this patch series is in a state where things *can* and *should* be discussed! Also I think, it would be good to create an "arm-relocation.git" where patches (for example board maintainers bugfixes) for this change are collected. I tested the patch series on the qong(arm1136), beagle(arm_cortexa8) tx25(arm926ejs) and magnesium(arm926ejs) boards. Relocation worked fine. Cache results: Test 1: Loading 127 MB of data from NAND flash into RAM: Instr. Cache off on on Data Cache off off on -------------------------------------------------- QONG (ARM11) 177s 95s 43s = x 4.1 Beagle (Cortex A8) 116s 106s 30.3s = x 3.8 Test 2: uncompressing a gzipped image from RAM to RAM (size compressed: 6.5 MiB, uncompressed: 35 MiB): Instr. Cache off on on Data Cache off off on -------------------------------------------------- QONG (ARM11) 1.54s 0.95s 0.18s = x 8.6 Beagle (Cortex A8) 1.84s 1.64s 0.12s = x 15.3 Heiko Schocher (19): arm: get rid of bi_env relocation: fixup cmdtable common: move TOTAL_MALLOC_LEN to include/common.h arm, arm1136, qong: add relocation support arm, arm1136: all arm1136 boards converted to new relocation arm, bdinfo: print some more infos. arm, relocation: add documentation i2c: fix command usage help i2c, omap24xx: only set bus_initialized, if uboot is relocated part: fix relocation fixup cortex8, beagle: add relocation support arm, cortexa8: all arm_cortexa8 based boards converted arm926, tx25: add relocation nand_fsl_nfc: get rid of local var arm, 926: convert all arm926ejs based board arm926: flush cache for arm926 arm cp15: setup mmu and enable dcache beagle, cache: activate cache command arm1136, dcache: enable cache command for qong board arch/arm/config.mk | 3 + arch/arm/cpu/arm1136/start.S | 181 +++++++++---- arch/arm/cpu/arm1136/u-boot.lds | 14 +- arch/arm/cpu/arm926ejs/orion5x/dram.c | 12 +- arch/arm/cpu/arm926ejs/start.S | 165 ++++++++---- arch/arm/cpu/arm926ejs/u-boot.lds | 14 +- arch/arm/cpu/armv7/mx51/u-boot.lds | 14 +- arch/arm/cpu/armv7/omap3/cache.S | 82 ++++++ arch/arm/cpu/armv7/omap3/emif4.c | 14 +- arch/arm/cpu/armv7/omap3/sdrc.c | 14 +- arch/arm/cpu/armv7/start.S | 174 +++++++++---- arch/arm/cpu/armv7/u-boot.lds | 14 +- arch/arm/include/asm/config.h | 3 - arch/arm/include/asm/global_data.h | 9 + arch/arm/include/asm/u-boot-arm.h | 8 +- arch/arm/include/asm/u-boot.h | 1 - arch/arm/lib/board.c | 326 +++++++++++++++++++---- arch/arm/lib/cache-cp15.c | 55 ++++ arch/arm/lib/cache.c | 13 +- arch/arm/lib/interrupts.c | 15 +- arch/powerpc/lib/board.c | 10 - board/Marvell/guruplug/guruplug.c | 15 +- board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c | 12 +- board/Marvell/openrd_base/openrd_base.c | 11 +- board/Marvell/rd6281a/rd6281a.c | 15 +- board/Marvell/sheevaplug/sheevaplug.c | 15 +- board/apollon/apollon.c | 13 +- board/armltd/integrator/integrator.c | 14 +- board/armltd/integrator/lowlevel_init.S | 2 +- board/armltd/versatile/versatile.c | 10 + board/atmel/at91cap9adk/at91cap9adk.c | 11 +- board/atmel/at91sam9260ek/at91sam9260ek.c | 11 +- board/atmel/at91sam9261ek/at91sam9261ek.c | 11 +- board/atmel/at91sam9263ek/at91sam9263ek.c | 11 +- board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 11 +- board/atmel/at91sam9rlek/at91sam9rlek.c | 11 +- board/calao/sbc35_a9g20/sbc35_a9g20.c | 15 +- board/calao/tny_a9260/tny_a9260.c | 14 +- board/davedenx/qong/config.mk | 4 +- board/davedenx/qong/qong.c | 92 ++++--- board/davinci/common/misc.c | 12 +- board/esd/meesc/meesc.c | 13 +- board/esd/otc570/otc570.c | 13 +- board/eukrea/cpu9260/cpu9260.c | 15 +- board/freescale/mx31ads/config.mk | 2 +- board/freescale/mx31ads/mx31ads.c | 10 +- board/freescale/mx31ads/u-boot.lds | 14 +- board/freescale/mx31pdk/mx31pdk.c | 11 +- board/freescale/mx51evk/mx51evk.c | 14 +- board/imx31_phycore/config.mk | 2 +- board/imx31_phycore/imx31_phycore.c | 10 +- board/karo/tx25/config.mk | 4 +- board/karo/tx25/tx25.c | 11 +- board/keymile/km_arm/km_arm.c | 13 +- board/logicpd/imx27lite/config.mk | 2 +- board/logicpd/imx27lite/imx27lite.c | 15 +- board/logicpd/imx31_litekit/config.mk | 2 +- board/logicpd/imx31_litekit/imx31_litekit.c | 11 +- board/ronetix/pm9261/pm9261.c | 13 +- board/ronetix/pm9263/pm9263.c | 13 +- board/ronetix/pm9g45/pm9g45.c | 13 +- board/samsung/goni/goni.c | 11 +- board/samsung/smdkc100/smdkc100.c | 9 +- board/st/nhk8815/nhk8815.c | 11 +- board/ti/beagle/config.mk | 2 +- board/ti/omap1510inn/config.mk | 3 +- board/ti/omap1510inn/omap1510innovator.c | 13 +- board/ti/omap1610inn/config.mk | 3 +- board/ti/omap1610inn/omap1610innovator.c | 12 +- board/ti/omap2420h4/config.mk | 6 +- board/ti/omap2420h4/omap2420h4.c | 18 ++- board/ti/omap5912osk/omap5912osk.c | 12 +- board/ti/omap730p2/omap730p2.c | 12 +- common/cmd_bdinfo.c | 10 +- common/cmd_bmp.c | 6 + common/cmd_i2c.c | 11 + common/command.c | 33 +++ disk/part.c | 11 +- doc/README.arm-relocation | 315 ++++++++++++++++++++++ drivers/i2c/omap24xx_i2c.c | 4 +- include/command.h | 3 + include/common.h | 9 + include/configs/am3517_evm.h | 5 + include/configs/apollon.h | 7 + include/configs/at91cap9adk.h | 4 + include/configs/at91sam9260ek.h | 4 + include/configs/at91sam9261ek.h | 4 + include/configs/at91sam9263ek.h | 4 + include/configs/at91sam9m10g45ek.h | 4 + include/configs/at91sam9rlek.h | 4 + include/configs/cpu9260.h | 4 + include/configs/da830evm.h | 5 + include/configs/da850evm.h | 4 + include/configs/davinci_dm355evm.h | 4 + include/configs/davinci_dm355leopard.h | 4 + include/configs/davinci_dm365evm.h | 4 + include/configs/davinci_dm6467evm.h | 4 + include/configs/davinci_dvevm.h | 6 + include/configs/davinci_schmoogie.h | 5 + include/configs/davinci_sffsdr.h | 5 + include/configs/davinci_sonata.h | 6 + include/configs/devkit8000.h | 5 + include/configs/edminiv2.h | 4 + include/configs/guruplug.h | 4 + include/configs/imx27lite-common.h | 4 + include/configs/imx31_litekit.h | 7 + include/configs/imx31_phycore.h | 9 + include/configs/integratorcp.h | 6 + include/configs/km_arm.h | 4 + include/configs/meesc.h | 4 + include/configs/mv88f6281gtw_ge.h | 4 + include/configs/mx31ads.h | 7 + include/configs/mx31pdk.h | 7 + include/configs/mx51evk.h | 5 + include/configs/nhk8815.h | 4 + include/configs/ns9750dev.h | 4 + include/configs/omap1610h2.h | 4 + include/configs/omap1610inn.h | 4 + include/configs/omap2420h4.h | 7 + include/configs/omap3_beagle.h | 5 + include/configs/omap3_evm.h | 5 + include/configs/omap3_overo.h | 5 + include/configs/omap3_pandora.h | 5 + include/configs/omap3_sdp3430.h | 5 + include/configs/omap3_zoom1.h | 5 + include/configs/omap3_zoom2.h | 5 + include/configs/omap5912osk.h | 4 + include/configs/omap730p2.h | 4 + include/configs/openrd_base.h | 4 + include/configs/otc570.h | 4 + include/configs/pm9261.h | 4 + include/configs/pm9263.h | 4 + include/configs/pm9g45.h | 4 + include/configs/qong.h | 10 + include/configs/rd6281a.h | 4 + include/configs/s5p_goni.h | 4 + include/configs/sbc35_a9g20.h | 4 + include/configs/sheevaplug.h | 4 + include/configs/smdkc100.h | 4 + include/configs/tny_a9260.h | 4 + include/configs/tx25.h | 12 +- include/configs/versatile.h | 4 + nand_spl/board/freescale/mx31pdk/u-boot.lds | 14 +- nand_spl/board/karo/tx25/u-boot.lds | 14 +- nand_spl/nand_boot.c | 5 + nand_spl/nand_boot_fsl_nfc.c | 19 +- onenand_ipl/board/apollon/apollon.c | 23 ++ onenand_ipl/board/apollon/u-boot.onenand.lds | 15 +- 148 files changed, 2143 insertions(+), 406 deletions(-) create mode 100644 doc/README.arm-relocation -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

4 9

[U-Boot] [PATCH V5 1/4] ide: add configuration CONFIG_IDE_SWAP_IO
by Albert Aribaud 07 Aug '10

07 Aug '10

This configuration option replaces a complex conditional in cmd_ide.c with an explicit define to be added to SoC or board configs. Signed-off-by: Albert Aribaud <albert.aribaud(a)free.fr> --- This patch set introduces CONFIG_IDE_SWAP_IO as suggested by Wolfgang Denk, adds orion5x support to cmd_ide.c and adds IDE support to edminiv2. Patchset history: V1: Initial 4-patch set -- not cleanly submitted (does not appear on gmane for instance) and contained some unrelated changes. V2: Slimmed down to 3 patches and removed unrelated changes. V3: Back to 4 patches (cmd_ide improvement, driver addition, cmd_ide support for orion, edminiv2 support for sata); made initialization code reuseable as a block driver ; moved to C structures; commented some constants. V4: Reordered objects alphabetically in drivers/block/Makefile. Shortened mv_sata to mvsata. Removed volatile qualifier in mvsata port structure. Moved port pointer definition from SoC to board code. Removed unrelated changes. V5: Fixed typo in mvsata_ide driver (IMP, should have been IPM). arch/powerpc/include/asm/config.h | 3 +++ common/cmd_ide.c | 18 +++++++++--------- doc/README.PXA_CF | 8 ++++++++ include/configs/ap325rxa.h | 1 + include/configs/ms7720se.h | 1 + include/configs/r2dplus.h | 1 + include/configs/r7780mp.h | 1 + 7 files changed, 24 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/include/asm/config.h b/arch/powerpc/include/asm/config.h index fc3facb..371989d 100644 --- a/arch/powerpc/include/asm/config.h +++ b/arch/powerpc/include/asm/config.h @@ -76,4 +76,7 @@ /* Relocation to SDRAM works on all PPC boards */ #define CONFIG_RELOC_FIXUP_WORKS +/* All PPC boards must swap IDE bytes */ +#define CONFIG_IDE_SWAP_IO + #endif /* _ASM_CONFIG_H_ */ diff --git a/common/cmd_ide.c b/common/cmd_ide.c index d486697..9292a5b 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -853,7 +853,7 @@ input_swap_data(int dev, ulong *sect_buf, int words) #endif /* __LITTLE_ENDIAN || CONFIG_AU1X00 */ -#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA) || defined(CONFIG_SH) +#if defined(CONFIG_IDE_SWAP_IO) static void output_data(int dev, ulong *sect_buf, int words) { @@ -897,15 +897,15 @@ output_data(int dev, ulong *sect_buf, int words) } #endif } -#else /* ! __PPC__ */ +#else /* ! CONFIG_IDE_SWAP_IO */ static void output_data(int dev, ulong *sect_buf, int words) { outsw(ATA_CURR_BASE(dev)+ATA_DATA_REG, sect_buf, words<<1); } -#endif /* __PPC__ */ +#endif /* CONFIG_IDE_SWAP_IO */ -#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA) || defined(CONFIG_SH) +#if defined(CONFIG_IDE_SWAP_IO) static void input_data(int dev, ulong *sect_buf, int words) { @@ -955,14 +955,14 @@ input_data(int dev, ulong *sect_buf, int words) } #endif } -#else /* ! __PPC__ */ +#else /* ! CONFIG_IDE_SWAP_IO */ static void input_data(int dev, ulong *sect_buf, int words) { insw(ATA_CURR_BASE(dev)+ATA_DATA_REG, sect_buf, words << 1); } -#endif /* __PPC__ */ +#endif /* CONFIG_IDE_SWAP_IO */ /* ------------------------------------------------------------------------- */ @@ -1579,7 +1579,7 @@ int ide_device_present(int dev) * ATAPI Support */ -#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA) +#if defined(CONFIG_IDE_SWAP_IO) /* since ATAPI may use commands with not 4 bytes alligned length * we have our own transfer functions, 2 bytes alligned */ static void @@ -1646,7 +1646,7 @@ input_data_shorts(int dev, ushort *sect_buf, int shorts) #endif } -#else /* ! __PPC__ */ +#else /* ! CONFIG_IDE_SWAP_IO */ static void output_data_shorts(int dev, ushort *sect_buf, int shorts) { @@ -1659,7 +1659,7 @@ input_data_shorts(int dev, ushort *sect_buf, int shorts) insw(ATA_CURR_BASE(dev)+ATA_DATA_REG, sect_buf, shorts); } -#endif /* __PPC__ */ +#endif /* CONFIG_IDE_SWAP_IO */ /* * Wait until (Status & mask) == res, or timeout (in ms) diff --git a/doc/README.PXA_CF b/doc/README.PXA_CF index 6a0f236..1d76b32 100644 --- a/doc/README.PXA_CF +++ b/doc/README.PXA_CF @@ -6,6 +6,14 @@ follow the connections of the standard lubbock. Anyway just the block marked memory configuration should be touched since the other parameters are imposed by the PXA architecture. +EDIT 2010-07-01: in common/cmd_ide.c, having CONFIG_PXA_PCMCIA defined +would cause looping on inw()/outw() rather than using insw()/outsw(), +thus making sure IDE / ATA bytes are properly swapped. This behaviour +is now controlled by CONFIG_IDE_SWAP_IO, therefore PXA boards with +PCMCIA should #define CONFIG_IDE_SWAP_IO. + +#define CONFIG_IDE_SWAP_IO + #define CONFIG_PXA_PCMCIA 1 #define CONFIG_PXA_IDE 1 diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h index 70dd47e..80a5797 100644 --- a/include/configs/ap325rxa.h +++ b/include/configs/ap325rxa.h @@ -138,6 +138,7 @@ #define CONFIG_SYS_ATA_DATA_OFFSET 0x200 /* data reg offset */ #define CONFIG_SYS_ATA_REG_OFFSET 0x200 /* reg offset */ #define CONFIG_SYS_ATA_ALT_OFFSET 0x210 /* alternate register offset */ +#define CONFIG_IDE_SWAP_IO /* if you use all NOR Flash , you change dip-switch. Please see Manual. */ #define CONFIG_SYS_MAX_FLASH_BANKS 1 diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h index ba0a3f8..0ea3527 100644 --- a/include/configs/ms7720se.h +++ b/include/configs/ms7720se.h @@ -122,5 +122,6 @@ #define CONFIG_SYS_ATA_DATA_OFFSET 0 /* data reg offset */ #define CONFIG_SYS_ATA_REG_OFFSET 0 /* reg offset */ #define CONFIG_SYS_ATA_ALT_OFFSET 0x200 /* alternate register offset */ +#define CONFIG_IDE_SWAP_IO #endif /* __MS7720SE_H */ diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index 8931b97..955f3ff 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -96,6 +96,7 @@ #define CONFIG_SYS_ATA_DATA_OFFSET 0x1000 /* data reg offset */ #define CONFIG_SYS_ATA_REG_OFFSET 0x1000 /* reg offset */ #define CONFIG_SYS_ATA_ALT_OFFSET 0x800 /* alternate register offset */ +#define CONFIG_IDE_SWAP_IO /* * SuperH PCI Bridge Configration diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h index 71c570e..3afe93a 100644 --- a/include/configs/r7780mp.h +++ b/include/configs/r7780mp.h @@ -171,6 +171,7 @@ #define CONFIG_SYS_ATA_DATA_OFFSET 0x1000 /* data reg offset */ #define CONFIG_SYS_ATA_REG_OFFSET 0x1000 /* reg offset */ #define CONFIG_SYS_ATA_ALT_OFFSET 0x800 /* alternate register offset */ +#define CONFIG_IDE_SWAP_IO #endif /* CONFIG_CMD_IDE */ #endif /* __R7780RP_H */ -- 1.6.4.4

4 25

Re: [U-Boot] [PATCH] ext2fs: Fix optimization bug for doubly-indirect block pointers
by Aaron Pace 07 Aug '10

07 Aug '10

Apologies for the oversight, here's the non line-wrapped version. Fix optimization bug for doubly-indirect block pointers Doubly-indirect block numbers are compared against the first-level indirect block when checking for a cached copy. This is causing the doubly-indirect block to be re-read each time it is accessed. Repairing this reduces load time for a 70M file from 72 seconds to 38 seconds. Signed-off-by: Aaron Pace <Aaron.Pace(a)alcatel-lucent.com> --- fs/ext2/ext2fs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fs/ext2/ext2fs.c b/fs/ext2/ext2fs.c index 4b391d6..a88cf87 100644 --- a/fs/ext2/ext2fs.c +++ b/fs/ext2/ext2fs.c @@ -364,7 +364,7 @@ static int ext2fs_read_block (ext2fs_node_t node, int fileblock) { indir2_size = blksz; } if ((__le32_to_cpu (indir1_block[rblock / perblock]) << - log2_blksz) != indir1_blkno) { + log2_blksz) != indir2_blkno) { status = ext2fs_devread (__le32_to_cpu(indir1_block[rblock / perblock]) << log2_blksz, 0, blksz, (char *) indir2_block); -- 1.5.4.3

2 1