December 2018 - U-Boot

[U-Boot] [PATCH 1/3] bootm: vxworks: Make do_bootvx_fdt() static
by Bin Meng 01 Jan '19

01 Jan '19

Change the scope of do_bootvx_fdt() to static since it is only used in common/bootm_os.c. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- common/bootm_os.c | 2 +- include/vxworks.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/common/bootm_os.c b/common/bootm_os.c index f302135..da938c5 100644 --- a/common/bootm_os.c +++ b/common/bootm_os.c @@ -260,7 +260,7 @@ static int do_bootm_plan9(int flag, int argc, char * const argv[], #if defined(CONFIG_BOOTM_VXWORKS) && \ (defined(CONFIG_PPC) || defined(CONFIG_ARM)) -void do_bootvx_fdt(bootm_headers_t *images) +static void do_bootvx_fdt(bootm_headers_t *images) { #if defined(CONFIG_OF_LIBFDT) int ret; diff --git a/include/vxworks.h b/include/vxworks.h index 60c0efa..1a29509 100644 --- a/include/vxworks.h +++ b/include/vxworks.h @@ -83,6 +83,5 @@ struct efi_gop_info { int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); void boot_prep_vxworks(bootm_headers_t *images); void boot_jump_vxworks(bootm_headers_t *images); -void do_bootvx_fdt(bootm_headers_t *images); #endif -- 2.7.4

2 6

[U-Boot] Please pull u-boot-x86
by Bin Meng 01 Jan '19

01 Jan '19

Hi Tom, This includes x86 edison defconfig file clean up, and coreboot file system (cbfs) fixes. The following changes since commit bea3d826203f90507ff32ed24bd0a3c53479e55c: Merge tag 'signed-efi-2019.01' of git://github.com/agraf/u-boot (2018-12-27 12:59:01 -0500) are available in the git repository at: git://git.denx.de/u-boot-x86.git for you to fetch changes up to 881bb9ab398419c33c9021ee8b2bbd8412882230: fs: cbfs: Add missing standard CBFS component types (2018-12-31 09:42:41 +0800) ---------------------------------------------------------------- Andy Shevchenko (3): x86: edison: move CONFIG_CMD_PCI from header file to defconfig x86: edison: move CONFIG_BOOTCOMMAND from header file to defconfig x86: edison: Remove staled comments from configuration header Bin Meng (3): fs: cbfs: Fix out of bound access during CBFS walking through fs: cbfs: Make all CBFS_TYPE_xxx macros consistent fs: cbfs: Add missing standard CBFS component types Christian Gmeiner (1): fs: cbfs: remove wrong header validation cmd/cbfs.c | 34 ++++++++++++++++++++++++++++++++-- configs/edison_defconfig | 1 - fs/cbfs/cbfs.c | 7 +++---- include/cbfs.h | 14 ++++++++++++-- include/configs/edison.h | 10 ---------- 5 files changed, 47 insertions(+), 19 deletions(-) Regards, Bin

2 1

[U-Boot] [PATCH] Revert "sunxi: board: Print error after power initialization fails"
by Andre Przywara 31 Dec '18

31 Dec '18

From: "From: Karl Palsson" <karlp(a)tweak.net.au> Commit a8011eb84dfa("sunxi: board: Print error after power initialization fails") moved the DRAM init after the increase of the CPU clock frequency. This lead to various DRAM initialisation failures on some boards (hangs or wrong size reported, on a NanoPi Duo2 and OrangePi Zero, for instance). Lowering the CPU frequency significantly (for instance to 408 MHz) seems to work around the problem, so this points to some timing issues in the DRAM code. Debugging this sounds like a larger job, so let's just revert this patch to bring back those boards. Beside this probably unintended change the patch just moved the error message around, so reverting this is not a real loss. This reverts commit a8011eb84dfac5187cebf00ed8bc981bdb5c1fa1. Tested-By: Priit Laes <plaes(a)plaes.org> Signed-off-by: Karl Palsson <karlp(a)tweak.net.au> Signed-off-by: Andre Przywara <andre.przywara(a)arm.com> --- board/sunxi/board.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 917f5b18f6..f022f365e9 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -637,6 +637,13 @@ void sunxi_board_init(void) power_failed |= axp_set_sw(IS_ENABLED(CONFIG_AXP_SW_ON)); #endif #endif + printf("DRAM:"); + gd->ram_size = sunxi_dram_init(); + printf(" %d MiB\n", (int)(gd->ram_size >> 20)); + if (!gd->ram_size) + hang(); + + sunxi_spl_store_dram_size(gd->ram_size); /* * Only clock up the CPU to full speed if we are reasonably @@ -645,16 +652,7 @@ void sunxi_board_init(void) if (!power_failed) clock_set_pll1(CONFIG_SYS_CLK_FREQ); else - printf("Error setting up the power controller.\n" - "CPU frequency not set.\n"); - - printf("DRAM:"); - gd->ram_size = sunxi_dram_init(); - printf(" %d MiB\n", (int)(gd->ram_size >> 20)); - if (!gd->ram_size) - hang(); - - sunxi_spl_store_dram_size(gd->ram_size); + printf("Failed to set core voltage! Can't set CPU frequency\n"); } #endif -- 2.14.5

6 9

[U-Boot] [PATCH] fdt: Add warning about CONFIG_OF_EMBED
by Simon Glass 31 Dec '18

31 Dec '18

This option has crept into use with some boards. Add a warning to try to prevent this. As an example: https://lists.denx.de/pipermail/u-boot/2017-September/304966.html Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile b/Makefile index 0d11ff97971..05896598fe3 100644 --- a/Makefile +++ b/Makefile @@ -947,6 +947,14 @@ ifeq ($(CONFIG_LIBATA)$(CONFIG_DM_SCSI)$(CONFIG_MVSATA_IDE),y) @echo "Failure to update by the deadline may result in board removal." @echo "See doc/driver-model/MIGRATION.txt for more info." @echo "====================================================" +endif +ifeq ($(CONFIG_OF_EMBED),y) + @echo "===================== WARNING ======================" + @echo "CONFIG_OF_EMBED is enabled. This option should only" + @echo "be used for debugging purposes. Please use" + @echo "CONFIG_OF_SEPARATE for boards in mainline." + @echo "See doc/README.fdt-control for more info." + @echo "====================================================" endif @# Check that this build does not use CONFIG options that we do not @# know about unless they are in Kconfig. All the existing CONFIG -- 2.20.0.rc1.387.gf8505762e3-goog

4 10

[U-Boot] [PATCH v2 0/2] Enable command bmp on Raspberry Pi boards
by Adam Heinrich 31 Dec '18

31 Dec '18

Hello, This enables the bmp command (with gzip support enabled) on all Raspberry Pi boards. Changes in v2: - added a commit fixing the int-to-pointer-cast warning on aarch64 Adam Heinrich (2): cmd: bmp: Make integer-to-pointer cast platform independent rpi: Enable command bmp cmd/bmp.c | 2 +- configs/rpi_0_w_defconfig | 1 + configs/rpi_2_defconfig | 1 + configs/rpi_3_32b_defconfig | 1 + configs/rpi_3_defconfig | 1 + configs/rpi_defconfig | 1 + include/configs/rpi.h | 7 +++++++ 7 files changed, 13 insertions(+), 1 deletion(-) -- 2.17.1

1 0

[U-Boot] [PATCH 0/6] Small fixes for RISC-V
by Lukas Auer 31 Dec '18

31 Dec '18

This patch series contains small fixes for RISC-V. It touches three areas. - Patch 1 clarifies the error message on undefined exceptions. - Patch 2 removes the current dcache flush implementation. It uses the fence instruction, which does not directly affect the data cache and can therefore not be used to implement dcache flush and invalidation. - Patches 3-6 improve support for standalone applications. They add support for RV64I systems and fix a problem, where a callee-saved register is used without saving it beforehand. Patch 6 defines the standalone load address for qemu-riscv to allow it to run standalone applications. Lukas Auer (6): riscv: clarify error message on undefined exceptions riscv: remove invalid dcache flush implementation riscv: remove RISC-V standalone linker script riscv: replace use of callee-saved register in standalone riscv: support standalone applications on RV64I systems riscv: qemu: define standalone load address arch/riscv/config.mk | 3 +-- arch/riscv/lib/cache.c | 4 +--- arch/riscv/lib/interrupts.c | 3 ++- examples/standalone/riscv.lds | 40 ----------------------------------- examples/standalone/stubs.c | 21 +++++++++++++----- include/configs/qemu-riscv.h | 2 ++ 6 files changed, 22 insertions(+), 51 deletions(-) delete mode 100644 examples/standalone/riscv.lds -- 2.20.1

2 12

[U-Boot] [GIT PULL] UniPhier updates for v2019.01
by Masahiro Yamada 31 Dec '18

31 Dec '18

Hi Tom, Please pull UniPhier updates v2019.01 - import DIV_ROUND_CLOSEST_ULL macro from Linux - import improvement and fix of Denali NAND driver from Linux - add NAND 200MHz clock to clk driver - allow CONFIG_BOOTCOMMAND to run custom boot command/script - sync DT with Linux 4.20 The following changes since commit bea3d826203f90507ff32ed24bd0a3c53479e55c: Merge tag 'signed-efi-2019.01' of git://github.com/agraf/u-boot (2018-12-27 12:59:01 -0500) are available in the git repository at: git://git.denx.de/u-boot-uniphier.git master for you to fetch changes up to 2001a81cba9554ee8b7f6d2ecd53510640ce4f35: ARM: uniphier: dts: sync with Linux 4.20 (2018-12-29 11:50:30 +0900) ---------------------------------------------------------------- Masahiro Yamada (9): ARM: uniphier: do not modify bootcmd environment variable at run-time ARM: uniphier: allow to source boot script before distro-boot ARM: uniphier: add CONFIG_PREBOOT linux/kernel.h: import DIV_ROUND_CLOSEST_ULL from Linux mtd: rawnand: denali_dt: add more clocks based on IP datasheet mtd: rawnand: denali: optimize timing parameters for data interface mtd: rawnand: denali: fix a race condition when DMA is kicked clk: uniphier: add NAND 200MHz clock ARM: uniphier: dts: sync with Linux 4.20 arch/arm/dts/uniphier-ld11.dtsi | 52 ++++++- arch/arm/dts/uniphier-ld20-global.dts | 4 + arch/arm/dts/uniphier-ld20-ref.dts | 4 + arch/arm/dts/uniphier-ld20.dtsi | 242 ++++++++++++++++++++++++++++- arch/arm/dts/uniphier-ld4.dtsi | 14 +- arch/arm/dts/uniphier-pinctrl.dtsi | 20 +++ arch/arm/dts/uniphier-pro4-ace.dts | 8 +- arch/arm/dts/uniphier-pro4-sanji.dts | 8 +- arch/arm/dts/uniphier-pro4.dtsi | 143 ++++++++++++++++- arch/arm/dts/uniphier-pro5.dtsi | 25 ++- arch/arm/dts/uniphier-pxs2.dtsi | 207 ++++++++++++++++++++++++- arch/arm/dts/uniphier-pxs3.dtsi | 267 +++++++++++++++++++++++++++++++- arch/arm/dts/uniphier-sld8.dtsi | 14 +- arch/arm/mach-uniphier/board_late_init.c | 8 +- configs/uniphier_ld4_sld8_defconfig | 1 + configs/uniphier_v7_defconfig | 1 + configs/uniphier_v8_defconfig | 1 + drivers/clk/uniphier/clk-uniphier-sys.c | 8 +- drivers/mtd/nand/raw/denali.c | 53 ++++--- drivers/mtd/nand/raw/denali.h | 1 + drivers/mtd/nand/raw/denali_dt.c | 40 ++++- include/configs/uniphier.h | 26 ++++ include/linux/kernel.h | 12 ++ 23 files changed, 1109 insertions(+), 50 deletions(-) -- Best Regards Masahiro Yamada

2 1

[U-Boot] [PATCH 1/4] fs: cbfs: remove wrong header validation
by Bin Meng 31 Dec '18

31 Dec '18

From: Christian Gmeiner <christian.gmeiner(a)gmail.com> cbfs_fileheader.len indicates the content size of the file in the cbfs, and it has nothing to do with cbfs_fileheader.offset which is the starting address of the file in the cbfs. Remove such check in file_cbfs_next_file(). Before this change 'cbfsinit' failed with 'Bad CBFS file'. After this change all cbfs commands are working as expected. Signed-off-by: Christian Gmeiner <christian.gmeiner(a)gmail.com> [bmeng: keep the necessary header sanity check] Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- fs/cbfs/cbfs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/cbfs/cbfs.c b/fs/cbfs/cbfs.c index 0dce639..e943325 100644 --- a/fs/cbfs/cbfs.c +++ b/fs/cbfs/cbfs.c @@ -96,8 +96,7 @@ static int file_cbfs_next_file(u8 *start, u32 size, u32 align, } swap_file_header(&header, fileHeader); - if (header.offset < sizeof(struct cbfs_fileheader) || - header.offset > header.len) { + if (header.offset < sizeof(struct cbfs_fileheader)) { file_cbfs_result = CBFS_BAD_FILE; return -1; } -- 2.7.4

2 11

[U-Boot] [PATCH v1 1/3] x86: edison: move CONFIG_CMD_PCI from header file to defconfig
by Andy Shevchenko 31 Dec '18

31 Dec '18

Use defconfig instead of header file for CONFIG_CMD_PCI. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- configs/edison_defconfig | 1 - include/configs/edison.h | 3 --- 2 files changed, 4 deletions(-) diff --git a/configs/edison_defconfig b/configs/edison_defconfig index b523fe92ce..e376c0cea6 100644 --- a/configs/edison_defconfig +++ b/configs/edison_defconfig @@ -19,7 +19,6 @@ CONFIG_CMD_DFU=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_PART=y -# CONFIG_CMD_PCI is not set # CONFIG_CMD_NFS is not set CONFIG_CMD_TIMER=y CONFIG_CMD_HASH=y diff --git a/include/configs/edison.h b/include/configs/edison.h index 86c584d73d..8e312da2da 100644 --- a/include/configs/edison.h +++ b/include/configs/edison.h @@ -43,9 +43,6 @@ #define CONFIG_ENV_OFFSET_REDUND (6 * 1024 * 1024) #define CONFIG_SUPPORT_EMMC_BOOT -/* PCI */ -#define CONFIG_CMD_PCI - /* RTC */ #define CONFIG_SYS_ISA_IO_BASE_ADDRESS 0 -- 2.19.2

2 8

[U-Boot] [PATCH 1/1] efi_loader: efi_set_variable use const void *
by Heinrich Schuchardt 30 Dec '18

30 Dec '18

The SetVariable() runtime service does not change the data passed to it. So mark the parameter as constant. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- include/efi_api.h | 3 ++- include/efi_loader.h | 2 +- lib/efi_loader/efi_variable.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/efi_api.h b/include/efi_api.h index 323797565e..9b6b97457b 100644 --- a/include/efi_api.h +++ b/include/efi_api.h @@ -231,7 +231,8 @@ struct efi_runtime_services { efi_status_t (EFIAPI *set_variable)(u16 *variable_name, const efi_guid_t *vendor, u32 attributes, - efi_uintn_t data_size, void *data); + efi_uintn_t data_size, + const void *data); efi_status_t (EFIAPI *get_next_high_mono_count)( uint32_t *high_count); void (EFIAPI *reset_system)(enum efi_reset_type reset_type, diff --git a/include/efi_loader.h b/include/efi_loader.h index 907fb2b8c1..01092651fb 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -526,7 +526,7 @@ efi_status_t EFIAPI efi_get_next_variable_name(efi_uintn_t *variable_name_size, const efi_guid_t *vendor); efi_status_t EFIAPI efi_set_variable(u16 *variable_name, const efi_guid_t *vendor, u32 attributes, - efi_uintn_t data_size, void *data); + efi_uintn_t data_size, const void *data); /** * struct efi_load_option - EFI load option diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c index 4e6a04e614..c302dbd2fe 100644 --- a/lib/efi_loader/efi_variable.c +++ b/lib/efi_loader/efi_variable.c @@ -254,7 +254,7 @@ efi_status_t EFIAPI efi_get_next_variable_name(efi_uintn_t *variable_name_size, /* http://wiki.phoenix.com/wiki/index.php/EFI_RUNTIME_SERVICES#SetVariable.28.… */ efi_status_t EFIAPI efi_set_variable(u16 *variable_name, const efi_guid_t *vendor, u32 attributes, - efi_uintn_t data_size, void *data) + efi_uintn_t data_size, const void *data) { char *native_name = NULL, *val = NULL, *s; efi_status_t ret = EFI_SUCCESS; -- 2.19.2

1 0