April 2018 - U-Boot

[U-Boot] [PATCH] arm: stm32mp1: add PSCI support
by Patrick Delaunay 03 Apr '18

03 Apr '18

Add minimal PSCI support for Linux. Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- arch/arm/mach-stm32mp/Kconfig | 3 + arch/arm/mach-stm32mp/Makefile | 1 + arch/arm/mach-stm32mp/include/mach/stm32.h | 2 + arch/arm/mach-stm32mp/psci.c | 91 ++++++++++++++++++++++++++++++ include/configs/stm32mp1.h | 5 ++ 5 files changed, 102 insertions(+) create mode 100644 arch/arm/mach-stm32mp/psci.c diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig index 9771af9..c1ad939 100644 --- a/arch/arm/mach-stm32mp/Kconfig +++ b/arch/arm/mach-stm32mp/Kconfig @@ -23,7 +23,10 @@ config SYS_SOC config TARGET_STM32MP1 bool "Support stm32mp1xx" + select ARCH_SUPPORT_PSCI select CPU_V7 + select CPU_V7_HAS_NONSEC + select CPU_V7_HAS_VIRT select PINCTRL_STM32 select STM32_RESET help diff --git a/arch/arm/mach-stm32mp/Makefile b/arch/arm/mach-stm32mp/Makefile index a495c53..f746691 100644 --- a/arch/arm/mach-stm32mp/Makefile +++ b/arch/arm/mach-stm32mp/Makefile @@ -9,3 +9,4 @@ obj-y += dram_init.o obj-y += syscon.o obj-$(CONFIG_SPL_BUILD) += spl.o +obj-$(CONFIG_ARMV7_PSCI) += psci.o diff --git a/arch/arm/mach-stm32mp/include/mach/stm32.h b/arch/arm/mach-stm32mp/include/mach/stm32.h index c7a2789..d6f960f 100644 --- a/arch/arm/mach-stm32mp/include/mach/stm32.h +++ b/arch/arm/mach-stm32mp/include/mach/stm32.h @@ -74,6 +74,8 @@ enum boot_device { /* TAMP registers */ #define TAMP_BACKUP_REGISTER(x) (STM32_TAMP_BASE + 0x100 + 4 * x) +#define TAMP_BACKUP_MAGIC_NUMBER TAMP_BACKUP_REGISTER(4) +#define TAMP_BACKUP_BRANCH_ADDRESS TAMP_BACKUP_REGISTER(5) #define TAMP_BOOT_CONTEXT TAMP_BACKUP_REGISTER(20) #define TAMP_BOOT_MODE_MASK GENMASK(15, 8) diff --git a/arch/arm/mach-stm32mp/psci.c b/arch/arm/mach-stm32mp/psci.c new file mode 100644 index 0000000..0912242 --- /dev/null +++ b/arch/arm/mach-stm32mp/psci.c @@ -0,0 +1,91 @@ +/* + * Copyright (C) 2018, STMicroelectronics - All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause + */ + +#include <config.h> +#include <common.h> +#include <asm/armv7.h> +#include <asm/gic.h> +#include <asm/io.h> +#include <asm/psci.h> +#include <asm/secure.h> + +#define BOOT_API_A7_CORE1_MAGIC_NUMBER 0xCA7FACE1 + +#define RCC_MP_GRSTCSETR (STM32_RCC_BASE + 0x0404) +#define RCC_MP_GRSTCSETR_MPUP1RST BIT(5) +#define RCC_MP_GRSTCSETR_MPSYSRST BIT(0) + +static u32 __secure stm32mp_get_gicd_base_address(void) +{ + u32 periphbase; + + /* get the GIC base address from the CBAR register */ + asm("mrc p15, 4, %0, c15, c0, 0\n" : "=r" (periphbase)); + + return (periphbase & CBAR_MASK) + GIC_DIST_OFFSET; +} + +static void __secure stm32mp_smp_kick_all_cpus(void) +{ + u32 gic_dist_addr; + + gic_dist_addr = stm32mp_get_gicd_base_address(); + + /* kick all CPUs (except this one) by writing to GICD_SGIR */ + writel(1U << 24, gic_dist_addr + GICD_SGIR); +} + +int __secure psci_features(unsigned int psci_fid) +{ + switch (psci_fid) { + case ARM_PSCI_0_2_FN_PSCI_VERSION: + case ARM_PSCI_0_2_FN_CPU_ON: + case ARM_PSCI_0_2_FN_CPU_OFF: + case ARM_PSCI_0_2_FN_SYSTEM_RESET: + return 0x0; + } + return ARM_PSCI_RET_NI; +} + +unsigned int __secure psci_version(void) +{ + return ARM_PSCI_VER_1_0; +} + +int __secure psci_cpu_on(u32 __always_unused unused, u32 mpidr, u32 pc) +{ + u32 cpu = (mpidr & 0x3); + + /* store target PC */ + psci_save_target_pc(cpu, pc); + + /* write entrypoint in backup RAM register */ + writel((u32)&psci_cpu_entry, TAMP_BACKUP_BRANCH_ADDRESS); + + /* write magic number in backup register */ + writel(BOOT_API_A7_CORE1_MAGIC_NUMBER, TAMP_BACKUP_MAGIC_NUMBER); + stm32mp_smp_kick_all_cpus(); + + return ARM_PSCI_RET_SUCCESS; +} + +void __secure psci_cpu_off(void) +{ + /* reset core #1 : wfi is managed by BootRom */ + writel(RCC_MP_GRSTCSETR_MPUP1RST, RCC_MP_GRSTCSETR); + /* just waiting reset */ + while (1) + wfi(); +} + +void __secure psci_system_reset(u32 function_id) +{ + /* System reset */ + writel(RCC_MP_GRSTCSETR_MPSYSRST, RCC_MP_GRSTCSETR); + /* just waiting reset */ + while (1) + wfi(); +} diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h index da0e259..e0e7747 100644 --- a/include/configs/stm32mp1.h +++ b/include/configs/stm32mp1.h @@ -19,6 +19,11 @@ #define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_ARCH_TIMER +/* PSCI support */ +#define CONFIG_ARMV7_PSCI_1_0 +#define CONFIG_ARMV7_SECURE_BASE STM32_SYSRAM_BASE +#define CONFIG_ARMV7_SECURE_MAX_SIZE STM32_SYSRAM_SIZE + /* * malloc() pool size */ -- 2.7.4

4 4

[U-Boot] [PATCH 0/6] arm64: zynqmp: Add new platforms to u-boot
by Michal Simek 03 Apr '18

03 Apr '18

Hi, all these platforms are waiting in linux-next for merging that's why make sense to support them also in uboot. zcu100, zcu104, zcu106, zcu111 are customer boards zc12XX and zc1751 are internal boards. Thanks, Michal Michal Simek (6): arm64: zynqmp: Add support for zcu100 aka 96ultra board arm64: zynqmp: Add support for zc1751 dc3 arm64: zynqmp: Add support for zc12xx boards arm64: zynqmp: Add support for zcu104 customer board arm64: zynqmp: Add support for Xilinx zcu106-revA arm64: zynqmp: Add support for Xilinx zcu111-revA arch/arm/dts/Makefile | 9 + arch/arm/dts/zynqmp-zc1232-revA.dts | 87 ++ arch/arm/dts/zynqmp-zc1254-revA.dts | 72 ++ arch/arm/dts/zynqmp-zc1275-revA.dts | 72 ++ arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts | 210 +++++ arch/arm/dts/zynqmp-zcu100-revC.dts | 580 ++++++++++++ arch/arm/dts/zynqmp-zcu104-revA.dts | 481 ++++++++++ arch/arm/dts/zynqmp-zcu104-revC.dts | 482 ++++++++++ arch/arm/dts/zynqmp-zcu106-revA.dts | 884 ++++++++++++++++++ arch/arm/dts/zynqmp-zcu111-revA.dts | 763 ++++++++++++++++ .../zynqmp/zynqmp-zc1232-revA/psu_init_gpl.c | 745 ++++++++++++++++ .../zynqmp/zynqmp-zc1254-revA/psu_init_gpl.c | 467 ++++++++++ board/xilinx/zynqmp/zynqmp-zc1275-revA | 1 + .../zynqmp/zynqmp-zc1751-xm017-dc3/psu_init_gpl.c | 900 +++++++++++++++++++ .../zynqmp/zynqmp-zcu100-revC/psu_init_gpl.c | 993 +++++++++++++++++++++ .../zynqmp/zynqmp-zcu104-revA/psu_init_gpl.c | 878 ++++++++++++++++++ board/xilinx/zynqmp/zynqmp-zcu104-revC | 1 + .../zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 802 +++++++++++++++++ configs/xilinx_zynqmp_zc1232_revA_defconfig | 53 ++ configs/xilinx_zynqmp_zc1254_revA_defconfig | 53 ++ configs/xilinx_zynqmp_zc1275_revA_defconfig | 53 ++ configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig | 86 ++ configs/xilinx_zynqmp_zcu100_revC_defconfig | 83 ++ configs/xilinx_zynqmp_zcu104_revA_defconfig | 95 ++ configs/xilinx_zynqmp_zcu104_revC_defconfig | 95 ++ configs/xilinx_zynqmp_zcu106_revA_defconfig | 104 +++ configs/xilinx_zynqmp_zcu111_revA_defconfig | 95 ++ include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h | 20 + include/configs/xilinx_zynqmp_zcu100.h | 39 + include/configs/xilinx_zynqmp_zcu104.h | 36 + include/configs/xilinx_zynqmp_zcu106.h | 47 + include/configs/xilinx_zynqmp_zcu111.h | 50 ++ 32 files changed, 9336 insertions(+) create mode 100644 arch/arm/dts/zynqmp-zc1232-revA.dts create mode 100644 arch/arm/dts/zynqmp-zc1254-revA.dts create mode 100644 arch/arm/dts/zynqmp-zc1275-revA.dts create mode 100644 arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts create mode 100644 arch/arm/dts/zynqmp-zcu100-revC.dts create mode 100644 arch/arm/dts/zynqmp-zcu104-revA.dts create mode 100644 arch/arm/dts/zynqmp-zcu104-revC.dts create mode 100644 arch/arm/dts/zynqmp-zcu106-revA.dts create mode 100644 arch/arm/dts/zynqmp-zcu111-revA.dts create mode 100644 board/xilinx/zynqmp/zynqmp-zc1232-revA/psu_init_gpl.c create mode 100644 board/xilinx/zynqmp/zynqmp-zc1254-revA/psu_init_gpl.c create mode 120000 board/xilinx/zynqmp/zynqmp-zc1275-revA create mode 100644 board/xilinx/zynqmp/zynqmp-zc1751-xm017-dc3/psu_init_gpl.c create mode 100644 board/xilinx/zynqmp/zynqmp-zcu100-revC/psu_init_gpl.c create mode 100644 board/xilinx/zynqmp/zynqmp-zcu104-revA/psu_init_gpl.c create mode 120000 board/xilinx/zynqmp/zynqmp-zcu104-revC create mode 100644 board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c create mode 100644 configs/xilinx_zynqmp_zc1232_revA_defconfig create mode 100644 configs/xilinx_zynqmp_zc1254_revA_defconfig create mode 100644 configs/xilinx_zynqmp_zc1275_revA_defconfig create mode 100644 configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig create mode 100644 configs/xilinx_zynqmp_zcu100_revC_defconfig create mode 100644 configs/xilinx_zynqmp_zcu104_revA_defconfig create mode 100644 configs/xilinx_zynqmp_zcu104_revC_defconfig create mode 100644 configs/xilinx_zynqmp_zcu106_revA_defconfig create mode 100644 configs/xilinx_zynqmp_zcu111_revA_defconfig create mode 100644 include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h create mode 100644 include/configs/xilinx_zynqmp_zcu100.h create mode 100644 include/configs/xilinx_zynqmp_zcu104.h create mode 100644 include/configs/xilinx_zynqmp_zcu106.h create mode 100644 include/configs/xilinx_zynqmp_zcu111.h -- 1.9.1

2 8

[U-Boot] [ANN] U-Boot v2018.05-rc1 released
by Tom Rini 03 Apr '18

03 Apr '18

Hey all, So it's release day and I've put up v2018.05-rc1. The merge window is now closed and I've updated git and the tarballs are also up now. I'm sure my patch queue is in bad shape as I've been on vacation for the last week (hence my relative silence). I also am sad to report I don't have any blurry fish butt pictures to share either. I expect to clean up my queue in the next few days. I see that around v2018.03-rc1, I talked about taking the patches from Daniel to enable -Werror in travis-ci builds, and I'm going to see how close we are to that. I think the biggest problem was getting switched to gcc-7 and I think we have that available now. I also now owe posting some patches to drop ARM STM SPEAR, m5253evbe, mx31ads, and imx31_phycore. Finally, we have a DM conversion for CONFIG_BLK coming due, and I need to catch up on the thread that's been going on the last week and see where everyone is at on the feasibility of doing this cut-off, and what it means in very low memory situations too. I will follow the usual rule of an -rc every other Monday and we're looking at release on May 7th, 2018. Thanks all! -- Tom

1 0

[U-Boot] Please pull u-boot-dm
by Simon Glass 03 Apr '18

03 Apr '18

Hi Tom, Here's an assortment of things that were in my queue. Test result is here: https://travis-ci.org/sglass68/u-boot/builds/360881266 The following changes since commit 81cf7c8d45935a295991fe2cd1df286f0f47511f: Merge git://git.denx.de/u-boot-ubi (2018-03-25 12:02:13 -0400) are available in the Git repository at: git://git.denx.de/u-boot-dm.git for you to fetch changes up to 641599a63df258c3e3cb259c75cdada0cc009d56: image.h: add forward declaration of struct fdt_region (2018-04-01 22:19:10 +0800) ---------------------------------------------------------------- Andre Heider (2): cmd: cbfs: fix reading the end_of_rom pointer for 64bit archs fs: cbfs: fix locating the cbfs header Andy Yan (1): dm: core: make fixed-clock dt scan live dt compatible Kever Yang (2): core: add uclass_get_device_by_phandle_id() api pinctrl-uclass: convert to use live dt Mario Six (1): core: ofnode: Fix translation for #size-cells == 0 Masahiro Yamada (3): libfdt: move FDT_RAMDISK_OVERHEAD to image-fdt.c fdt_region: remove unneeded fdt_internal.h inclusion image.h: add forward declaration of struct fdt_region arch/sandbox/dts/test.dts | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ cmd/cbfs.c | 2 +- common/image-fdt.c | 3 +++ drivers/core/fdtaddr.c | 17 +++++++++++------ drivers/core/ofnode.c | 5 ++++- drivers/core/root.c | 16 +++++++++++----- drivers/core/uclass.c | 26 ++++++++++++++++++++++++++ drivers/pinctrl/pinctrl-uclass.c | 19 +++++-------------- fs/cbfs/cbfs.c | 4 ++-- include/dm/uclass-id.h | 1 + include/dm/uclass.h | 16 ++++++++++++++++ include/image.h | 1 + include/linux/libfdt.h | 3 --- lib/libfdt/fdt_region.c | 2 -- test/dm/test-fdt.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 15 files changed, 172 insertions(+), 34 deletions(-) Regards, Simon

2 1

[U-Boot] Please pull u-boot-dm
by Simon Glass 03 Apr '18

03 Apr '18

Hi Tom, Here are some additions to logging and 64-bit sandbox support. The following changes since commit ab12aa24e619b5e81cbde7de88c6d9a19f04313b: ARM: socfpga: Convert callers of cm_write_with_phase for wait_for_bit_le32 (2018-01-26 13:08:03 -0500) are available in the Git repository at: git://git.denx.de/u-boot-dm.git for you to fetch changes up to 4e94617bf911595efcecf52d6c9f323744a81cda: log: add category LOGC_EFI (2018-01-26 12:20:55 -0700) ---------------------------------------------------------------- Heinrich Schuchardt (1): log: add category LOGC_EFI Mario Six (1): sandbox: Add 64-bit sandbox Simon Glass (9): dm: core: Add a function to look up a uclass by name log: Add functions to convert IDs to/from names log: Add control over log formatting log: Update log_console to honour the log format log: Add a command to control the log output format log: Add a command to output a log record log: Add tests for the new log features log: Add documentation for commands and formatting log: Add a way to log error-return values arch/sandbox/Kconfig | 16 ++- arch/sandbox/cpu/cpu.c | 2 +- arch/sandbox/dts/Makefile | 4 + arch/sandbox/dts/sandbox64.dts | 317 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/sandbox/include/asm/io.h | 6 ++ arch/sandbox/include/asm/types.h | 17 +++- board/sandbox/README.sandbox | 7 +- cmd/demo.c | 6 +- cmd/log.c | 82 +++++++++++++++ common/Kconfig | 13 +++ common/log.c | 69 +++++++++++++ common/log_console.c | 27 ++++- configs/sandbox64_defconfig | 200 ++++++++++++++++++++++++++++++++++++ configs/sandbox_defconfig | 1 + doc/README.log | 36 +++++++ drivers/core/uclass.c | 14 +++ drivers/demo/demo-simple.c | 2 +- include/asm-generic/global_data.h | 1 + include/dm/uclass.h | 8 ++ include/log.h | 65 +++++++++++- test/dm/core.c | 9 ++ test/py/tests/test_log.py | 32 +++++- 22 files changed, 912 insertions(+), 22 deletions(-) create mode 100644 arch/sandbox/dts/sandbox64.dts create mode 100644 configs/sandbox64_defconfig Regards, Simon

2 5

[U-Boot] [PATCH 1/1] efi_loader: completely initialize network
by Heinrich Schuchardt 02 Apr '18

02 Apr '18

Add missing network initialization code. Before the patch the network was only usable if a network command like dhcp or tftp had beed executed. This was visible when interrupting the console countdown and executing bootefi selftest for vexpress_ca15_tc2_defconfig. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_net.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/lib/efi_loader/efi_net.c b/lib/efi_loader/efi_net.c index 8c5d5b492c..829d6fa43e 100644 --- a/lib/efi_loader/efi_net.c +++ b/lib/efi_loader/efi_net.c @@ -54,14 +54,46 @@ static efi_status_t EFIAPI efi_net_stop(struct efi_simple_network *this) return EFI_EXIT(EFI_SUCCESS); } +/* + * Initialize network adapter and allocate transmit and receive buffers. + * + * This function implements the Initialize service of the + * EFI_SIMPLE_NETWORK_PROTOCOL. See the Unified Extensible Firmware Interface + * (UEFI) specification for details. + * + * @this: pointer to the protocol instance + * @extra_rx: extra receive buffer to be allocated + * @extra_tx: extra transmit buffer to be allocated + * @return: status code + */ static efi_status_t EFIAPI efi_net_initialize(struct efi_simple_network *this, ulong extra_rx, ulong extra_tx) { + int ret; + efi_status_t r = EFI_SUCCESS; + EFI_ENTRY("%p, %lx, %lx", this, extra_rx, extra_tx); - eth_init(); + if (!this) { + r = EFI_INVALID_PARAMETER; + goto error; + } - return EFI_EXIT(EFI_SUCCESS); + /* Setup packet buffers */ + net_init(); + /* Disable hardware and put it into the reset state */ + eth_halt(); + /* Set current device according to environment variables */ + eth_set_current(); + /* Get hardware ready for send and receive operations */ + ret = eth_init(); + if (ret < 0) { + eth_halt(); + r = EFI_DEVICE_ERROR; + } + +error: + return EFI_EXIT(r); } static efi_status_t EFIAPI efi_net_reset(struct efi_simple_network *this, -- 2.16.2

1 0

[U-Boot] [PATCH] vxworks: fixed cpu enable using PSCI on armv8
by Vasyl Vavrychuk 02 Apr '18

02 Apr '18

Without armv8_setup_psci register VBAR_EL3 is not set up property which makes SMC calls jump to invalid location. smp_kick_all_cpus is required to make slave cpus leave gic_wait_for_interrupt. Without this they will never pursue booting process. This implementation is very similiar to what is done in boot_jump_linux in arch/arm/lib/bootm.c file. Tested on VxWorks 7 release SR0520 2017-12-08. Signed-off-by: Vasyl Vavrychuk <vasyl.vavrychuk(a)globallogic.com> --- cmd/elf.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmd/elf.c b/cmd/elf.c index 5745a389da..db690fc619 100644 --- a/cmd/elf.c +++ b/cmd/elf.c @@ -372,6 +372,11 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) printf("## Starting vxWorks at 0x%08lx ...\n", addr); dcache_disable(); +#if defined(CONFIG_ARM64) && defined(CONFIG_ARMV8_PSCI) + armv8_setup_psci(); + smp_kick_all_cpus(); +#endif + #ifdef CONFIG_X86 /* VxWorks on x86 uses stack to pass parameters */ ((asmlinkage void (*)(int))addr)(0); -- 2.11.0

3 5

[U-Boot] [PATCH] ARC: Bump ARC tools used in TravisCI to the most recent release arc-2017.09
by Alexey Brodkin 02 Apr '18

02 Apr '18

This is much more recent version of ARC tools based on GCC 7.1.1 and Binutils 2.29. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6cad65fd378d..d83a5e63329a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ install: - echo -e "[toolchain]\nroot = /usr" > ~/.buildman - echo -e "aarch64 = /tmp/gcc-linaro-6.3.1-2017.02-x86_64_aarch64-linux-gnu" >> ~/.buildman - echo -e "arm = /tmp/gcc-linaro-6.3.1-2017.02-x86_64_arm-linux-gnueabihf" >> ~/.buildman - - echo -e "arc = /tmp/arc_gnu_2016.09_prebuilt_uclibc_le_archs_linux_install" >> ~/.buildman + - echo -e "arc = /tmp/arc_gnu_2017.09_prebuilt_uclibc_le_archs_linux_install" >> ~/.buildman - echo -e "\n[toolchain-alias]\nsh = sh4\nopenrisc = or32" >> ~/.buildman - cat ~/.buildman - virtualenv /tmp/venv @@ -70,8 +70,8 @@ before_script: echo -e "\n[toolchain-prefix]\nx86 = ${HOME}/.buildman-toolchains/gcc-4.9.0-nolibc/x86_64-linux/bin/x86_64-linux-" >> ~/.buildman; fi - if [[ "${TOOLCHAIN}" == arc ]]; then - wget https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/… && - tar -C /tmp -xf arc_gnu_2016.09_prebuilt_uclibc_le_archs_linux_install.tar.gz; + wget https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/… && + tar -C /tmp -xf arc_gnu_2017.09_prebuilt_uclibc_le_archs_linux_install.tar.gz; fi - if [[ "${TOOLCHAIN}" == *xtensa* ]]; then wget https://github.com/foss-xtensa/toolchain/releases/download/2018.02/x86_64-2… && -- 2.14.3

1 0

[U-Boot] [PATCH] tools: buildman: prevent trying to use the working directory as build dorectory
by Lothar Waßmann 02 Apr '18

02 Apr '18

When the U-Boot base directory happens to have the same name as the branch that buildman is directed to use via the '-b' option and no output directory is specified with '-o', buildman happily starts removing the whole U-Boot sources eventually only stopped with the error message: OSError: [Errno 20] Not a directory: '../<branch-name>/boards.cfg Add a check to the builderthread.Mkdir function to verify that the path it tries to create does not match the current working directory. Signed-off-by: Lothar Waßmann <LW(a)KARO-electronics.de> --- tools/buildman/builderthread.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index acaf500..3549029 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -7,6 +7,7 @@ import errno import glob import os import shutil +import sys import threading import command @@ -27,6 +28,9 @@ def Mkdir(dirname, parents = False): os.mkdir(dirname) except OSError as err: if err.errno == errno.EEXIST: + if os.path.realpath('.') == os.path.realpath(dirname): + print "Cannot create the current working directory '%s'!" % dirname + sys.exit(1) pass else: raise -- 2.1.4

2 3

[U-Boot] [PATCH v3 00/14] log: Add a new logging feature
by Simon Glass 02 Apr '18

02 Apr '18

U-Boot currently has fairly rudimentary logging features. A basic printf() provides console output and debug() provides debug output which is activated if DEBUG is defined in the file containing the debug() statements. It would be useful to have a few more features: - control of debug output at runtime, so problems can potentially be debugged without recompiling U-Boot - control of which subsystems output debug information, so that (for example) it is possible to enable debugging for MMC or SATA at runtime - indication of severity with each message, so that the user can control whether just errors are displayed, warnings, or all debug messages - sending logging information to different destinations, such as console, memory, linux, etc, At present U-Boot has a logbuffer feature which records output in a memory buffer for later display or storage. This is useful but is not at present enabled for any board. This series introduced a new logging system which supports: - various log levels from panic to debug - log categories including all uclasses and a few others - log drivers to which all log records can be sent - log filters which control which log records make it to which drivers Enabling logging with the default options does not add much to code size. By default the maximum recorded log level is LOGL_INFO, meaning that debug messages (and above) are discarded a build-time. Increasing this level provides more run-time flexibility to enable/disable logging at the cost of increased code size. This feature is by no means finished. The README provides a long list of features and clean-ups that could be done. But hopefully this is a starting point for improving this important area in U-Boot. The series is available at u-boot-dm/log-working Changes in v3: - Rebase to master Changes in v2: - Add a comment as to why CONFIG_LOG_MAX_LEVEL is not defined - Change log levels to match new header - Change sandbox log level to 6 - Drop MAINTAINERS entries for files not added by this patch - Drop the special log() functions from the README - Drop the use of 'continue' in the macro - Fix LOG_SPL_MAX_LEVEL typo (should be SPL_LOG_MAX_LEVEL) - Fix function called when test command is selected - Fix help output for 'log test' - Fix up bad use of #if CONFIG_VAL() - use #ifdef instead - Line up log levels with Linux - Only execute log tests if CONFIG_LOG is enabled - Rename LOGL_WARN to LOGL_WARNING - Split pre-console address change into a separate patch - Update commit message to explain that this is not just for serial output Simon Glass (14): Revert "sandbox: remove os_putc() and os_puts()" sandbox: Adjust pre-console address to avoid conflict Revert "sandbox: Drop special case console code for sandbox" Move debug and logging support to a separate header mtdparts: Correct use of debug() Drop the log buffer log: Add an implemention of logging log: Add a console driver log: Add a 'log level' command log: Add a test command log: Plumb logging into the init sequence log: sandbox: Enable logging log: test: Add a pytest for logging log: Add documentation MAINTAINERS | 9 ++ arch/sandbox/cpu/os.c | 11 ++ cmd/Kconfig | 8 + cmd/Makefile | 2 +- cmd/log.c | 326 +++++--------------------------------- cmd/mtdparts.c | 3 - common/Kconfig | 86 ++++++++++ common/Makefile | 2 + common/board_f.c | 23 +-- common/board_r.c | 27 +--- common/console.c | 7 + common/image.c | 9 -- common/log.c | 245 ++++++++++++++++++++++++++++ common/log_console.c | 23 +++ common/stdio.c | 6 - configs/sandbox_defconfig | 5 +- doc/README.log | 214 +++++++++++++++++++++++++ include/asm-generic/global_data.h | 8 +- include/common.h | 46 +----- include/log.h | 297 ++++++++++++++++++++++++++++++++++ include/logbuff.h | 49 ------ include/os.h | 20 +++ include/post.h | 4 +- post/post.c | 9 -- post/tests.c | 4 - scripts/config_whitelist.txt | 1 - test/Makefile | 1 + test/log/Makefile | 7 + test/log/log_test.c | 203 ++++++++++++++++++++++++ test/py/tests/test_log.py | 101 ++++++++++++ 30 files changed, 1294 insertions(+), 462 deletions(-) create mode 100644 common/log.c create mode 100644 common/log_console.c create mode 100644 doc/README.log create mode 100644 include/log.h delete mode 100644 include/logbuff.h create mode 100644 test/log/Makefile create mode 100644 test/log/log_test.c create mode 100644 test/py/tests/test_log.py -- 2.15.0.448.gf294e3d99a-goog

3 28