June 2014 - U-Boot

[U-Boot] [PATCH] tegra20: display: fix checking of return value
by Jeroen Hofstee 12 Jun '14

12 Jun '14

The calling code seems a bit in doubt about the return value of fdtdec_lookup_phandle. Since it returns a negative value on error (and fdt_node_offset_by_phandle as well), check for that. cc: Wei Ni <wni(a)nvidia.com> Signed-off-by: Jeroen Hofstee <jeroen(a)myspectrum.nl> --- arch/arm/cpu/armv7/tegra20/display.c:331:26: warning: comparison of constant 0 with boolean expression is always false [-Wtautological-constant-out-of-range-compare] if (!config->panel_node < 0) { ~~~~~~~~~~~~~~~~~~~ ^ ~ NOT tested on hw. --- arch/arm/cpu/armv7/tegra20/display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv7/tegra20/display.c b/arch/arm/cpu/armv7/tegra20/display.c index 488f0c6..fd77f3f 100644 --- a/arch/arm/cpu/armv7/tegra20/display.c +++ b/arch/arm/cpu/armv7/tegra20/display.c @@ -328,7 +328,7 @@ static int tegra_display_decode_config(const void *blob, rgb = fdt_subnode_offset(blob, node, "rgb"); config->panel_node = fdtdec_lookup_phandle(blob, rgb, "nvidia,panel"); - if (!config->panel_node < 0) { + if (config->panel_node < 0) { debug("%s: Cannot find panel information\n", __func__); return -1; } -- 1.8.3.2

2 1

[U-Boot] [PATCH 1/3] cmd_mmc: add force_init parameter to init_mmc_device()
by Stephen Warren 12 Jun '14

12 Jun '14

From: Stephen Warren <swarren(a)nvidia.com> This allows callers to inject mmc->has_init = 0 between finding the MMC device, and calling mmc_init(), which forces mmc_init() to rescan the HW. Future changes will use this feature. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- common/cmd_mmc.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c index 9e6a26fe62a2..6741ebee3bca 100644 --- a/common/cmd_mmc.c +++ b/common/cmd_mmc.c @@ -92,7 +92,7 @@ static void print_mmcinfo(struct mmc *mmc) printf("Bus Width: %d-bit\n", mmc->bus_width); } -static struct mmc *init_mmc_device(int dev) +static struct mmc *init_mmc_device(int dev, bool force_init) { struct mmc *mmc; mmc = find_mmc_device(dev); @@ -100,6 +100,8 @@ static struct mmc *init_mmc_device(int dev) printf("no mmc device at slot %x\n", dev); return NULL; } + if (force_init) + mmc->has_init = 0; if (mmc_init(mmc)) return NULL; return mmc; @@ -117,7 +119,7 @@ static int do_mmcinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } } - mmc = init_mmc_device(curr_device); + mmc = init_mmc_device(curr_device, false); if (!mmc) return CMD_RET_FAILURE; @@ -247,7 +249,7 @@ static int do_mmcrpmb(cmd_tbl_t *cmdtp, int flag, if (flag == CMD_FLAG_REPEAT && !cp->repeatable) return CMD_RET_SUCCESS; - mmc = init_mmc_device(curr_device); + mmc = init_mmc_device(curr_device, false); if (!mmc) return CMD_RET_FAILURE; @@ -292,7 +294,7 @@ static int do_mmc_read(cmd_tbl_t *cmdtp, int flag, blk = simple_strtoul(argv[2], NULL, 16); cnt = simple_strtoul(argv[3], NULL, 16); - mmc = init_mmc_device(curr_device); + mmc = init_mmc_device(curr_device, false); if (!mmc) return CMD_RET_FAILURE; @@ -320,7 +322,7 @@ static int do_mmc_write(cmd_tbl_t *cmdtp, int flag, blk = simple_strtoul(argv[2], NULL, 16); cnt = simple_strtoul(argv[3], NULL, 16); - mmc = init_mmc_device(curr_device); + mmc = init_mmc_device(curr_device, false); if (!mmc) return CMD_RET_FAILURE; @@ -348,7 +350,7 @@ static int do_mmc_erase(cmd_tbl_t *cmdtp, int flag, blk = simple_strtoul(argv[1], NULL, 16); cnt = simple_strtoul(argv[2], NULL, 16); - mmc = init_mmc_device(curr_device); + mmc = init_mmc_device(curr_device, false); if (!mmc) return CMD_RET_FAILURE; @@ -387,7 +389,7 @@ static int do_mmc_part(cmd_tbl_t *cmdtp, int flag, block_dev_desc_t *mmc_dev; struct mmc *mmc; - mmc = init_mmc_device(curr_device); + mmc = init_mmc_device(curr_device, false); if (!mmc) return CMD_RET_FAILURE; @@ -422,7 +424,7 @@ static int do_mmc_dev(cmd_tbl_t *cmdtp, int flag, return CMD_RET_USAGE; } - mmc = init_mmc_device(dev); + mmc = init_mmc_device(dev, false); if (!mmc) return CMD_RET_FAILURE; @@ -462,7 +464,7 @@ static int do_mmc_bootbus(cmd_tbl_t *cmdtp, int flag, reset = simple_strtoul(argv[3], NULL, 10); mode = simple_strtoul(argv[4], NULL, 10); - mmc = init_mmc_device(dev); + mmc = init_mmc_device(dev, false); if (!mmc) return CMD_RET_FAILURE; @@ -487,7 +489,7 @@ static int do_mmc_boot_resize(cmd_tbl_t *cmdtp, int flag, bootsize = simple_strtoul(argv[2], NULL, 10); rpmbsize = simple_strtoul(argv[3], NULL, 10); - mmc = init_mmc_device(dev); + mmc = init_mmc_device(dev, false); if (!mmc) return CMD_RET_FAILURE; @@ -520,7 +522,7 @@ static int do_mmc_partconf(cmd_tbl_t *cmdtp, int flag, part_num = simple_strtoul(argv[3], NULL, 10); access = simple_strtoul(argv[4], NULL, 10); - mmc = init_mmc_device(dev); + mmc = init_mmc_device(dev, false); if (!mmc) return CMD_RET_FAILURE; @@ -555,7 +557,7 @@ static int do_mmc_rst_func(cmd_tbl_t *cmdtp, int flag, return CMD_RET_USAGE; } - mmc = init_mmc_device(dev); + mmc = init_mmc_device(dev, false); if (!mmc) return CMD_RET_FAILURE; -- 1.8.1.5

3 11

[U-Boot] [RFC, PATCH v3 0/3] mtd, ubi, ubifs: resync with Linux-3.14
by Heiko Schocher 12 Jun '14

12 Jun '14

resync mtd, ubi and ubifs subsystem with linux: commit 455c6fdbd219161bd09b1165f11699d6d73de11c Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Sun Mar 30 20:40:15 2014 -0700 Linux 3.14 Main reason for this sync is, we now have UBI fastmap support in U-Boot. Tested it on am33xx, imx6 and mpc83xx boards. MAKEALL for arm and powerpc compiles clean. Tested UBI fastmap on a board with 512 MiB nand flash. Attach time from old U-Boot was 2 seconds, reduced with UBI fastmap to 0.2 seconds. Please test this patchserie! The patches lib, rbtree: resync with Linux-3.14 lib, list_sort: add list_sort from linux 3.14 mtd, ubi, ubifs: resync with Linux-3.14 are not checkpatch clean, as they use code from Linux and I do not want to change this. Remarks: - UBI Fastmap is now availiable in U-Boot activate it with CONFIG_MTD_UBI_FASTMAP - replace UBI_LINUX in current UBI code from U-Boot with __UBOOT__ as this define is used in other places in U-Boot where code from other projects is used. - move a lot of defines from include/ubi_uboot.h to include/linux/compat.h, as this is the correcter place for it. - add usb device to linux device, so usb uses "struct device" from "linux/compat.h" - onenand changes only compile tested. - Following Code in drivers/mtd/nand/nand_base.c nand_do_write_ops() adapted for U-Boot: +#ifndef __UBOOT__ /* Reject writes, which are not page aligned */ if (NOTALIGNED(to) || NOTALIGNED(ops->len)) { +else + /* Reject writes, which are not page aligned */ + if (NOTALIGNED(to)) { +endif as the original linux code leads in not working use of the env var "filesize". For example a "nand write 80000000 80000 ${filesize}" would not work with it ... - add CONFIG_MTD_NAND_VERIFY_WRITE from U-Boot code (only compile tested) - Documented the config defines in README - kmalloc now uses memalign for allocating memory. This prevented crashes when tested ubi/ubifs on imx6 board. - To produce this patch I did three steps: - copied the linux source files to U-Boot tree -> commit this - adapt license text in each file -> commit this - make the code again compile clean and working -> commit this Then squashed this three patches to this patch, to not break bisectability. To make further sync with linux easier, the above three patches can be found in: http://git.denx.de/?p=u-boot/u-boot-testing.git;a=shortlog;h=refs/heads/upd… This branch is only thought for further linux syncs! Please do not use this branch for testing this patchseries! - Hope I get all U-Boot specific changes ... so please, test, test, test ... - changes for v2: - add lib/linux_compat.c as Joerg Krause detected - changes for v3: - patch: Patchwork [U-Boot,RFC,v2,1/4] dm: rename device struct to udevice http://patchwork.ozlabs.org/patch/351422/ not longer needed, as it found its way into mainline - add in the commit message the description, how this sync patch with linux was done, as Marek and Tom suggested. - rebase with current U-Boot commit 61e76f53708cf082ef9061a140b57df3513b8ba1 Cc: Marek Vasut <marex(a)denx.de> Cc: Sergey Lapin <slapin(a)ossfans.org> Cc: Scott Wood <scottwood(a)freescale.com> Cc: Wolfgang Denk <wd(a)denx.de> Cc: Joerg Krause <jkrause(a)posteo.de> Heiko Schocher (3): lib, rbtree: resync with Linux-3.14 lib, list_sort: add list_sort from linux 3.14 mtd, ubi, ubifs: resync with Linux-3.14 README | 61 + board/prodrive/alpr/nand.c | 4 + board/socrates/nand.c | 6 + board/tqc/tqm8272/nand.c | 4 + common/cmd_ubi.c | 29 +- common/cmd_ubifs.c | 2 +- drivers/mtd/mtdconcat.c | 230 ++- drivers/mtd/mtdcore.c | 1112 ++++++++++++- drivers/mtd/mtdcore.h | 23 + drivers/mtd/mtdpart.c | 521 +++++- drivers/mtd/nand/fsl_elbc_nand.c | 4 + drivers/mtd/nand/fsl_ifc_nand.c | 4 + drivers/mtd/nand/fsl_upm.c | 4 + drivers/mtd/nand/mpc5121_nfc.c | 4 + drivers/mtd/nand/mxc_nand.c | 8 + drivers/mtd/nand/nand_base.c | 1897 +++++++++++++++------ drivers/mtd/nand/nand_bbt.c | 296 ++-- drivers/mtd/nand/nand_ids.c | 256 +-- drivers/mtd/nand/nand_util.c | 3 + drivers/mtd/nand/ndfc.c | 4 + drivers/mtd/onenand/onenand_base.c | 1 + drivers/mtd/onenand/onenand_bbt.c | 1 - drivers/mtd/onenand/samsung.c | 10 +- drivers/mtd/ubi/Makefile | 3 +- drivers/mtd/ubi/attach.c | 1754 ++++++++++++++++++++ drivers/mtd/ubi/build.c | 812 ++++++--- drivers/mtd/ubi/crc32.c | 13 +- drivers/mtd/ubi/crc32table.h | 2 +- drivers/mtd/ubi/debug.c | 482 ++++-- drivers/mtd/ubi/debug.h | 178 +- drivers/mtd/ubi/eba.c | 474 ++++-- drivers/mtd/ubi/fastmap.c | 1584 ++++++++++++++++++ drivers/mtd/ubi/io.c | 788 +++++---- drivers/mtd/ubi/kapi.c | 276 ++- drivers/mtd/ubi/misc.c | 58 +- drivers/mtd/ubi/scan.c | 1348 --------------- drivers/mtd/ubi/scan.h | 153 -- drivers/mtd/ubi/ubi-media.h | 205 ++- drivers/mtd/ubi/ubi.h | 626 +++++-- drivers/mtd/ubi/upd.c | 104 +- drivers/mtd/ubi/vmt.c | 283 ++-- drivers/mtd/ubi/vtbl.c | 359 ++-- drivers/mtd/ubi/wl.c | 1590 +++++++++++------- drivers/usb/gadget/ether.c | 5 - drivers/usb/gadget/storage_common.c | 5 - drivers/usb/musb-new/linux-compat.h | 58 - drivers/video/exynos_dp.c | 1 + drivers/video/exynos_mipi_dsi.c | 1 + fs/ubifs/budget.c | 662 +++++++- fs/ubifs/debug.c | 3132 ++++++++++++++++++++++++++++++++++- fs/ubifs/debug.h | 578 ++++--- fs/ubifs/io.c | 897 +++++++++- fs/ubifs/key.h | 68 +- fs/ubifs/log.c | 663 +++++++- fs/ubifs/lprops.c | 538 +++++- fs/ubifs/lpt.c | 1242 +++++++++++++- fs/ubifs/lpt_commit.c | 1903 ++++++++++++++++++++- fs/ubifs/master.c | 102 +- fs/ubifs/misc.h | 159 +- fs/ubifs/orphan.c | 671 +++++++- fs/ubifs/recovery.c | 738 ++++++--- fs/ubifs/replay.c | 573 ++++--- fs/ubifs/sb.c | 547 +++++- fs/ubifs/scan.c | 102 +- fs/ubifs/super.c | 2173 ++++++++++++++++++++---- fs/ubifs/tnc.c | 742 ++++++++- fs/ubifs/tnc_misc.c | 124 +- fs/ubifs/ubifs-media.h | 62 +- fs/ubifs/ubifs.c | 115 +- fs/ubifs/ubifs.h | 708 +++++--- fs/yaffs2/ydirectenv.h | 2 - include/linux/compat.h | 327 +++- include/linux/err.h | 15 +- include/linux/list_sort.h | 11 + include/linux/mtd/bbm.h | 73 +- include/linux/mtd/concat.h | 4 + include/linux/mtd/flashchip.h | 105 ++ include/linux/mtd/mtd.h | 272 ++- include/linux/mtd/nand.h | 351 +++- include/linux/mtd/partitions.h | 60 +- include/linux/mtd/ubi.h | 120 +- include/linux/rbtree.h | 147 +- include/linux/rbtree_augmented.h | 220 +++ include/linux/usb/gadget.h | 6 +- include/mtd/mtd-abi.h | 195 ++- include/mtd/ubi-user.h | 305 +++- include/ubi_uboot.h | 164 +- include/usb/lin_gadget_compat.h | 16 - lib/Makefile | 2 + lib/linux_compat.c | 42 + lib/list_sort.c | 298 ++++ lib/rbtree.c | 684 +++++--- 92 files changed, 28068 insertions(+), 7496 deletions(-) create mode 100644 drivers/mtd/mtdcore.h create mode 100644 drivers/mtd/ubi/attach.c create mode 100644 drivers/mtd/ubi/fastmap.c delete mode 100644 drivers/mtd/ubi/scan.c delete mode 100644 drivers/mtd/ubi/scan.h create mode 100644 include/linux/list_sort.h create mode 100644 include/linux/mtd/flashchip.h create mode 100644 include/linux/rbtree_augmented.h create mode 100644 lib/linux_compat.c create mode 100644 lib/list_sort.c -- 1.8.3.1

2 5

[U-Boot] [i2c] Pull request
by Heiko Schocher 12 Jun '14

12 Jun '14

Hello Tom, please pull from u-boot-i2c.git: The following changes since commit e153b13c8e300236e6d505bea629cc81fd0988cb: common/xyzModem.c: move empty statements to newline (2014-06-11 16:27:06 -0400) are available in the git repository at: git://git.denx.de/u-boot-i2c.git master for you to fetch changes up to 6736ec15c518d013263fa97fc48ca22a50753792: i2c: kona: Resolve Kona I2C driver issue (2014-06-12 11:42:50 +0200) ---------------------------------------------------------------- Steve Rae (1): i2c: kona: Resolve Kona I2C driver issue drivers/i2c/kona_i2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Thanks! bye, Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 1

[U-Boot] Pull request: u-boot-mmc 12/06/2014
by Pantelis Antoniou 12 Jun '14

12 Jun '14

Hi Tom, The following changes since commit e153b13c8e300236e6d505bea629cc81fd0988cb: common/xyzModem.c: move empty statements to newline (2014-06-11 16:27:06 -0400) are available in the git repository at: git://git.denx.de/u-boot-mmc.git master for you to fetch changes up to 3d6a5a4dfca25a202e356e4d63e89cdc6bd7255a: mmc: free allocated memory on initialization errors (2014-06-12 15:21:12 +0300) ---------------------------------------------------------------- Darwin Rambo (1): mmc: free allocated memory on initialization errors Stephen Warren (6): mmc: return meaningful error codes from mmc_select_hwpart cmd_mmc: default to HW partition 0 if not specified disk: default to HW partition 0 if not specified cmd_mmc: add force_init parameter to init_mmc_device() cmd_mmc: Use init_mmc_device() from do_mmc_rescan() cmd_mmc: make mmc dev always re-probe the HW common/cmd_mmc.c | 51 +++++++++++++++++++++++---------------------------- disk/part.c | 6 +++--- drivers/mmc/kona_sdhci.c | 8 ++++++-- drivers/mmc/mmc.c | 7 ++++--- 4 files changed, 36 insertions(+), 36 deletions(-) Regards -- Pantelis

3 4

[U-Boot] [PATCH] mmc: free allocated memory on initialization errors
by Darwin Rambo 12 Jun '14

12 Jun '14

Cleanup to balance malloc/free calls. Signed-off-by: Darwin Rambo <drambo(a)broadcom.com> Reviewed-by: Steve Rae <srae(a)broadcom.com> --- drivers/mmc/kona_sdhci.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/kona_sdhci.c b/drivers/mmc/kona_sdhci.c index 77e42c8..f804f4c 100644 --- a/drivers/mmc/kona_sdhci.c +++ b/drivers/mmc/kona_sdhci.c @@ -113,16 +113,20 @@ int kona_sdhci_init(int dev_index, u32 min_clk, u32 quirks) __func__, dev_index); ret = -EINVAL; } - if (ret) + if (ret) { + free(host); return ret; + } host->name = "kona-sdhci"; host->ioaddr = reg_base; host->quirks = quirks; host->host_caps = MMC_MODE_HC; - if (init_kona_mmc_core(host)) + if (init_kona_mmc_core(host)) { + free(host); return -EINVAL; + } if (quirks & SDHCI_QUIRK_REG32_RW) host->version = sdhci_readl(host, SDHCI_HOST_VERSION - 2) >> 16; -- 1.7.9.5

2 1

[U-Boot] [PATCH 1/2] cmd_mmc: default to HW partition 0 if not specified
by Stephen Warren 12 Jun '14

12 Jun '14

From: Stephen Warren <swarren(a)nvidia.com> Currently, "mmc dev 0" does not change the selected HW partition. I think it makes more sense if "mmc dev 0" is an alias for "mmc dev 0 0", i.e. that HW partition 0 (main data area) is always selected by default if the user didn't request a specific partition. Otherwise, the following happens, which feels wrong: Select HW partition 1 (boot0): mmc dev 0 1 Doesn't change the HW partition, so it's still 1 (boot0): mmc dev 0 With this patch, the second command above re-selects the main data area. Note that some MMC devices (i.e. SD cards) don't support HW partitions. However, this patch still works, since mmc_start_init() sets the current partition number to 0, and mmc_select_hwpart() succeeds if the requested partition is already selected. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- This series depends on "mmc: return meaningful error codes from mmc_select_hwpart" (which I just sent) for context. common/cmd_mmc.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c index eea337506c3f..9e6a26fe62a2 100644 --- a/common/cmd_mmc.c +++ b/common/cmd_mmc.c @@ -403,7 +403,7 @@ static int do_mmc_part(cmd_tbl_t *cmdtp, int flag, static int do_mmc_dev(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - int dev, part = -1, ret; + int dev, part = 0, ret; struct mmc *mmc; if (argc == 1) { @@ -426,13 +426,12 @@ static int do_mmc_dev(cmd_tbl_t *cmdtp, int flag, if (!mmc) return CMD_RET_FAILURE; - if (part != -1) { - ret = mmc_select_hwpart(dev, part); - printf("switch to partitions #%d, %s\n", - part, (!ret) ? "OK" : "ERROR"); - if (ret) - return 1; - } + ret = mmc_select_hwpart(dev, part); + printf("switch to partitions #%d, %s\n", + part, (!ret) ? "OK" : "ERROR"); + if (ret) + return 1; + curr_device = dev; if (mmc->part_config == MMCPART_NOAVAILABLE) printf("mmc%d is current device\n", curr_device); -- 1.8.1.5

2 5

[U-Boot] [PATCH V2] cmd_mmc.c: check mmc_init() during mmc dev
by Stephen Warren 12 Jun '14

12 Jun '14

From: Bryan Wu <cooloney(a)gmail.com> mmc dev ${devnum} will return 0 as success even if there is no card inserted. Booting script like tegra-common-post.h will call mmc dev ${devnum} to check the mmc device status, it always return 0 even if mmc_init() fails. Check mmc_init() return value let mmc dev command return failure when mmc_init() fails. Signed-off-by: Bryan Wu <pengw(a)nvidia.com> [swarren: Always return 1 on error; hush doesn't appear to support arbitrary return values. Fixed compilation error due to multiple declaration of ret variable.] Tested-by: Stephen Warren <swarren(a)nvidia.com> Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- v2: * Always return 1 on error; hush doesn't appear to support arbitrary return values. * Fixed compilation error due to multiple declaration of ret variable. --- common/cmd_mmc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c index 572aa895fa1c..2e564572f74d 100644 --- a/common/cmd_mmc.c +++ b/common/cmd_mmc.c @@ -217,7 +217,10 @@ static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 1; } - mmc_init(mmc); + ret = mmc_init(mmc); + if (ret) + return 1; + if (part != -1) { ret = mmc_select_hwpart(dev, part); printf("switch to partitions #%d, %s\n", -- 1.8.1.5

3 6

[U-Boot] error when building env
by Luka Perkov 12 Jun '14

12 Jun '14

Hi, when trying to build env with "-mfloat-abi=hard" I'm hitting this error: /opt/openwrt/trunk/staging_dir/toolchain-arm_cortex-a9+neon_gcc-4.8-linaro_uClibc-0.9.33.2_eabi/bin/arm-openwrt-linux-uclibcgnueabi-gcc -o tools/env/fw_printenv_unstripped tools/env/fw_env.o tools/env/fw_env_main.o tools/env/crc32.o tools/env/ctype.o tools/env/linux_string.o tools/env/env_attr.o tools/env/env_flags.o tools/env/aes.o /opt/build/owrt_staging_dir/toolchain-arm_cortex-a9+neon_gcc-4.8-linaro_uClibc-0.9.33.2_eabi/bin/../lib/gcc/arm-openwrt-linux-uclibcgnueabi/4.8.3/../../../../arm-openwrt-linux-uclibcgnueabi/bin/ld: error: tools/env/fw_printenv_unstripped uses VFP register arguments, tools/env/fw_env.o does not /opt/build/owrt_staging_dir/toolchain-arm_cortex-a9+neon_gcc-4.8-linaro_uClibc-0.9.33.2_eabi/bin/../lib/gcc/arm-openwrt-linux-uclibcgnueabi/4.8.3/../../../../arm-openwrt-linux-uclibcgnueabi/bin/ld: failed to merge target specific data of file tools/env/fw_env.o /opt/build/owrt_staging_dir/toolchain-arm_cortex-a9+neon_gcc-4.8-linaro_uClibc-0.9.33.2_eabi/bin/../lib/gcc/arm-openwrt-linux-uclibcgnueabi/4.8.3/../../../../arm-openwrt-linux-uclibcgnueabi/bin/ld: error: tools/env/fw_printenv_unstripped uses VFP register arguments, tools/env/fw_env_main.o does not /opt/build/owrt_staging_dir/toolchain-arm_cortex-a9+neon_gcc-4.8-linaro_uClibc-0.9.33.2_eabi/bin/../lib/gcc/arm-openwrt-linux-uclibcgnueabi/4.8.3/../../../../arm-openwrt-linux-uclibcgnueabi/bin/ld: failed to merge target specific data of file tools/env/fw_env_main.o /opt/build/owrt_staging_dir/toolchain-arm_cortex-a9+neon_gcc-4.8-linaro_uClibc-0.9.33.2_eabi/bin/../lib/gcc/arm-openwrt-linux-uclibcgnueabi/4.8.3/../../../../arm-openwrt-linux-uclibcgnueabi/bin/ld: error: tools/env/fw_printenv_unstripped uses VFP register arguments, tools/env/crc32.o does not /opt/build/owrt_staging_dir/toolchain-arm_cortex-a9+neon_gcc-4.8-linaro_uClibc-0.9.33.2_eabi/bin/../lib/gcc/arm-openwrt-linux-uclibcgnueabi/4.8.3/../../../../arm-openwrt-linux-uclibcgnueabi/bin/ld: failed to merge target specific data of file tools/env/crc32.o /opt/build/owrt_staging_dir/toolchain-arm_cortex-a9+neon_gcc-4.8-linaro_uClibc-0.9.33.2_eabi/bin/../lib/gcc/arm-openwrt-linux-uclibcgnueabi/4.8.3/../../../../arm-openwrt-linux-uclibcgnueabi/bin/ld: error: tools/env/fw_printenv_unstripped uses VFP register arguments, tools/env/ctype.o does not /opt/build/owrt_staging_dir/toolchain-arm_cortex-a9+neon_gcc-4.8-linaro_uClibc-0.9.33.2_eabi/bin/../lib/gcc/arm-openwrt-linux-uclibcgnueabi/4.8.3/../../../../arm-openwrt-linux-uclibcgnueabi/bin/ld: failed to merge target specific data of file tools/env/ctype.o /opt/build/owrt_staging_dir/toolchain-arm_cortex-a9+neon_gcc-4.8-linaro_uClibc-0.9.33.2_eabi/bin/../lib/gcc/arm-openwrt-linux-uclibcgnueabi/4.8.3/../../../../arm-openwrt-linux-uclibcgnueabi/bin/ld: error: tools/env/fw_printenv_unstripped uses VFP register arguments, tools/env/linux_string.o does not /opt/build/owrt_staging_dir/toolchain-arm_cortex-a9+neon_gcc-4.8-linaro_uClibc-0.9.33.2_eabi/bin/../lib/gcc/arm-openwrt-linux-uclibcgnueabi/4.8.3/../../../../arm-openwrt-linux-uclibcgnueabi/bin/ld: failed to merge target specific data of file tools/env/linux_string.o /opt/build/owrt_staging_dir/toolchain-arm_cortex-a9+neon_gcc-4.8-linaro_uClibc-0.9.33.2_eabi/bin/../lib/gcc/arm-openwrt-linux-uclibcgnueabi/4.8.3/../../../../arm-openwrt-linux-uclibcgnueabi/bin/ld: error: tools/env/fw_printenv_unstripped uses VFP register arguments, tools/env/env_attr.o does not /opt/build/owrt_staging_dir/toolchain-arm_cortex-a9+neon_gcc-4.8-linaro_uClibc-0.9.33.2_eabi/bin/../lib/gcc/arm-openwrt-linux-uclibcgnueabi/4.8.3/../../../../arm-openwrt-linux-uclibcgnueabi/bin/ld: failed to merge target specific data of file tools/env/env_attr.o /opt/build/owrt_staging_dir/toolchain-arm_cortex-a9+neon_gcc-4.8-linaro_uClibc-0.9.33.2_eabi/bin/../lib/gcc/arm-openwrt-linux-uclibcgnueabi/4.8.3/../../../../arm-openwrt-linux-uclibcgnueabi/bin/ld: error: tools/env/fw_printenv_unstripped uses VFP register arguments, tools/env/env_flags.o does not /opt/build/owrt_staging_dir/toolchain-arm_cortex-a9+neon_gcc-4.8-linaro_uClibc-0.9.33.2_eabi/bin/../lib/gcc/arm-openwrt-linux-uclibcgnueabi/4.8.3/../../../../arm-openwrt-linux-uclibcgnueabi/bin/ld: failed to merge target specific data of file tools/env/env_flags.o /opt/build/owrt_staging_dir/toolchain-arm_cortex-a9+neon_gcc-4.8-linaro_uClibc-0.9.33.2_eabi/bin/../lib/gcc/arm-openwrt-linux-uclibcgnueabi/4.8.3/../../../../arm-openwrt-linux-uclibcgnueabi/bin/ld: error: tools/env/fw_printenv_unstripped uses VFP register arguments, tools/env/aes.o does not When env is built with "-mfloat-abi=soft" everything is fine. Has this been triggered by anyone else? Thanks! Luka

4 6

[U-Boot] [RFC] Proposal to change include search model
by Vasili Galka 12 Jun '14

12 Jun '14

Hi, Currently U-Boot has a long list of include search paths. This makes it hard to understand the location of each header. Moreover, it opens an easy opportunity for breaking build by including the wrong header. This is especially easy when compiling the tools directory. I found numerous commits dealing with such problems over the years. What I propose is changing the way of how #include directives are written. For example instead of: #include <stdlib.h> /* From toolchain */ #include <api_public.h> /* include/api_public.h */ #include <linux/mii.h> /* include/linux/mii.h */ #include <config.h> /* Auto-generated somewhere */ #include <bmp_logo.h> /* Auto-generated somewhere */ #include <asm/arcregs.h> /* arch/arc/include/asm/arcregs.h */ #include <asm/arch/emac_defs.h> /* arch/arm/include/asm/ arch-davinci/emac_defs.h */ #include "../../../../../drivers/net/davinci_emac.h" and let the developer guess the locations... I propose writing: #include <stdlib.h> /* <> means from toolchain */ #include "inc/api_public.h" /* From u-boot/include/ dir */ #include "inc/linux/mii.h" #include "config/config.h" /* From dedicated config dir */ #include "generated/bmp_logo.h" #include "arch/asm/arcregs.h" /* From configured architecture */ #include "soc/emac_defs.h" /* From configured SoC */ #include "u-boot/drivers/net/davinci_emac.h" This way the developer will instantly know the exact header locations. Moreover, the chance for ambiguities is very small which makes build breakages less likely. The proposal may seem strange to you at first, as most of you are probably used to a different approach. But please consider its advantages. I've been working on projects that used similar scheme and it significantly simplifies the developer life. The above can be implemented by creating inc/ arch/ soc/ u-boot/ filesystem links in ${objtree}/include. Then, the only compiler flag required will be "-iquote ${objtree}/include". No ugly -idirafter flags, no long search list. Keep it simple. I'll be glad for your opinions! P.S. I've already mentioned this proposal when discussing Cygwin/FreeBSD build breakages. But it deserves a separate thread. Best, Vasili

2 2