May 2016 - U-Boot

[U-Boot] [PATCH 0/2] efi_loader: Add bounce buffers
by Alexander Graf 30 May '16

30 May '16

While testing our shiny new EFI support, I stumbled across systems that have disk I/O hardware that can only access the lower 32bits of our physical address space. This is not a problem when running with the normal U-Boot flow, since we define all "pointers" that get in use in our environment, so we can just put them inside the lower 32bits. But when a higher level application such as an EFI payload comes across, it doesn't know about these constraints. So we need to allocate bounce buffers for the payload and use them instead. Alexander Graf (2): efi_loader: Add bounce buffer support efi_loader: Select bounce buffers for known-bad boards configs/ls2080a_emu_defconfig | 1 + configs/ls2080a_simu_defconfig | 1 + configs/ls2080aqds_SECURE_BOOT_defconfig | 1 + configs/ls2080aqds_defconfig | 1 + configs/ls2080aqds_nand_defconfig | 1 + configs/ls2080ardb_SECURE_BOOT_defconfig | 1 + configs/ls2080ardb_defconfig | 1 + configs/ls2080ardb_nand_defconfig | 1 + configs/xilinx_zynqmp_ep_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + configs/xilinx_zynqmp_zcu102_defconfig | 1 + configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + include/efi_loader.h | 5 ++ lib/efi_loader/Kconfig | 9 +++ lib/efi_loader/efi_disk.c | 70 +++++++++++++++++++++--- lib/efi_loader/efi_memory.c | 16 ++++++ 18 files changed, 105 insertions(+), 9 deletions(-) -- 1.8.5.6

3 8

[U-Boot] [PATCH RESEND] cosmetic: debug: Replace #ifdef DEBUG with debug() macro
by Lukasz Majewski 30 May '16

30 May '16

Replace #ifdef DEBUG with dedicated debug() macro. Signed-off-by: Lukasz Majewski <l.majewski(a)majess.pl> --- common/bootm_os.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common/bootm_os.c b/common/bootm_os.c index cb83f4a..9ec84bd 100644 --- a/common/bootm_os.c +++ b/common/bootm_os.c @@ -484,9 +484,8 @@ int boot_selected_os(int argc, char * const argv[], int state, state == BOOTM_STATE_OS_FAKE_GO) /* We expect to return */ return 0; bootstage_error(BOOTSTAGE_ID_BOOT_OS_RETURNED); -#ifdef DEBUG - puts("\n## Control returned to monitor - resetting...\n"); -#endif + debug("\n## Control returned to monitor - resetting...\n"); + return BOOTM_ERR_RESET; } -- 2.1.4

3 2

[U-Boot] [PATCH] test/py: fix NameError exception if bdi cmd is not supported
by Heiko Schocher 30 May '16

30 May '16

test/py raises an error, if a board has not enabled bdi command > pytest.skip('bdinfo command not supported') E NameError: global name 'pytest' is not defined import pytest in test/py/u_boot_utils.py fixes this. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- found on the corvus board, which does not support this command. For interests: I integrated test/py into tbot, and catch test/py results, see as a demo: http://xeidos.ddns.net/tests/test_db_auslesen.php test/py/u_boot_utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/py/u_boot_utils.py b/test/py/u_boot_utils.py index 72d24e4..1d7b12a 100644 --- a/test/py/u_boot_utils.py +++ b/test/py/u_boot_utils.py @@ -9,6 +9,7 @@ import os import os.path import sys import time +import pytest def md5sum_data(data): """Calculate the MD5 hash of some data. -- 2.5.5

3 2

[U-Boot] [PATCH] cmd: replace the cast of the memory access to a fixed bit type in itest
by Masahiro Yamada 30 May '16

30 May '16

From: Kunihiko Hayashi <hayashi.kunihiko(a)socionext.com> This patch fixes a bug that long word(.l) memory access in 'itest' command reads the 8bytes of the actual memory on 64-bit architecture. The cast to the memory pointer should use a fixed bit type. Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko(a)socionext.com> Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- cmd/itest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/itest.c b/cmd/itest.c index fb4d797..60626c7 100644 --- a/cmd/itest.c +++ b/cmd/itest.c @@ -65,13 +65,13 @@ static long evalexp(char *s, int w) } switch (w) { case 1: - l = (long)(*(unsigned char *)buf); + l = (long)(*(u8 *)buf); break; case 2: - l = (long)(*(unsigned short *)buf); + l = (long)(*(u16 *)buf); break; case 4: - l = (long)(*(unsigned long *)buf); + l = (long)(*(u32 *)buf); break; } unmap_physmem(buf, w); -- 1.9.1

4 3

[U-Boot] [PATCH v1] disk: part_efi: fix check of the max partition size
by Patrick Delaunay 30 May '16

30 May '16

the last value acceptable value for offset is last_usable_lba + 1 and not last_usable_lba - 1 issue found with SDCARD partition commands on u-boot 2015.10 but this part of code don't change 1- create GPT partion on all the card > gpt write mmc 0 name=test,start=0,size=0 > part list mmc 0 Partition Map for MMC device 0 -- Partition Type: EFI Part Start LBA End LBA Name Attributes Type GUID Partition GUID 1 0x00000022 0x003a9fde "test" attrs: 0x0000000000000000 type: ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 type: data guid: b710eb04-45b9-e94a-8d0b-21458d596f54 => Start = 0x22*512 = 0x4400 => Size = (0x003a9fde-0x22+1) * 512 = 0x753F7A00 2- try to recreate the same partition with the next command (block size:512 bytes = 0x200) > gpt write mmc 0 name=test,start=0x4400,size=0x753F7A00 Writing GPT: Partitions layout exceds disk size > gpt write mmc 0 name=test,start=0x4400,size=0x753F7800 Writing GPT: Partitions layout exceds disk size > gpt write mmc 0 name=test,start=0x4400,size=0x753F7600 Writing GPT: success! Partition Map for MMC device 0 -- Partition Type: EFI Part Start LBA End LBA Name Attributes Type GUID Partition GUID 1 0x00000022 0x003a9fdc "test" attrs: 0x0000000000000000 type: ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 type: data guid: 36ec30ef-7ca4-cd48-97cd-ea9fb95185d0 the max LBA when the size is indicated (0x003a9fdc) is lower than when u-boot compute the max allowed value with size=0 (0x003a9fde) in the code : /* partition ending lba */ if ((i == parts - 1) && (partitions[i].size == 0)) /* extend the last partition to maximuim */ gpt_e[i].ending_lba = gpt_h->last_usable_lba; else gpt_e[i].ending_lba = cpu_to_le64(offset - 1); so offset = gpt_h->last_usable_lba + 1 is acceptable ! but the test (offset >= last_usable_lba) cause the error END Signed-off-by: Patrick Delaunay <patrick.delaunay73(a)gmail.com>disk: part_efi: fix check of the max partition size the last value acceptable value for offset is (last_usable_lba + 1) and not (last_usable_lba - 1) issue found with SDCARD partition commands on u-boot 2015.10 but this part of code don't change 1- I create GPT partion on all the card (start and size undefined) > gpt write mmc 0 name=test,start=0,size=0 > part list mmc 0 Partition Map for MMC device 0 -- Partition Type: EFI Part Start LBA End LBA Name Attributes Type GUID Partition GUID 1 0x00000022 0x003a9fde "test" attrs: 0x0000000000000000 type: ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 type: data guid: b710eb04-45b9-e94a-8d0b-21458d596f54 => Start = 0x22*512 = 0x4400 => Size = (0x003a9fde-0x22+1) * 512 = 0x753F7A00 2- I try to recreate the same partition with the command gpt write and with start and size values (block size:512 bytes = 0x200) > gpt write mmc 0 name=test,start=0x4400,size=0x753F7A00 Writing GPT: Partitions layout exceds disk size > gpt write mmc 0 name=test,start=0x4400,size=0x753F7800 Writing GPT: Partitions layout exceds disk size > gpt write mmc 0 name=test,start=0x4400,size=0x753F7600 Writing GPT: success! I check the partition created : > part list mmc 0 Partition Map for MMC device 0 -- Partition Type: EFI Part Start LBA End LBA Name Attributes Type GUID Partition GUID 1 0x00000022 0x003a9fdc "test" attrs: 0x0000000000000000 type: ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 type: data guid: 36ec30ef-7ca4-cd48-97cd-ea9fb95185d0 => but the max LBA when the size is indicated (0x003a9fdc) is lower than when u-boot compute the max allowed value with size=0 (0x003a9fde) 3- in the code, just after my patch, line 446 /* partition ending lba */ if ((i == parts - 1) && (partitions[i].size == 0)) /* extend the last partition to maximuim */ gpt_e[i].ending_lba = gpt_h->last_usable_lba; else gpt_e[i].ending_lba = cpu_to_le64(offset - 1); so offset = gpt_h->last_usable_lba + 1 is acceptable ! (it the value used when size is 0) but today the test (offset >= last_usable_lba) cause the error my patch only solve this issue END Signed-off-by: Patrick Delaunay <patrick.delaunay73(a)gmail.com> --- disk/part_efi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disk/part_efi.c b/disk/part_efi.c index fe308d7..0af1e92 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -439,7 +439,7 @@ int gpt_fill_pte(gpt_header *gpt_h, gpt_entry *gpt_e, gpt_e[i].starting_lba = cpu_to_le64(offset); offset += partitions[i].size; } - if (offset >= last_usable_lba) { + if (offset > (last_usable_lba + 1)) { printf("Partitions layout exceds disk size\n"); return -1; } -- 1.9.1

2 1

[U-Boot] [PATCH] cmd: disk: Fix unused variable warning
by Marek Vasut 30 May '16

30 May '16

If serial support is not compiled into U-Boot, which may be the case for some SPL builds, the following warning will be generated in disk.c: cmd/disk.c: In function 'common_diskboot': cmd/disk.c:16:6: warning: variable 'dev' set but not used [-Wunused-but-set-variable] int dev, part; ^ The warning is a result of printf() calls being optimized away, and thus the whole dev variable becomes indeed unused. Mark the variable as __maybe_unused . Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)konsulko.com> --- cmd/disk.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/disk.c b/cmd/disk.c index 2fd1717..4c88554 100644 --- a/cmd/disk.c +++ b/cmd/disk.c @@ -13,7 +13,8 @@ int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc, char *const argv[]) { - int dev, part; + __maybe_unused int dev; + int part; ulong addr = CONFIG_SYS_LOAD_ADDR; ulong cnt; disk_partition_t info; -- 2.7.0

3 3

[U-Boot] [PATCH] dm: gpio: pca953x: Support PCA953X with 40 GPIOs
by Mario Six 30 May '16

30 May '16

A DM driver for PCA953x was recently introduced by Peng Fan, which lacked support for the 40 GPIO versions. This patch adds support for these chips. Signed-off-by: Mario Six <mario.six(a)gdsys.cc> --- drivers/gpio/pca953x_gpio.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/gpio/pca953x_gpio.c b/drivers/gpio/pca953x_gpio.c index 987d10e..065b181 100644 --- a/drivers/gpio/pca953x_gpio.c +++ b/drivers/gpio/pca953x_gpio.c @@ -16,8 +16,8 @@ * * TODO: * 1. Support PCA957X_TYPE - * 2. Support max 40 gpio pins - * 3. Support Plolarity Inversion + * 2. Support 24 gpio pins + * 3. Support Polarity Inversion */ #include <common.h> @@ -47,7 +47,7 @@ enum { PCA953X_DIRECTION_OUT, }; -#define MAX_BANK 3 +#define MAX_BANK 5 #define BANK_SZ 8 DECLARE_GLOBAL_DATA_PTR; @@ -121,6 +121,9 @@ static int pca953x_read_regs(struct udevice *dev, int reg, u8 *val) ret = dm_i2c_read(dev, reg, val, 1); } else if (info->gpio_count <= 16) { ret = dm_i2c_read(dev, reg << 1, val, info->bank_count); + } else if (info->gpio_count == 40) { + /* Auto increment */ + ret = dm_i2c_read(dev, (reg << 3) | 0x80, val, info->bank_count); } else { dev_err(dev, "Unsupported now\n"); return -EINVAL; -- 2.7.0.GIT

4 3

[U-Boot] [PATCH v2 0/5] tools/env: pass arguments as parameters not global structure
by Andreas Fenkart 30 May '16

30 May '16

u-boot tools can be built as a library (libubootenv.a). Passing arguments to the library using global structures is a bad interface. v2: - fix env_aes_cbc_crypt prototype - check opts pointer for not NULL Andreas Fenkart (5): tools/env: pass key as argument to env_aes_cbc_crypt tools/env: remove 'extern' from function prototype in fw_env.h tools/env: fw_printenv pass value_only as argument tools/env: compute size of usable area only once tools/env: replace global variables by parameter passing tools/env/fw_env.c | 111 ++++++++++++++++++++++++++++-------------------- tools/env/fw_env.h | 31 +++++--------- tools/env/fw_env_main.c | 28 +++++++----- 3 files changed, 94 insertions(+), 76 deletions(-) -- 2.8.0.rc3

2 8

[U-Boot] Please pull u-boot-rockchip
by Simon Glass 30 May '16

30 May '16

Hi Tom, Here's a rebased version of the last pull request. The following changes since commit 6523dbf7cce8d8c903346f756e0e41e46ce6d6b9: Merge branch 'master' of git://git.denx.de/u-boot-mips (2016-05-25 20:22:48 -0400) are available in the git repository at: git://git.denx.de/u-boot-rockchip.git for you to fetch changes up to 2ed6dc83380ea2f49ec09556c14c6eddd3f5c27a: rockchip: rock2: dts: use status = "okay" not ok (2016-05-27 09:00:48 -0600) ---------------------------------------------------------------- Sjoerd Simons (6): net: designware: support phy reset device-tree bindings rockchip: rk3288: pinctrl: support more pins rockchip: rk3288: Add clock support for the gmac ethernet interface rockchip: rk3288: grf: Define GRF_SOC_CON1 and GRF_SOC_CON3 rockchip: rk3288-firefly: Add gmac definition rockchip: rock2: dts: use status = "okay" not ok arch/arm/dts/rk3288-firefly.dtsi | 16 ++++++++++++++ arch/arm/dts/rk3288-rock2-square.dts | 2 +- arch/arm/include/asm/arch-rockchip/cru_rk3288.h | 17 +++++++++++++++ arch/arm/include/asm/arch-rockchip/grf_rk3288.h | 53 +++++++++++++++++++++++++++++++++++++++++++++ drivers/clk/clk_rk3288.c | 14 ++++++++++++ drivers/net/designware.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ drivers/net/designware.h | 10 +++++++++ drivers/pinctrl/rockchip/pinctrl_rk3288.c | 2 +- 8 files changed, 182 insertions(+), 8 deletions(-) Regards, Simon

2 1

[U-Boot] [PATCH v1 0/7] add support for the etamin draco board variant.
by Heiko Schocher 30 May '16

30 May '16

In the draco CPU board family, etamin is a new variant with bigger flash and more RAM. Due to new flash that uses larger pages (4K) some changes are necessary because it impacts the MTD partition layout and the ubi mount parameters. special here is: - adding MTD concat support for nand flashs - add UBI Fastmap support for the siemens boards - fix a bug in dfu/nand when erasing remaining blocks on ubi partitions. - nand on etamin uses eccstrength bch16, so support switch to bch16 also. - read the ecc type from the config in i2c eeprom, so no need to use a define. $ ./tools/buildman/buildman arm -s WARNING: no status info for 'kylin-rk3036' WARNING: no maintainers for 'kylin-rk3036' WARNING: no status info for 'ls1043aqds_lpuart' WARNING: no maintainers for 'ls1043aqds_lpuart' WARNING: no status info for 'ds414' WARNING: no maintainers for 'ds414' WARNING: no status info for 'evb-rk3036' WARNING: no maintainers for 'evb-rk3036' Summary of current source for 560 boards (8 threads, 1 job per thread) arm: + Cubietruck omap3_logic omap3_overo gwventana $ No new errors/warnings Heiko Schocher (6): ubi: add new ubi command "ubi dettach" nand: add nand mtd concat support mtd: nand: omap: allow to switch to BCH16 am335x, dxr2: get ECC sType from I2C eeprom dfu, nand, ubi: fix erasing after write finish siemens,am33x: add draco etamin board Samuel Egli (1): siemens,am33x: add ubi fastmap support arch/arm/Kconfig | 5 + arch/arm/cpu/armv7/omap3/board.c | 6 +- board/siemens/common/board.c | 4 + board/siemens/draco/Kconfig | 16 ++ board/siemens/draco/MAINTAINERS | 1 + board/siemens/draco/board.c | 84 ++++++++++- board/siemens/draco/mux.c | 2 +- cmd/ubi.c | 38 +++-- configs/etamin_defconfig | 17 +++ drivers/dfu/dfu_nand.c | 12 +- drivers/mtd/nand/nand.c | 29 ++++ drivers/mtd/nand/omap_gpmc.c | 4 + include/configs/draco.h | 1 + include/configs/etamin.h | 261 +++++++++++++++++++++++++++++++++ include/configs/pxm2.h | 1 + include/configs/rastaban.h | 1 + include/configs/rut.h | 1 + include/configs/siemens-am33x-common.h | 7 +- include/configs/thuban.h | 1 + 19 files changed, 472 insertions(+), 19 deletions(-) create mode 100644 configs/etamin_defconfig create mode 100644 include/configs/etamin.h -- 2.5.5

3 19