November 2018 - U-Boot

[U-Boot] Please pull u-boot-dm
by Simon Glass 24 Nov '18

24 Nov '18

Hi Tom, The following changes since commit a3e1653ddeb02f39481eba572275016171e9670c: Merge git://git.denx.de/u-boot-marvell (2018-11-20 12:39:16 -0500) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/pull-tg18 for you to fetch changes up to a58986ca8b53d8c7a441397082f84edc7f47d19f: sf: Add a method to obtain the block-protect setting (2018-11-20 19:14:22 -0700) https://travis-ci.org/sglass68/u-boot/builds/457752510 ---------------------------------------------------------------- Various minor sandbox improvements Better buildman warning handling Misc other things ---------------------------------------------------------------- Baruch Siach (1): fdt: restore board_fdt_blob_setup() declaration Heinrich Schuchardt (3): sandbox: remove stray DEBUG sandbox: README: setting environment variables sandbox: README: use setenv ethrotate no Hiroyuki Yokoyama (1): cmd: fdt: Fix fdt address information after the movement Hou Zhiqiang (1): dm/pci: Change the first CFG read to Vendor ID in enumeration Liviu Dudau (1): dm: core: Widen the dump tree to show more of the driver's name. Marek Vasut (1): fdt: Fix uncompress_blob() for U-Boot proper Simon Glass (24): buildman: Only print toolchain probing with -v buildman: Detect dtc warnings buildman: Rename the good, better, worse variables buildman: Show boards with warning with w+ cros_ec: Use uint instead of u8 for parameters cros_ec: Add error logging on a few commands cros_ec: Fail if we cannot determine the flash burst size cros_ec: Align uclass data to a cache boundary cros_ec: Add new features for events and power sandbox: tpm: Allow debugging of data packages sandbox: log: Add a category for sandbox sandbox: Add a function to read a host file sandbox: cros_ec: exynos: Drop use of cros_ec_get_error() sandbox: Update some drivers to work in SPL/TPL spl: Support bootstage, log, hash and early malloc in TPL spl: lz4: Allow use of lz4 compression in SPL binman: Add a way to enable debugging from the build binman: Drop an unnecessary comma in blob handling binman: Set the pathname correctly for ELF files video: Update video_set_default_colors() to support invert string: Include the config header misc: Update read() and write() methods to return bytes xfered test: sf: Add a simple SPI flash test sf: Add a method to obtain the block-protect setting Simon Goldschmidt (1): dm: spi: prevent setting a speed of 0 Hz Makefile | 6 +- arch/arm/mach-stm32mp/cpu.c | 4 +- arch/sandbox/cpu/cpu.c | 8 +- arch/sandbox/cpu/os.c | 44 ++++++- arch/sandbox/dts/sandbox.dts | 15 +++ arch/sandbox/include/asm/test.h | 8 ++ board/samsung/common/board.c | 10 +- board/sandbox/README.sandbox | 20 +-- board/sandbox/sandbox.c | 9 +- cmd/fdt.c | 2 +- common/Kconfig | 35 ++++++ common/Makefile | 10 +- common/cros_ec.c | 12 -- drivers/clk/clk_vexpress_osc.c | 4 +- drivers/core/dump.c | 8 +- drivers/misc/altera_sysid.c | 2 +- drivers/misc/cros_ec.c | 370 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- drivers/misc/cros_ec_sandbox.c | 2 +- drivers/misc/misc_sandbox.c | 4 +- drivers/misc/rockchip-efuse.c | 2 +- drivers/misc/stm32mp_fuse.c | 12 ++ drivers/mtd/spi/sandbox.c | 10 ++ drivers/mtd/spi/sf-uclass.c | 9 ++ drivers/mtd/spi/sf_internal.h | 3 + drivers/mtd/spi/sf_probe.c | 8 ++ drivers/mtd/spi/spi_flash.c | 12 ++ drivers/pci/pci-uclass.c | 11 +- drivers/spi/spi-uclass.c | 15 ++- drivers/tpm/tpm_tis_sandbox.c | 6 + drivers/video/vidconsole-uclass.c | 2 +- drivers/video/video-uclass.c | 27 ++-- include/cros_ec.h | 89 +++++++++++++ include/fdtdec.h | 1 + include/log.h | 1 + include/misc.h | 8 +- include/os.h | 14 +++ include/spi_flash.h | 27 ++++ include/video.h | 5 +- lib/Kconfig | 8 ++ lib/Makefile | 2 +- lib/fdtdec.c | 3 +- lib/string.c | 1 + test/dm/misc.c | 6 +- test/dm/sf.c | 55 ++++++++- test/py/tests/test_bind.py | 28 ++--- tools/binman/README | 6 + tools/binman/etype/blob.py | 2 +- tools/binman/etype/u_boot_elf.py | 5 +- tools/buildman/builder.py | 41 +++--- tools/buildman/cmdline.py | 2 +- tools/buildman/control.py | 2 +- tools/buildman/test.py | 61 ++++++--- 52 files changed, 909 insertions(+), 148 deletions(-) Regards, Simon

2 1

[U-Boot] [PATCH] usb: gadget: f_sdp: Provide filesize env variable for downloaded images
by Petr Štetiar 23 Nov '18

23 Nov '18

Currently it's not possible to get filesize of downloaded images and it's impossible to automate some tasks in scripts. Cc: Lukasz Majewski <lukma(a)denx.de> Cc: Marek Vasut <marex(a)denx.de> Cc: Stefan Agner <stefan.agner(a)toradex.com> Signed-off-by: Petr Štetiar <ynezz(a)true.cz> --- drivers/usb/gadget/f_sdp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c index 00a9f88..ae97ab2 100644 --- a/drivers/usb/gadget/f_sdp.c +++ b/drivers/usb/gadget/f_sdp.c @@ -100,6 +100,7 @@ struct f_sdp { enum sdp_state state; enum sdp_state next_state; u32 dnl_address; + u32 dnl_bytes; u32 dnl_bytes_remaining; u32 jmp_address; bool always_send_status; @@ -276,6 +277,7 @@ static void sdp_rx_command_complete(struct usb_ep *ep, struct usb_request *req) sdp->state = SDP_STATE_RX_FILE_DATA; sdp->dnl_address = be32_to_cpu(cmd->addr); sdp->dnl_bytes_remaining = be32_to_cpu(cmd->cnt); + sdp->dnl_bytes = sdp->dnl_bytes_remaining; sdp->next_state = SDP_STATE_IDLE; printf("Downloading file of size %d to 0x%08x... ", @@ -355,6 +357,9 @@ static void sdp_rx_data_complete(struct usb_ep *ep, struct usb_request *req) if (sdp->dnl_bytes_remaining) return; +#ifndef CONFIG_SPL_BUILD + env_set_hex("filesize", sdp->dnl_bytes); +#endif printf("done\n"); switch (sdp->state) { -- 1.9.1

4 4

[U-Boot] [PATCH v2] u-boot: Upgrade 2018.07 -> 2018.11
by Otavio Salvador 23 Nov '18

23 Nov '18

This upgrades U-Boot to 2018.11 release and drop the backported security fixes which are now included upstream. Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- Changes in v2: - rebase on top of mkimage rework patch .../u-boot/files/CVE-2018-1000205-1.patch | 59 -------- .../u-boot/files/CVE-2018-1000205-2.patch | 143 ------------------ ..._2018.07.inc => u-boot-common_2018.11.inc} | 7 +- ..._2018.07.bb => u-boot-fw-utils_2018.11.bb} | 0 ...ols_2018.07.bb => u-boot-tools_2018.11.bb} | 0 .../{u-boot_2018.07.bb => u-boot_2018.11.bb} | 0 6 files changed, 2 insertions(+), 207 deletions(-) delete mode 100644 meta/recipes-bsp/u-boot/files/CVE-2018-1000205-1.patch delete mode 100644 meta/recipes-bsp/u-boot/files/CVE-2018-1000205-2.patch rename meta/recipes-bsp/u-boot/{u-boot-common_2018.07.inc => u-boot-common_2018.11.inc} (64%) rename meta/recipes-bsp/u-boot/{u-boot-fw-utils_2018.07.bb => u-boot-fw-utils_2018.11.bb} (100%) rename meta/recipes-bsp/u-boot/{u-boot-tools_2018.07.bb => u-boot-tools_2018.11.bb} (100%) rename meta/recipes-bsp/u-boot/{u-boot_2018.07.bb => u-boot_2018.11.bb} (100%) diff --git a/meta/recipes-bsp/u-boot/files/CVE-2018-1000205-1.patch b/meta/recipes-bsp/u-boot/files/CVE-2018-1000205-1.patch deleted file mode 100644 index fed3c3dcb9..0000000000 --- a/meta/recipes-bsp/u-boot/files/CVE-2018-1000205-1.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 7346c1e192d63cd35f99c7e845e53c5d4d0bdc24 Mon Sep 17 00:00:00 2001 -From: Teddy Reed <teddy.reed(a)gmail.com> -Date: Sat, 9 Jun 2018 11:45:20 -0400 -Subject: [PATCH] vboot: Do not use hashed-strings offset - -The hashed-strings signature property includes two uint32_t values. -The first is unneeded as there should never be a start offset into the -strings region. The second, the size, is needed because the added -signature node appends to this region. - -See tools/image-host.c, where a static 0 value is used for the offset. - -Signed-off-by: Teddy Reed <teddy.reed(a)gmail.com> -Reviewed-by: Simon Glass <sjg(a)chromium.org> - -Upstream-Status: Backport[http://git.denx.de/?p=u-boot.git;a=commit; - h=7346c1e192d63cd35f99c7e845e53c5d4d0bdc24] - -CVE: CVE-2018-1000205 - -Signed-off-by: Changqing Li <changqing.li(a)windriver.com> ---- - common/image-sig.c | 7 +++++-- - tools/image-host.c | 1 + - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/common/image-sig.c b/common/image-sig.c -index 8d2fd10..5a269d3 100644 ---- a/common/image-sig.c -+++ b/common/image-sig.c -@@ -377,8 +377,11 @@ int fit_config_check_sig(const void *fit, int noffset, int required_keynode, - /* Add the strings */ - strings = fdt_getprop(fit, noffset, "hashed-strings", NULL); - if (strings) { -- fdt_regions[count].offset = fdt_off_dt_strings(fit) + -- fdt32_to_cpu(strings[0]); -+ /* -+ * The strings region offset must be a static 0x0. -+ * This is set in tool/image-host.c -+ */ -+ fdt_regions[count].offset = fdt_off_dt_strings(fit); - fdt_regions[count].size = fdt32_to_cpu(strings[1]); - count++; - } -diff --git a/tools/image-host.c b/tools/image-host.c -index 8e43671..be2d59b 100644 ---- a/tools/image-host.c -+++ b/tools/image-host.c -@@ -135,6 +135,7 @@ static int fit_image_write_sig(void *fit, int noffset, uint8_t *value, - - ret = fdt_setprop(fit, noffset, "hashed-nodes", - region_prop, region_proplen); -+ /* This is a legacy offset, it is unused, and must remain 0. */ - strdata[0] = 0; - strdata[1] = cpu_to_fdt32(string_size); - if (!ret) { --- -2.7.4 - diff --git a/meta/recipes-bsp/u-boot/files/CVE-2018-1000205-2.patch b/meta/recipes-bsp/u-boot/files/CVE-2018-1000205-2.patch deleted file mode 100644 index bb79af1c7b..0000000000 --- a/meta/recipes-bsp/u-boot/files/CVE-2018-1000205-2.patch +++ /dev/null @@ -1,143 +0,0 @@ -From 72239fc85f3eda078547956608c063ab965e90e9 Mon Sep 17 00:00:00 2001 -From: Teddy Reed <teddy.reed(a)gmail.com> -Date: Sat, 9 Jun 2018 11:38:05 -0400 -Subject: [PATCH] vboot: Add FIT_SIGNATURE_MAX_SIZE protection - -This adds a new config value FIT_SIGNATURE_MAX_SIZE, which controls the -max size of a FIT header's totalsize field. The field is checked before -signature checks are applied to protect from reading past the intended -FIT regions. - -This field is not part of the vboot signature so it should be sanity -checked. If the field is corrupted then the structure or string region -reads may have unintended behavior, such as reading from device memory. -A default value of 256MB is set and intended to support most max storage -sizes. - -Suggested-by: Simon Glass <sjg(a)chromium.org> -Signed-off-by: Teddy Reed <teddy.reed(a)gmail.com> -Reviewed-by: Simon Glass <sjg(a)chromium.org> - -Upstream-Status: Backport[http://git.denx.de/?p=u-boot.git;a=commit; - h=72239fc85f3eda078547956608c063ab965e90e9] - -CVE: CVE-2018-1000205 - -Signed-off-by: Changqing Li <changqing.li(a)windriver.com> ---- - Kconfig | 10 ++++++++++ - common/image-sig.c | 5 +++++ - test/py/tests/test_vboot.py | 33 +++++++++++++++++++++++++++++++++ - tools/Makefile | 1 + - 4 files changed, 49 insertions(+) - -diff --git a/Kconfig b/Kconfig -index 5a82c95..c8b86cd 100644 ---- a/Kconfig -+++ b/Kconfig -@@ -267,6 +267,16 @@ config FIT_SIGNATURE - format support in this case, enable it using - CONFIG_IMAGE_FORMAT_LEGACY. - -+config FIT_SIGNATURE_MAX_SIZE -+ hex "Max size of signed FIT structures" -+ depends on FIT_SIGNATURE -+ default 0x10000000 -+ help -+ This option sets a max size in bytes for verified FIT uImages. -+ A sane value of 256MB protects corrupted DTB structures from overlapping -+ device memory. Assure this size does not extend past expected storage -+ space. -+ - config FIT_VERBOSE - bool "Show verbose messages when FIT images fail" - help -diff --git a/common/image-sig.c b/common/image-sig.c -index f65d883..8d2fd10 100644 ---- a/common/image-sig.c -+++ b/common/image-sig.c -@@ -156,6 +156,11 @@ static int fit_image_setup_verify(struct image_sign_info *info, - { - char *algo_name; - -+ if (fdt_totalsize(fit) > CONFIG_FIT_SIGNATURE_MAX_SIZE) { -+ *err_msgp = "Total size too large"; -+ return 1; -+ } -+ - if (fit_image_hash_get_algo(fit, noffset, &algo_name)) { - *err_msgp = "Can't get hash algo property"; - return -1; -diff --git a/test/py/tests/test_vboot.py b/test/py/tests/test_vboot.py -index ee939f2..3d25ec3 100644 ---- a/test/py/tests/test_vboot.py -+++ b/test/py/tests/test_vboot.py -@@ -26,6 +26,7 @@ Tests run with both SHA1 and SHA256 hashing. - - import pytest - import sys -+import struct - import u_boot_utils as util - - @pytest.mark.boardspec('sandbox') -@@ -105,6 +106,26 @@ def test_vboot(u_boot_console): - util.run_and_log(cons, [mkimage, '-F', '-k', tmpdir, '-K', dtb, - '-r', fit]) - -+ def replace_fit_totalsize(size): -+ """Replace FIT header's totalsize with something greater. -+ -+ The totalsize must be less than or equal to FIT_SIGNATURE_MAX_SIZE. -+ If the size is greater, the signature verification should return false. -+ -+ Args: -+ size: The new totalsize of the header -+ -+ Returns: -+ prev_size: The previous totalsize read from the header -+ """ -+ total_size = 0 -+ with open(fit, 'r+b') as handle: -+ handle.seek(4) -+ total_size = handle.read(4) -+ handle.seek(4) -+ handle.write(struct.pack(">I", size)) -+ return struct.unpack(">I", total_size)[0] -+ - def test_with_algo(sha_algo): - """Test verified boot with the given hash algorithm. - -@@ -146,6 +167,18 @@ def test_vboot(u_boot_console): - util.run_and_log(cons, [fit_check_sign, '-f', fit, '-k', tmpdir, - '-k', dtb]) - -+ # Replace header bytes -+ bcfg = u_boot_console.config.buildconfig -+ max_size = int(bcfg.get('config_fit_signature_max_size', 0x10000000), 0) -+ existing_size = replace_fit_totalsize(max_size + 1) -+ run_bootm(sha_algo, 'Signed config with bad hash', 'Bad Data Hash', False) -+ cons.log.action('%s: Check overflowed FIT header totalsize' % sha_algo) -+ -+ # Replace with existing header bytes -+ replace_fit_totalsize(existing_size) -+ run_bootm(sha_algo, 'signed config', 'dev+', True) -+ cons.log.action('%s: Check default FIT header totalsize' % sha_algo) -+ - # Increment the first byte of the signature, which should cause failure - sig = util.run_and_log(cons, 'fdtget -t bx %s %s value' % - (fit, sig_node)) -diff --git a/tools/Makefile b/tools/Makefile -index 5dd33ed..0c3341e 100644 ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -133,6 +133,7 @@ ifdef CONFIG_FIT_SIGNATURE - # This affects include/image.h, but including the board config file - # is tricky, so manually define this options here. - HOST_EXTRACFLAGS += -DCONFIG_FIT_SIGNATURE -+HOST_EXTRACFLAGS += -DCONFIG_FIT_SIGNATURE_MAX_SIZE=$(CONFIG_FIT_SIGNATURE_MAX_SIZE) - endif - - ifdef CONFIG_SYS_U_BOOT_OFFS --- -2.7.4 - diff --git a/meta/recipes-bsp/u-boot/u-boot-common_2018.07.inc b/meta/recipes-bsp/u-boot/u-boot-common_2018.11.inc similarity index 64% rename from meta/recipes-bsp/u-boot/u-boot-common_2018.07.inc rename to meta/recipes-bsp/u-boot/u-boot-common_2018.11.inc index 22b44dccc6..6f4a10b7a4 100644 --- a/meta/recipes-bsp/u-boot/u-boot-common_2018.07.inc +++ b/meta/recipes-bsp/u-boot/u-boot-common_2018.11.inc @@ -8,11 +8,8 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "8c5d4fd0ec222701598a27b26ab7265d4cee45a3" +SRCREV = "0157013f4a4945bbdb70bb4d98d680e0845fd784" -SRC_URI = "git://git.denx.de/u-boot.git \ - file://CVE-2018-1000205-1.patch \ - file://CVE-2018-1000205-2.patch \ -" +SRC_URI = "git://git.denx.de/u-boot.git" S = "${WORKDIR}/git" diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.07.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.11.bb similarity index 100% rename from meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.07.bb rename to meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.11.bb diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2018.07.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2018.11.bb similarity index 100% rename from meta/recipes-bsp/u-boot/u-boot-tools_2018.07.bb rename to meta/recipes-bsp/u-boot/u-boot-tools_2018.11.bb diff --git a/meta/recipes-bsp/u-boot/u-boot_2018.07.bb b/meta/recipes-bsp/u-boot/u-boot_2018.11.bb similarity index 100% rename from meta/recipes-bsp/u-boot/u-boot_2018.07.bb rename to meta/recipes-bsp/u-boot/u-boot_2018.11.bb -- 2.19.1

1 0

[U-Boot] [Status] [U-boot] [PATCH v4 0/7] Add ethernet support for phyCORE-RK3288
by Janine Hagemann 23 Nov '18

23 Nov '18

Hello, I just want to ask what happened to some of my patches from august 2018. https://patchwork.ozlabs.org/patch/962733/ https://patchwork.ozlabs.org/patch/962736/ https://patchwork.ozlabs.org/patch/962742/ https://patchwork.ozlabs.org/patch/962735/ Should I send them again? Kind regards Janine Hagemann

2 2

[U-Boot] [PATCH] armv8: lx2160a: Modify dspi1 controller intrrupts property
by Chuanhua Han 23 Nov '18

23 Nov '18

This patch is to modify the dspi1 controller interrupt number for lx2160a, the original 240 interrupt is problematic and cannot be registered, so first change it to share an interrupt with dspi0. Signed-off-by: Chuanhua Han <chuanhua.han(a)nxp.com> --- depend on: - https://patchwork.ozlabs.org/patch/990093/ arch/arm/dts/fsl-lx2160a.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/dts/fsl-lx2160a.dtsi b/arch/arm/dts/fsl-lx2160a.dtsi index b407dc6e13..6f1a302548 100644 --- a/arch/arm/dts/fsl-lx2160a.dtsi +++ b/arch/arm/dts/fsl-lx2160a.dtsi @@ -89,7 +89,7 @@ #address-cells = <1>; #size-cells = <0>; reg = <0x0 0x2110000 0x0 0x10000>; - interrupts = <0 240 0x4>; /* Level high type */ + interrupts = <0 26 0x4>; /* Level high type */ num-cs = <6>; }; -- 2.17.1

2 1

[U-Boot] [PATCH v2] dm: spi: prevent setting a speed of 0 Hz
by Simon Goldschmidt 23 Nov '18

23 Nov '18

When the device tree is missing a correct spi slave description below the bus (compatible "spi-flash" or spi-max-frequency are missing), the 'set_speed' callback can be called with 'speed' == 0 Hz. At least with cadence qspi, this leads to a division by zero. Prevent this by initializing speed to 100 kHz in this case (same fallback value as is done in 'dm_spi_claim_bus') and issue a warning to console. Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt(a)gmail.com> --- Changes in v2: - create a define for the 100 kHz constant (used 3 times) - assign default value when binding new device and speed is 0 - assign default value when spi_slave_ofdata_to_platdata finds that spi-max-frequency property is missing drivers/spi/spi-uclass.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c index b84255bd27..2bc289a74c 100644 --- a/drivers/spi/spi-uclass.c +++ b/drivers/spi/spi-uclass.c @@ -15,6 +15,8 @@ DECLARE_GLOBAL_DATA_PTR; +#define SPI_DEFAULT_SPEED_HZ 100000 + static int spi_set_speed_mode(struct udevice *bus, int speed, int mode) { struct dm_spi_ops *ops; @@ -58,7 +60,7 @@ int dm_spi_claim_bus(struct udevice *dev) speed = spi->max_hz; } if (!speed) - speed = 100000; + speed = SPI_DEFAULT_SPEED_HZ; if (speed != slave->speed) { int ret = spi_set_speed_mode(bus, speed, slave->mode); @@ -300,7 +302,13 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode, } plat = dev_get_parent_platdata(dev); plat->cs = cs; - plat->max_hz = speed; + if (speed) { + plat->max_hz = speed; + } else { + printf("Warning: SPI speed fallback to %u kHz\n", + SPI_DEFAULT_SPEED_HZ / 1000); + plat->max_hz = SPI_DEFAULT_SPEED_HZ; + } plat->mode = mode; created = true; } else if (ret) { @@ -374,7 +382,8 @@ int spi_slave_ofdata_to_platdata(struct udevice *dev, int value; plat->cs = dev_read_u32_default(dev, "reg", -1); - plat->max_hz = dev_read_u32_default(dev, "spi-max-frequency", 0); + plat->max_hz = dev_read_u32_default(dev, "spi-max-frequency", + SPI_DEFAULT_SPEED_HZ); if (dev_read_bool(dev, "spi-cpol")) mode |= SPI_CPOL; if (dev_read_bool(dev, "spi-cpha")) -- 2.17.1

5 9

[U-Boot] am335x with 1GB of ram EMIF support
by Belisko Marek 23 Nov '18

23 Nov '18

Hi, I have custom board based on am335x which have assembled 43-46TR16512A RAM (should be 512x16 = 1GB size). Board boots fine with DDR3 config for BBB (RAM data looks similar) but shows only 512MB of RAM available (also in linux). IIRC it is necessary to update RAM EMIF table to have support for 1G or something else is missing (based on that [0] looks like some DDR init sequence much be updated to support 1G addressing)? Thanks for any help. [0] - https://www.element14.com/community/thread/37588/l/double-dram-capacity-on-… BR, marek -- as simple and primitive as possible ------------------------------------------------- Marek Belisko - OPEN-NANDRA Freelance Developer Ruska Nova Ves 219 | Presov, 08005 Slovak Republic Tel: +421 915 052 184 skype: marekwhite twitter: #opennandra web: http://open-nandra.com

1 0

[U-Boot] [PATCH] u-boot: Upgrade 2018.07 -> 2018.11
by Otavio Salvador 23 Nov '18

23 Nov '18

This upgrades U-Boot to 2018.11 release and drop the backported security fixes which are now included upstream. Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- .../u-boot/files/CVE-2018-1000205-1.patch | 59 -------- .../u-boot/files/CVE-2018-1000205-2.patch | 143 ------------------ ..._2018.07.inc => u-boot-common_2018.11.inc} | 7 +- ..._2018.07.bb => u-boot-fw-utils_2018.11.bb} | 0 ...e_2018.07.bb => u-boot-mkimage_2018.11.bb} | 0 .../{u-boot_2018.07.bb => u-boot_2018.11.bb} | 0 6 files changed, 2 insertions(+), 207 deletions(-) delete mode 100644 meta/recipes-bsp/u-boot/files/CVE-2018-1000205-1.patch delete mode 100644 meta/recipes-bsp/u-boot/files/CVE-2018-1000205-2.patch rename meta/recipes-bsp/u-boot/{u-boot-common_2018.07.inc => u-boot-common_2018.11.inc} (64%) rename meta/recipes-bsp/u-boot/{u-boot-fw-utils_2018.07.bb => u-boot-fw-utils_2018.11.bb} (100%) rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2018.07.bb => u-boot-mkimage_2018.11.bb} (100%) rename meta/recipes-bsp/u-boot/{u-boot_2018.07.bb => u-boot_2018.11.bb} (100%) diff --git a/meta/recipes-bsp/u-boot/files/CVE-2018-1000205-1.patch b/meta/recipes-bsp/u-boot/files/CVE-2018-1000205-1.patch deleted file mode 100644 index fed3c3dcb9..0000000000 --- a/meta/recipes-bsp/u-boot/files/CVE-2018-1000205-1.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 7346c1e192d63cd35f99c7e845e53c5d4d0bdc24 Mon Sep 17 00:00:00 2001 -From: Teddy Reed <teddy.reed(a)gmail.com> -Date: Sat, 9 Jun 2018 11:45:20 -0400 -Subject: [PATCH] vboot: Do not use hashed-strings offset - -The hashed-strings signature property includes two uint32_t values. -The first is unneeded as there should never be a start offset into the -strings region. The second, the size, is needed because the added -signature node appends to this region. - -See tools/image-host.c, where a static 0 value is used for the offset. - -Signed-off-by: Teddy Reed <teddy.reed(a)gmail.com> -Reviewed-by: Simon Glass <sjg(a)chromium.org> - -Upstream-Status: Backport[http://git.denx.de/?p=u-boot.git;a=commit; - h=7346c1e192d63cd35f99c7e845e53c5d4d0bdc24] - -CVE: CVE-2018-1000205 - -Signed-off-by: Changqing Li <changqing.li(a)windriver.com> ---- - common/image-sig.c | 7 +++++-- - tools/image-host.c | 1 + - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/common/image-sig.c b/common/image-sig.c -index 8d2fd10..5a269d3 100644 ---- a/common/image-sig.c -+++ b/common/image-sig.c -@@ -377,8 +377,11 @@ int fit_config_check_sig(const void *fit, int noffset, int required_keynode, - /* Add the strings */ - strings = fdt_getprop(fit, noffset, "hashed-strings", NULL); - if (strings) { -- fdt_regions[count].offset = fdt_off_dt_strings(fit) + -- fdt32_to_cpu(strings[0]); -+ /* -+ * The strings region offset must be a static 0x0. -+ * This is set in tool/image-host.c -+ */ -+ fdt_regions[count].offset = fdt_off_dt_strings(fit); - fdt_regions[count].size = fdt32_to_cpu(strings[1]); - count++; - } -diff --git a/tools/image-host.c b/tools/image-host.c -index 8e43671..be2d59b 100644 ---- a/tools/image-host.c -+++ b/tools/image-host.c -@@ -135,6 +135,7 @@ static int fit_image_write_sig(void *fit, int noffset, uint8_t *value, - - ret = fdt_setprop(fit, noffset, "hashed-nodes", - region_prop, region_proplen); -+ /* This is a legacy offset, it is unused, and must remain 0. */ - strdata[0] = 0; - strdata[1] = cpu_to_fdt32(string_size); - if (!ret) { --- -2.7.4 - diff --git a/meta/recipes-bsp/u-boot/files/CVE-2018-1000205-2.patch b/meta/recipes-bsp/u-boot/files/CVE-2018-1000205-2.patch deleted file mode 100644 index bb79af1c7b..0000000000 --- a/meta/recipes-bsp/u-boot/files/CVE-2018-1000205-2.patch +++ /dev/null @@ -1,143 +0,0 @@ -From 72239fc85f3eda078547956608c063ab965e90e9 Mon Sep 17 00:00:00 2001 -From: Teddy Reed <teddy.reed(a)gmail.com> -Date: Sat, 9 Jun 2018 11:38:05 -0400 -Subject: [PATCH] vboot: Add FIT_SIGNATURE_MAX_SIZE protection - -This adds a new config value FIT_SIGNATURE_MAX_SIZE, which controls the -max size of a FIT header's totalsize field. The field is checked before -signature checks are applied to protect from reading past the intended -FIT regions. - -This field is not part of the vboot signature so it should be sanity -checked. If the field is corrupted then the structure or string region -reads may have unintended behavior, such as reading from device memory. -A default value of 256MB is set and intended to support most max storage -sizes. - -Suggested-by: Simon Glass <sjg(a)chromium.org> -Signed-off-by: Teddy Reed <teddy.reed(a)gmail.com> -Reviewed-by: Simon Glass <sjg(a)chromium.org> - -Upstream-Status: Backport[http://git.denx.de/?p=u-boot.git;a=commit; - h=72239fc85f3eda078547956608c063ab965e90e9] - -CVE: CVE-2018-1000205 - -Signed-off-by: Changqing Li <changqing.li(a)windriver.com> ---- - Kconfig | 10 ++++++++++ - common/image-sig.c | 5 +++++ - test/py/tests/test_vboot.py | 33 +++++++++++++++++++++++++++++++++ - tools/Makefile | 1 + - 4 files changed, 49 insertions(+) - -diff --git a/Kconfig b/Kconfig -index 5a82c95..c8b86cd 100644 ---- a/Kconfig -+++ b/Kconfig -@@ -267,6 +267,16 @@ config FIT_SIGNATURE - format support in this case, enable it using - CONFIG_IMAGE_FORMAT_LEGACY. - -+config FIT_SIGNATURE_MAX_SIZE -+ hex "Max size of signed FIT structures" -+ depends on FIT_SIGNATURE -+ default 0x10000000 -+ help -+ This option sets a max size in bytes for verified FIT uImages. -+ A sane value of 256MB protects corrupted DTB structures from overlapping -+ device memory. Assure this size does not extend past expected storage -+ space. -+ - config FIT_VERBOSE - bool "Show verbose messages when FIT images fail" - help -diff --git a/common/image-sig.c b/common/image-sig.c -index f65d883..8d2fd10 100644 ---- a/common/image-sig.c -+++ b/common/image-sig.c -@@ -156,6 +156,11 @@ static int fit_image_setup_verify(struct image_sign_info *info, - { - char *algo_name; - -+ if (fdt_totalsize(fit) > CONFIG_FIT_SIGNATURE_MAX_SIZE) { -+ *err_msgp = "Total size too large"; -+ return 1; -+ } -+ - if (fit_image_hash_get_algo(fit, noffset, &algo_name)) { - *err_msgp = "Can't get hash algo property"; - return -1; -diff --git a/test/py/tests/test_vboot.py b/test/py/tests/test_vboot.py -index ee939f2..3d25ec3 100644 ---- a/test/py/tests/test_vboot.py -+++ b/test/py/tests/test_vboot.py -@@ -26,6 +26,7 @@ Tests run with both SHA1 and SHA256 hashing. - - import pytest - import sys -+import struct - import u_boot_utils as util - - @pytest.mark.boardspec('sandbox') -@@ -105,6 +106,26 @@ def test_vboot(u_boot_console): - util.run_and_log(cons, [mkimage, '-F', '-k', tmpdir, '-K', dtb, - '-r', fit]) - -+ def replace_fit_totalsize(size): -+ """Replace FIT header's totalsize with something greater. -+ -+ The totalsize must be less than or equal to FIT_SIGNATURE_MAX_SIZE. -+ If the size is greater, the signature verification should return false. -+ -+ Args: -+ size: The new totalsize of the header -+ -+ Returns: -+ prev_size: The previous totalsize read from the header -+ """ -+ total_size = 0 -+ with open(fit, 'r+b') as handle: -+ handle.seek(4) -+ total_size = handle.read(4) -+ handle.seek(4) -+ handle.write(struct.pack(">I", size)) -+ return struct.unpack(">I", total_size)[0] -+ - def test_with_algo(sha_algo): - """Test verified boot with the given hash algorithm. - -@@ -146,6 +167,18 @@ def test_vboot(u_boot_console): - util.run_and_log(cons, [fit_check_sign, '-f', fit, '-k', tmpdir, - '-k', dtb]) - -+ # Replace header bytes -+ bcfg = u_boot_console.config.buildconfig -+ max_size = int(bcfg.get('config_fit_signature_max_size', 0x10000000), 0) -+ existing_size = replace_fit_totalsize(max_size + 1) -+ run_bootm(sha_algo, 'Signed config with bad hash', 'Bad Data Hash', False) -+ cons.log.action('%s: Check overflowed FIT header totalsize' % sha_algo) -+ -+ # Replace with existing header bytes -+ replace_fit_totalsize(existing_size) -+ run_bootm(sha_algo, 'signed config', 'dev+', True) -+ cons.log.action('%s: Check default FIT header totalsize' % sha_algo) -+ - # Increment the first byte of the signature, which should cause failure - sig = util.run_and_log(cons, 'fdtget -t bx %s %s value' % - (fit, sig_node)) -diff --git a/tools/Makefile b/tools/Makefile -index 5dd33ed..0c3341e 100644 ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -133,6 +133,7 @@ ifdef CONFIG_FIT_SIGNATURE - # This affects include/image.h, but including the board config file - # is tricky, so manually define this options here. - HOST_EXTRACFLAGS += -DCONFIG_FIT_SIGNATURE -+HOST_EXTRACFLAGS += -DCONFIG_FIT_SIGNATURE_MAX_SIZE=$(CONFIG_FIT_SIGNATURE_MAX_SIZE) - endif - - ifdef CONFIG_SYS_U_BOOT_OFFS --- -2.7.4 - diff --git a/meta/recipes-bsp/u-boot/u-boot-common_2018.07.inc b/meta/recipes-bsp/u-boot/u-boot-common_2018.11.inc similarity index 64% rename from meta/recipes-bsp/u-boot/u-boot-common_2018.07.inc rename to meta/recipes-bsp/u-boot/u-boot-common_2018.11.inc index 22b44dccc6..6f4a10b7a4 100644 --- a/meta/recipes-bsp/u-boot/u-boot-common_2018.07.inc +++ b/meta/recipes-bsp/u-boot/u-boot-common_2018.11.inc @@ -8,11 +8,8 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "8c5d4fd0ec222701598a27b26ab7265d4cee45a3" +SRCREV = "0157013f4a4945bbdb70bb4d98d680e0845fd784" -SRC_URI = "git://git.denx.de/u-boot.git \ - file://CVE-2018-1000205-1.patch \ - file://CVE-2018-1000205-2.patch \ -" +SRC_URI = "git://git.denx.de/u-boot.git" S = "${WORKDIR}/git" diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.07.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.11.bb similarity index 100% rename from meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.07.bb rename to meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.11.bb diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.07.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.11.bb similarity index 100% rename from meta/recipes-bsp/u-boot/u-boot-mkimage_2018.07.bb rename to meta/recipes-bsp/u-boot/u-boot-mkimage_2018.11.bb diff --git a/meta/recipes-bsp/u-boot/u-boot_2018.07.bb b/meta/recipes-bsp/u-boot/u-boot_2018.11.bb similarity index 100% rename from meta/recipes-bsp/u-boot/u-boot_2018.07.bb rename to meta/recipes-bsp/u-boot/u-boot_2018.11.bb -- 2.19.1

2 1

[U-Boot] [PATCH 1/2] sun8i_emac: add support for setting EMAC TX/RX delay
by Alexander Weidinger 23 Nov '18

23 Nov '18

From: Icenowy Zheng <icenowy(a)aosc.io> Some boards have the EMAC TX/RX lanes wired with a different length with the clock lane, which can be workarounded by setting a TX/RX delay in the EMAC. This kind of delays are already defined in the newest device tree binding of dwmac-sun8i, which has already entered linux-next. Add support for setting these delays. Signed-off-by: Icenowy Zheng <icenowy(a)aosc.io> --- drivers/net/sun8i_emac.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index 3ba3a1ff8b..230ff045d5 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -60,6 +60,10 @@ #define SC_ETCS_MASK GENMASK(1, 0) #define SC_ETCS_EXT_GMII 0x1 #define SC_ETCS_INT_GMII 0x2 +#define SC_ETXDC_MASK GENMASK(12, 10) +#define SC_ETXDC_OFFSET 10 +#define SC_ERXDC_MASK GENMASK(9, 5) +#define SC_ERXDC_OFFSET 5 #define CONFIG_MDIO_TIMEOUT (3 * CONFIG_SYS_HZ) @@ -140,6 +144,8 @@ struct emac_eth_dev { struct sun8i_eth_pdata { struct eth_pdata eth_pdata; u32 reset_delays[3]; + int tx_delay_ps; + int rx_delay_ps; }; @@ -273,7 +279,8 @@ static int sun8i_emac_set_syscon_ephy(struct emac_eth_dev *priv, u32 *reg) return 0; } -static int sun8i_emac_set_syscon(struct emac_eth_dev *priv) +static int sun8i_emac_set_syscon(struct sun8i_eth_pdata *pdata, + struct emac_eth_dev *priv) { int ret; u32 reg; @@ -312,6 +319,14 @@ static int sun8i_emac_set_syscon(struct emac_eth_dev *priv) return -EINVAL; } + if (pdata->tx_delay_ps) + reg |= ((pdata->tx_delay_ps / 100) << SC_ETXDC_OFFSET) + & SC_ETXDC_MASK; + + if (pdata->rx_delay_ps) + reg |= ((pdata->rx_delay_ps / 100) << SC_ERXDC_OFFSET) + & SC_ERXDC_MASK; + writel(reg, priv->sysctl_reg + 0x30); return 0; @@ -790,7 +805,7 @@ static int sun8i_emac_eth_probe(struct udevice *dev) priv->mac_reg = (void *)pdata->iobase; sun8i_emac_board_setup(priv); - sun8i_emac_set_syscon(priv); + sun8i_emac_set_syscon((struct sun8i_eth_pdata *)pdata, priv); sun8i_mdio_init(dev->name, dev); priv->bus = miiphy_get_dev_by_name(dev->name); @@ -891,6 +906,18 @@ static int sun8i_emac_eth_ofdata_to_platdata(struct udevice *dev) if (!priv->use_internal_phy) parse_phy_pins(dev); + sun8i_pdata->tx_delay_ps = fdtdec_get_int(gd->fdt_blob, node, + "allwinner,tx-delay-ps", 0); + if (sun8i_pdata->tx_delay_ps < 0 || sun8i_pdata->tx_delay_ps > 700) + printf("%s: Invalid TX delay value %d\n", __func__, + sun8i_pdata->tx_delay_ps); + + sun8i_pdata->rx_delay_ps = fdtdec_get_int(gd->fdt_blob, node, + "allwinner,rx-delay-ps", 0); + if (sun8i_pdata->rx_delay_ps < 0 || sun8i_pdata->rx_delay_ps > 3100) + printf("%s: Invalid RX delay value %d\n", __func__, + sun8i_pdata->rx_delay_ps); + #ifdef CONFIG_DM_GPIO if (fdtdec_get_bool(gd->fdt_blob, dev_of_offset(dev), "snps,reset-active-low")) -- 2.19.1

2 6

[U-Boot] SPL for Cubietruck
by mo2mo＠online.de 23 Nov '18

23 Nov '18

Hello to each other, can you help me start the Cubietruck / Cubieboard 3? I can not use the SD card / mmc because the drive is broken. Currently I use Debian wheezy; uname -a Kernel Linux cubietruck 3.4.61+ # 1 SMP PREEMPT Mon Dec 23 12:44:19 CST 2013 armv7l GNU / Linux However, I would like to use a current kernel, but I have to be able to customize the SPL so that it directly activates the SATA interface. Currently the system is still booting from the NAND and then attaching / dev / sda2 as rootfs. How can I adjust the SPL, that it directly uses the SATA, similar to how the SD card can be used now: Debian stretch with vmlinuz-4.14.78-sunxi - what should I do? Thanks for your help in advance. With kind regards Moritz Monday P.S.: If you also speak german, I would prefer the answer in german. ----------------------------------------------------------------------- Hallo Miteinander, können Sie mir beim Starten des Cubietrucks / Cubieboard 3 helfen? Ich kann die SD-Card /mmc nicht verwenden, da das Laufwerk defekt ist. Aktuell verwende ich Debian wheezy; uname -a: Kernel Linux cubietruck 3.4.61+ #1 SMP PREEMPT Mon Dec 23 12:44:19 CST 2013 armv7l GNU/Linux Jedoch würde ich gern einen aktuellen Kernel verwenden, doch dazu muss ich die SPL so anpssen können, dass diese direkt die SATA-Schnittstelle aktivert. Derzeit startet das System noch vom NAND und hängt dann /dev/sda2 als rootfs ein. Wie kann ich die SPL anpassen, dass diese direkt die SATA nutzt, ähnlich wie jetzt die SD-Card genutzt werden kann: Debian stretch mit vmlinuz-4.14.78-sunxi - was muss ich machen? Vielen Dank für Ihre Hilfe im Voraus. Mit herzlichem Gruß Moritz Montag P.S. Falls Sie auch deutsch sprechen, wäre mir die Antwort in deutsch lieber.

1 0