April 2020 - U-Boot

[PATCH 1/1] doc: invalid doc link in rstFlatTable.py
by Heinrich Schuchardt 24 Apr '20

24 Apr '20

Remove an invalid documentation link in rstFlatTable.py. This synchronizes the file with Linux next-20200413. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- doc/sphinx/rstFlatTable.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/sphinx/rstFlatTable.py b/doc/sphinx/rstFlatTable.py index f9a4b46dbe..2019a55f6b 100755 --- a/doc/sphinx/rstFlatTable.py +++ b/doc/sphinx/rstFlatTable.py @@ -53,8 +53,6 @@ from docutils.utils import SystemMessagePropagation # common globals # ============================================================================== -# The version numbering follows numbering of the specification -# (doc/books/kernel-doc-HOWTO). __version__ = '1.0' PY3 = sys.version_info[0] == 3 -- 2.25.1

2 1

[PATCH] spl: Kconfig: de-dup SPL_DM_GPIO definition
by Joel Johnson 24 Apr '20

24 Apr '20

Two nearly concurrent commits (d4d65e112 and bcee8d676) added a SPL_DM_GPIO symbol. Resolve the duplication in favor of the version in drivers/gpio/Kconfig. Signed-off-by: Joel Johnson <mrjoel(a)lixil.net> --- common/spl/Kconfig | 6 ------ 1 file changed, 6 deletions(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 9d52b75cb4..ef5bf66696 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -508,12 +508,6 @@ config SPL_DMA the CPU moving the data. Enable this option to build the drivers in drivers/dma as part of an SPL build. -config SPL_DM_GPIO - bool "Support Driver Model GPIO drivers" - depends on SPL_GPIO_SUPPORT && DM_GPIO - help - Enable support for Driver Model based GPIO drivers in SPL. - config SPL_DRIVERS_MISC_SUPPORT bool "Support misc drivers" help -- 2.26.1

3 2

[PATCH 0/2] fixdep: fix a bug for TPL, and re-sync with Linux
by Masahiro Yamada 24 Apr '20

24 Apr '20

Masahiro Yamada (2): fixdep: handle CONFIG_IS_ENABLE() and friends for TPL fixdep: Re-sync with Linux 5.7-rc1 scripts/basic/fixdep.c | 104 +++++++++++++++++++++-------------------- 1 file changed, 54 insertions(+), 50 deletions(-) -- 2.25.1

2 4

[PATCH 1/1] .mailmap: map Ruchika Gupta's mail address
by Heinrich Schuchardt 24 Apr '20

24 Apr '20

Freescale mail addresses are not valid anymore. Reported-by: Fabio Estevam <festevam(a)gmail.com> Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 61802f97f6..8250015453 100644 --- a/.mailmap +++ b/.mailmap @@ -36,6 +36,7 @@ Prabhakar Kushwaha <prabhakar(a)freescale.com> Rajeshwari Shinde <rajeshwari.s(a)samsung.com> Ricardo Ribalda <ricardo(a)ribalda.com> <ricardo.ribalda(a)uam.es> Ricardo Ribalda <ricardo(a)ribalda.com> <ricardo.ribalda(a)gmail.com> +Ruchika Gupta <ruchika.gupta(a)nxp.com> <ruchika.gupta(a)freescale.com> Sandeep Paulraj <s-paulraj(a)ti.com> Shaohui Xie <Shaohui.Xie(a)freescale.com> Stefan Roese <stroese> -- 2.20.1

2 1

[PATCH 0/5] lib: reduce SPL size
by Heinrich Schuchardt 24 Apr '20

24 Apr '20

Several configuration options inject code into SPL even if it is not needed. Heinrich Schuchardt (5): lib: do not build OID registry in SPL lib: date functions in SPL common: image_sign_info helper functions in SPL lib: do not provide hexdump in SPL dlmalloc: remove unit test support in SPL Kconfig | 2 +- common/Kconfig | 11 +++++++++++ common/Makefile | 2 +- common/dlmalloc.c | 2 +- lib/Makefile | 6 +++--- lib/hexdump.c | 2 +- 6 files changed, 18 insertions(+), 7 deletions(-) -- 2.25.1

2 23

[PATCH 1/1] tools: image-host.c: use correct output format
by Heinrich Schuchardt 24 Apr '20

24 Apr '20

When building on a 32bit host the following warning occurs: tools/image-host.c: In function ‘fit_image_read_data’: tools/image-host.c:310:42: warning: format ‘%ld’ expects argument of type ‘long int’, but argument 3 has type ‘ssize_t’ {aka ‘int’} [-Wformat=] printf("Can't read all file %s (read %ld bytes, expexted %ld)\n", ~~^ %d filename, n, sbuf.st_size); ~ n is of type ssize_t so we should use %zd for printing. Fixes: 7298e422504e ("mkimage: fit: add support to encrypt image with aes") Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- tools/image-host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/image-host.c b/tools/image-host.c index 4e57ddea96..5bb68965e7 100644 --- a/tools/image-host.c +++ b/tools/image-host.c @@ -307,7 +307,7 @@ static int fit_image_read_data(char *filename, unsigned char *data, /* Check that we have read all the file */ if (n != sbuf.st_size) { - printf("Can't read all file %s (read %ld bytes, expexted %ld)\n", + printf("Can't read all file %s (read %zd bytes, expexted %ld)\n", filename, n, sbuf.st_size); goto err; } -- 2.25.1

3 2

[PATCH 1/1] Makefile: ARMv7-M has no CPSR register
by Heinrich Schuchardt 24 Apr '20

24 Apr '20

Compiling on ARMv7-M fails when trying to address the CPSR register which is not available on this architecture. Atomic functions refer to the CPSR register if compiled with arch/arm/include/asm/proc-armv/system.h. On ARMv7-M we should hence use arch/arm/thumb1/include/asm/proc-armv/system.h instead. Cf. https://stackoverflow.com/questions/61097841/error-selected-processor-does-… Reported-by: Sicris Rey Embay <sicris.embay(a)gmail.com> Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- Makefile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 8de5ff6d94..4690eb5b87 100644 --- a/Makefile +++ b/Makefile @@ -701,13 +701,15 @@ KBUILD_CFLAGS += $(KCFLAGS) # Use UBOOTINCLUDE when you must reference the include/ directory. # Needed to be compatible with the O= option UBOOTINCLUDE := \ - -Iinclude \ - $(if $(KBUILD_SRC), -I$(srctree)/include) \ - $(if $(CONFIG_$(SPL_)SYS_THUMB_BUILD), \ - $(if $(CONFIG_HAS_THUMB2),, \ - -I$(srctree)/arch/$(ARCH)/thumb1/include),) \ - -I$(srctree)/arch/$(ARCH)/include \ - -include $(srctree)/include/linux/kconfig.h + -Iinclude \ + $(if $(KBUILD_SRC), -I$(srctree)/include) \ + $(if $(CONFIG_$(SPL_)SYS_THUMB_BUILD), \ + $(if $(CONFIG_HAS_THUMB2), \ + $(if $(CONFIG_CPU_V7M), \ + -I$(srctree)/arch/arm/thumb1/include), \ + -I$(srctree)/arch/arm/thumb1/include)) \ + -I$(srctree)/arch/$(ARCH)/include \ + -include $(srctree)/include/linux/kconfig.h NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include) CHECKFLAGS += $(NOSTDINC_FLAGS) -- 2.25.1

2 1

[PATCH] qemu: don't allow to select 32- and 64-bit
by Heinrich Schuchardt 24 Apr '20

24 Apr '20

TARGET_QEMU_ARM_64BIT and TARGET_QEMU_ARM_32BIT should be mutually exclusive. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- arch/arm/mach-qemu/Kconfig | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-qemu/Kconfig b/arch/arm/mach-qemu/Kconfig index a2e4b98b88..588d2d3102 100644 --- a/arch/arm/mach-qemu/Kconfig +++ b/arch/arm/mach-qemu/Kconfig @@ -9,16 +9,20 @@ config SYS_BOARD config SYS_CONFIG_NAME default "qemu-arm" -endif +choice + prompt "QEMU ARM architecture" + default TARGET_QEMU_ARM_64BIT config TARGET_QEMU_ARM_32BIT - bool "Support qemu_arm" - depends on ARCH_QEMU + bool "ARMv7-A, 32bit" select ARCH_SUPPORT_PSCI select CPU_V7A select SYS_ARCH_TIMER config TARGET_QEMU_ARM_64BIT - bool "Support qemu_arm64" - depends on ARCH_QEMU + bool "ARMv8, 64bit" select ARM64 + +endchoice + +endif -- 2.25.1

2 1

[PATCH] fvp: Add support for loading Android boot images via semihosting
by Peter Collingbourne 24 Apr '20

24 Apr '20

FVP now loads an Android boot image named boot.img if available, otherwise it falls back to the existing code path. Signed-off-by: Peter Collingbourne <pcc(a)google.com> --- configs/vexpress_aemv8a_semi_defconfig | 2 ++ include/configs/vexpress_aemv8a.h | 30 +++++++++++++++++--------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig index f31baab197..b52c761dee 100644 --- a/configs/vexpress_aemv8a_semi_defconfig +++ b/configs/vexpress_aemv8a_semi_defconfig @@ -14,6 +14,8 @@ CONFIG_BOOTARGS="console=ttyAMA0 earlycon=pl011,0x1c090000 debug user_debug=31 l # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="VExpress64# " +CONFIG_ANDROID_BOOT_IMAGE=y +CONFIG_CMD_ABOOTIMG=y # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_XIMG is not set # CONFIG_CMD_EDITENV is not set diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 9a9cec414c..4f3a792f49 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -177,16 +177,26 @@ "initrd_addr=0x88000000\0" \ "fdtfile=devtree.dtb\0" \ "fdt_addr=0x83000000\0" \ - "fdt_high=0xffffffffffffffff\0" \ - "initrd_high=0xffffffffffffffff\0" - -#define CONFIG_BOOTCOMMAND "smhload ${kernel_name} ${kernel_addr}; " \ - "smhload ${fdtfile} ${fdt_addr}; " \ - "smhload ${initrd_name} ${initrd_addr} "\ - "initrd_end; " \ - "fdt addr ${fdt_addr}; fdt resize; " \ - "fdt chosen ${initrd_addr} ${initrd_end}; " \ - "booti $kernel_addr - $fdt_addr" + "boot_name=boot.img\0" \ + "boot_addr=0x8007f800\0" + +#define CONFIG_BOOTCOMMAND "if smhload ${boot_name} ${boot_addr}; then " \ + " set bootargs; " \ + " abootimg addr ${boot_addr}; " \ + " abootimg get dtb --index=0 fdt_addr; " \ + " bootm ${boot_addr} ${boot_addr} " \ + " ${fdt_addr}; " \ + "else; " \ + " set fdt_high 0xffffffffffffffff; " \ + " set initrd_high 0xffffffffffffffff; " \ + " smhload ${kernel_name} ${kernel_addr}; " \ + " smhload ${fdtfile} ${fdt_addr}; " \ + " smhload ${initrd_name} ${initrd_addr} "\ + " initrd_end; " \ + " fdt addr ${fdt_addr}; fdt resize; " \ + " fdt chosen ${initrd_addr} ${initrd_end}; " \ + " booti $kernel_addr - $fdt_addr; " \ + "fi" #endif -- 2.26.0.292.g33ef6b2f38-goog

3 2

[PATCH v4 1/8] tool: Move ALIGN_MASK to header as common MACRO
by Kever Yang 24 Apr '20

24 Apr '20

The ALIGN code is need by many files who need handle structure or image align, so move the macro to imagetool.h file. Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> Reviewed-by: Punit Agrawal <punit1.agrawal(a)toshiba.co.jp> Reviewed-by: Tom Rini <trini(a)konsulko.com> --- Changes in v4: None Changes in v3: None Changes in v2: None include/imx8image.h | 1 - tools/ifwitool.c | 4 +--- tools/imagetool.h | 3 +++ tools/imx8mimage.c | 2 -- tools/mksunxiboot.c | 4 +--- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/include/imx8image.h b/include/imx8image.h index 68ec9f5fcd..00c614ab6c 100644 --- a/include/imx8image.h +++ b/include/imx8image.h @@ -11,7 +11,6 @@ #include <image.h> #include <inttypes.h> #include "imagetool.h" -#include "linux/kernel.h" #define __packed __attribute__((packed)) diff --git a/tools/ifwitool.c b/tools/ifwitool.c index 543e9d4e70..b2b06cc921 100644 --- a/tools/ifwitool.c +++ b/tools/ifwitool.c @@ -8,15 +8,13 @@ #include <assert.h> #include <stdbool.h> #include <getopt.h> +#include "imagetool.h" #include "os_support.h" #ifndef __packed #define __packed __attribute__((packed)) #endif #define KiB 1024 -#define ALIGN(x, a) __ALIGN_MASK((x), (typeof(x))(a) - 1) -#define __ALIGN_MASK(x, mask) (((x) + (mask)) & ~(mask)) -#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) /* * min()/max()/clamp() macros that also do diff --git a/tools/imagetool.h b/tools/imagetool.h index e1c778b0df..81e5cd0c5c 100644 --- a/tools/imagetool.h +++ b/tools/imagetool.h @@ -25,6 +25,9 @@ #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#define __ALIGN_MASK(x, mask) (((x) + (mask)) & ~(mask)) +#define ALIGN(x, a) __ALIGN_MASK((x), (typeof(x))(a) - 1) + #define IH_ARCH_DEFAULT IH_ARCH_INVALID /* Information about a file that needs to be placed into the FIT */ diff --git a/tools/imx8mimage.c b/tools/imx8mimage.c index 2b0d946a7d..7defb13962 100644 --- a/tools/imx8mimage.c +++ b/tools/imx8mimage.c @@ -32,8 +32,6 @@ static uint32_t rom_version = ROM_V1; #define HDMI_FW_SIZE 0x17000 /* Use Last 0x1000 for IVT and CSF */ #define ALIGN_SIZE 0x1000 -#define ALIGN(x,a) __ALIGN_MASK((x), (__typeof__(x))(a) - 1, a) -#define __ALIGN_MASK(x,mask,mask2) (((x) + (mask)) / (mask2) * (mask2)) static uint32_t get_cfg_value(char *token, char *name, int linenr) { diff --git a/tools/mksunxiboot.c b/tools/mksunxiboot.c index 1c8701e75e..a18c9d98bc 100644 --- a/tools/mksunxiboot.c +++ b/tools/mksunxiboot.c @@ -14,6 +14,7 @@ #include <errno.h> #include <sys/types.h> #include <sys/stat.h> +#include "imagetool.h" #include "../arch/arm/include/asm/arch-sunxi/spl.h" #define STAMP_VALUE 0x5F0A6C39 @@ -44,9 +45,6 @@ int gen_check_sum(struct boot_file_head *head_p) return 0; } -#define ALIGN(x, a) __ALIGN_MASK((x), (typeof(x))(a)-1) -#define __ALIGN_MASK(x, mask) (((x)+(mask))&~(mask)) - #define SUNXI_SRAM_SIZE 0x8000 /* SoC with smaller size are limited before */ #define SRAM_LOAD_MAX_SIZE (SUNXI_SRAM_SIZE - sizeof(struct boot_file_head)) -- 2.17.1

4 21