October 2018 - U-Boot

[U-Boot] [PATCH 0/5] arm: cleanup prototypes in u-boot-arm.h
by Patrick Delaunay 11 Oct '18

11 Oct '18

When I check the patch http://patchwork.ozlabs.org/patch/978762/ I see that some prototypes in u-boot-arm.h are not needed as they are unused or only used locally. This patset removes them in u-boot-arm.h; 3 patch are simple but in 2 patches I need to udpate timer.c files in many architecture but without functional change: functions modified to static, sometime I need to reorder the function. Compilation tested on v2018.11-rc1 for arm boards with buildman: tools/buildman/buildman arm aarch64 540 270 4 /814 => no new warning introduced (only device tree issue) Patrick Delaunay (5): arm: remove prototype for arch_interrupt_init arm: remove prototype for reset_timer_masked arm: remove prototype for udelay_masked arm: remove prototype for get_timer_masked arm: remove duplicated prototypes in u-boot.arm.h arch/arm/cpu/arm920t/ep93xx/timer.c | 7 +---- arch/arm/cpu/arm920t/imx/timer.c | 15 ++++------- arch/arm/cpu/arm926ejs/armada100/timer.c | 2 +- arch/arm/cpu/arm926ejs/mx27/timer.c | 2 +- arch/arm/cpu/arm926ejs/mxs/timer.c | 7 +---- arch/arm/cpu/arm926ejs/spear/timer.c | 9 +++---- arch/arm/cpu/armv7/ls102xa/timer.c | 7 +---- arch/arm/cpu/armv7/s5p-common/timer.c | 3 ++- arch/arm/cpu/armv7/stv0991/timer.c | 9 +++---- arch/arm/cpu/armv7/sunxi/timer.c | 12 ++++----- arch/arm/cpu/armv7/vf610/timer.c | 7 +---- arch/arm/cpu/sa1100/timer.c | 15 ++++------- arch/arm/include/asm/u-boot-arm.h | 9 ------- arch/arm/mach-at91/arm920t/timer.c | 19 +++++--------- arch/arm/mach-imx/syscounter.c | 7 +---- arch/arm/mach-omap2/timer.c | 3 ++- arch/arm/mach-orion5x/timer.c | 2 +- board/armltd/integrator/timer.c | 45 ++++++++++++++------------------ 18 files changed, 61 insertions(+), 119 deletions(-) -- 2.7.4

3 11

[U-Boot] [PATCH] ARC: Don't use COMMON section for global not-initialized variables
by Alexey Brodkin 11 Oct '18

11 Oct '18

By default GCC puts global non-initialized variables in COMMON section. And we used to ignore existence of COMMON section in our linker scripts though smart LD silently appended it right after .bss. And the problem here is variables from COMMON section even though require zeroing in run-time were not zeroed as they were placed right after __bss_end symbol. It was a pure luck we never faced serious problem due to this, but now it is fixed. Now as for some other architectures we'll just force GCC to put those global variables in normal .bss section. This solution is much nicer than adding COMMON section to each and every linker script. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> --- arch/arc/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arc/config.mk b/arch/arc/config.mk index d255c90..18005d9 100644 --- a/arch/arc/config.mk +++ b/arch/arc/config.mk @@ -43,7 +43,7 @@ PLATFORM_CPPFLAGS += -mcpu=archs endif PLATFORM_CPPFLAGS += -ffixed-r25 -D__ARC__ -gdwarf-2 -mno-sdata -PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections +PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections -fno-common # Needed for relocation LDFLAGS_FINAL += -pie --gc-sections -- 2.7.4

1 0

[U-Boot] [PATCH] bootm: Add board specific OS preboot hook
by Marek Vasut 11 Oct '18

11 Oct '18

Add board-specific hook which is executed before the code hands over control to the OS. This lets the board perform some last-minute clean ups. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Tom Rini <trini(a)konsulko.com> --- common/bootm_os.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/common/bootm_os.c b/common/bootm_os.c index f4bd905909..f302135868 100644 --- a/common/bootm_os.c +++ b/common/bootm_os.c @@ -505,10 +505,17 @@ __weak void arch_preboot_os(void) /* please define platform specific arch_preboot_os() */ } +/* Allow for board specific config before we boot */ +__weak void board_preboot_os(void) +{ + /* please define board specific board_preboot_os() */ +} + int boot_selected_os(int argc, char * const argv[], int state, bootm_headers_t *images, boot_os_fn *boot_fn) { arch_preboot_os(); + board_preboot_os(); boot_fn(state, argc, argv, images); /* Stand-alone may return when 'autostart' is 'no' */ -- 2.18.0

4 5

[U-Boot] [PATCH 1/2] arm: K3: am654: Choose MMC boot device based on boot port
by Andrew F. Davis 11 Oct '18

11 Oct '18

For most devices the boot mode maps directly to the boot device. For MMC this is not the case as we have two MMC boot modes and two MMC boot devices (ports). Check the boot port to determine which MMC device was our boot device. Make this change for both primary and secondary boot modes. Signed-off-by: Andrew F. Davis <afd(a)ti.com> --- arch/arm/mach-k3/am6_init.c | 21 +++++++++++++++++++- arch/arm/mach-k3/include/mach/am6_hardware.h | 6 ++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-k3/am6_init.c b/arch/arm/mach-k3/am6_init.c index 8a3a99f23a..b2388b98ec 100644 --- a/arch/arm/mach-k3/am6_init.c +++ b/arch/arm/mach-k3/am6_init.c @@ -85,7 +85,13 @@ static u32 __get_backup_bootmedia(u32 devstat) case BACKUP_BOOT_DEVICE_ETHERNET: return BOOT_DEVICE_ETHERNET; case BACKUP_BOOT_DEVICE_MMC2: + { + u32 port = (devstat & CTRLMMR_MAIN_DEVSTAT_BKUP_MMC_PORT_MASK) >> + CTRLMMR_MAIN_DEVSTAT_BKUP_MMC_PORT_SHIFT; + if (port == 0x0) + return BOOT_DEVICE_MMC1; return BOOT_DEVICE_MMC2; + } case BACKUP_BOOT_DEVICE_SPI: return BOOT_DEVICE_SPI; case BACKUP_BOOT_DEVICE_HYPERFLASH: @@ -99,11 +105,24 @@ static u32 __get_backup_bootmedia(u32 devstat) static u32 __get_primary_bootmedia(u32 devstat) { - u32 bootmode = devstat & CTRLMMR_MAIN_DEVSTAT_BOOTMODE_MASK; + u32 bootmode = (devstat & CTRLMMR_MAIN_DEVSTAT_BOOTMODE_MASK) >> + CTRLMMR_MAIN_DEVSTAT_BOOTMODE_SHIFT; if (bootmode == BOOT_DEVICE_OSPI || bootmode == BOOT_DEVICE_QSPI) bootmode = BOOT_DEVICE_SPI; + if (bootmode == BOOT_DEVICE_MMC2) { + u32 port = (devstat & CTRLMMR_MAIN_DEVSTAT_MMC_PORT_MASK) >> + CTRLMMR_MAIN_DEVSTAT_MMC_PORT_SHIFT; + if (port == 0x0) + bootmode = BOOT_DEVICE_MMC1; + } else if (bootmode == BOOT_DEVICE_MMC1) { + u32 port = (devstat & CTRLMMR_MAIN_DEVSTAT_EMMC_PORT_MASK) >> + CTRLMMR_MAIN_DEVSTAT_EMMC_PORT_SHIFT; + if (port == 0x1) + bootmode = BOOT_DEVICE_MMC2; + } + return bootmode; } diff --git a/arch/arm/mach-k3/include/mach/am6_hardware.h b/arch/arm/mach-k3/include/mach/am6_hardware.h index e4b78f8617..b5244609af 100644 --- a/arch/arm/mach-k3/include/mach/am6_hardware.h +++ b/arch/arm/mach-k3/include/mach/am6_hardware.h @@ -16,6 +16,12 @@ #define CTRLMMR_MAIN_DEVSTAT_BOOTMODE_SHIFT 0 #define CTRLMMR_MAIN_DEVSTAT_BKUP_BOOTMODE_MASK GENMASK(6, 4) #define CTRLMMR_MAIN_DEVSTAT_BKUP_BOOTMODE_SHIFT 4 +#define CTRLMMR_MAIN_DEVSTAT_MMC_PORT_MASK GENMASK(12, 12) +#define CTRLMMR_MAIN_DEVSTAT_MMC_PORT_SHIFT 12 +#define CTRLMMR_MAIN_DEVSTAT_EMMC_PORT_MASK GENMASK(14, 14) +#define CTRLMMR_MAIN_DEVSTAT_EMMC_PORT_SHIFT 14 +#define CTRLMMR_MAIN_DEVSTAT_BKUP_MMC_PORT_MASK GENMASK(17, 17) +#define CTRLMMR_MAIN_DEVSTAT_BKUP_MMC_PORT_SHIFT 12 #define WKUP_CTRL_MMR0_BASE 0x43000000 #define MCU_CTRL_MMR0_BASE 0x40f00000 -- 2.18.0

3 7

[U-Boot] [PATCH v2 1/2] gpio: da8xx: Add k2g compatible
by Keerthy 11 Oct '18

11 Oct '18

Add k2g compatible so that k3 SoCs can be supported Signed-off-by: Keerthy <j-keerthy(a)ti.com> Reviewed-by: Tom Rini <trini(a)konsulko.com> --- drivers/gpio/da8xx_gpio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpio/da8xx_gpio.c b/drivers/gpio/da8xx_gpio.c index b0d49cb..494fc5f 100644 --- a/drivers/gpio/da8xx_gpio.c +++ b/drivers/gpio/da8xx_gpio.c @@ -530,6 +530,7 @@ static int davinci_gpio_probe(struct udevice *dev) static const struct udevice_id davinci_gpio_ids[] = { { .compatible = "ti,dm6441-gpio" }, + { .compatible = "ti,k2g-gpio" }, { } }; -- 1.9.1

2 4

[U-Boot] [PATCH v2 0/2] Fix to keystone2 uinitrd fixup logic
by Nicholas Faustini 11 Oct '18

11 Oct '18

For ks2 devices with PAE enabled, the function ft_board_setup() (board/ti/ks2_evm/board.c) is supposed to update at runtime the /chosen fdt node by shifting the initrd start/end addresses into the 36b it address space. Unfortunately, this mechanism doesn't work since the /chosen node has not been populated at the time of the ft_board_setup() call. The root of the issue is that, at some point in u-boot history, the call sequence of fdt_initrd() and ft_board_setup() (common/image-fdt.c) has been inverted: ft_board_setup() is called before fdt_initrd(). Error shown by Linux during startup is: [ 0.000000] INITRD: 0x8fcec000+0x00313dc8 is not a memory region - disabling initrd I would propose to move the fdt initrd fixup logic from ft_board_setup() to ft_board_setup_ex() since the latter is called esclusively for keystone devices. Moreover, cmd/fdt.c command should include the call of ft_board_setup_ex() since keystone2 devices will require it. Changes in v2: - Add reviewed-by tag - Add reviewed-by tag, removed RFC/RESEND Nicholas Faustini (2): fdt: add call to ft_board_setup_ex() for ks2 boards board: ks2: move uinitrd fixup logic inside ft_board_setup_ex board/ti/ks2_evm/board.c | 44 ++++++++++++++++++++-------------------- cmd/fdt.c | 3 +++ 2 files changed, 25 insertions(+), 22 deletions(-) -- 2.17.1 -- Disclaimer: This email and any files transmitted along with it may contain Azcom confidential and proprietary information. If you are not the intended recipient, you are notified that disclosing, copying, distributing or taking any action based on the contents of the information contained herein is strictly prohibited. If you are not an intended recipient of this transmission and you received it in error, please inform the sender by reply e-mail and destroy this and all other copies of this transmission to which you have access. The sender of this email or Azcom does not accept liability for any errors or omissions in the contents of this message that may occur as a result.

2 4

[U-Boot] [PATCH 0/2] Add Khadas VIM2 board support
by Loic Devulder 11 Oct '18

11 Oct '18

This adds platform code for the Khadas VIM2 board based on a Meson GXM (S912) SoC with the Meson GXM configuration. This initial submission supports UART, MMC/SDCard and Ethernet. USB is partially supported. All the code is from Neil Armstrong! I just rebased the code, do some cleanup and tested on my board. Loic Devulder (2): ARM: meson: Add Khadas VIM2 board DT ARM: meson: Add Khadas VIM2 board support arch/arm/dts/Makefile | 3 +- arch/arm/dts/meson-gxm-khadas-vim2.dts | 412 ++++++++++++++++++++++++++++++++ arch/arm/dts/meson-gxm.dtsi | 119 +++++++++ arch/arm/mach-meson/Kconfig | 23 ++ board/amlogic/khadas-vim2/Kconfig | 12 + board/amlogic/khadas-vim2/MAINTAINERS | 6 + board/amlogic/khadas-vim2/Makefile | 6 + board/amlogic/khadas-vim2/README | 103 ++++++++ board/amlogic/khadas-vim2/khadas-vim2.c | 62 +++++ configs/khadas-vim2_defconfig | 51 ++++ include/configs/khadas-vim2.h | 18 ++ 11 files changed, 814 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/meson-gxm-khadas-vim2.dts create mode 100644 arch/arm/dts/meson-gxm.dtsi create mode 100644 board/amlogic/khadas-vim2/Kconfig create mode 100644 board/amlogic/khadas-vim2/MAINTAINERS create mode 100644 board/amlogic/khadas-vim2/Makefile create mode 100644 board/amlogic/khadas-vim2/README create mode 100644 board/amlogic/khadas-vim2/khadas-vim2.c create mode 100644 configs/khadas-vim2_defconfig create mode 100644 include/configs/khadas-vim2.h -- 2.16.4

3 8

[U-Boot] [PATCH] ARM: dts: stm32mp1: Add usbotg_hs regulator for stm32mp157c-ev1
by Patrice Chotard 11 Oct '18

11 Oct '18

Add usbotg_hs regulator to allow to use the USB mass-storage feature on OTG usb port. Signed-off-by: Patrice Chotard <patrice.chotard(a)st.com> --- arch/arm/dts/stm32mp157c-ed1.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/dts/stm32mp157c-ed1.dts b/arch/arm/dts/stm32mp157c-ed1.dts index 898deaf41095..f8b770116711 100644 --- a/arch/arm/dts/stm32mp157c-ed1.dts +++ b/arch/arm/dts/stm32mp157c-ed1.dts @@ -361,6 +361,10 @@ status = "okay"; }; +&usbotg_hs { + usb33d-supply = <&usb33>; +}; + &usbphyc_port0 { phy-supply = <&vdd_usb>; vdda1v1-supply = <&reg11>; -- 1.9.1

3 3

[U-Boot] [PATCH] cmd: pxe: add support for FIT config selection
by Patrick Delaunay 11 Oct '18

11 Oct '18

Add a way in configuration files (exlinux.conf for sysboot command) to select a specific FIT configuration. The configuration is selected with a string added after the FIT filename in the label "KERNEL" or "LINUX", using the same format than bootm command: KERNEL [Filename]#<conf>[#<extra-conf[#...]] This configuration string, beginning by '#', is directly appended to bootm argument 1 after <kernel_addr_r>. bootm [<kernel_addr_r>]#<conf>[#<extra-conf[#...]] see doc/uImage.FIT/command_syntax_extensions.txt for details Example : KERNEL /fit.itb#cfg1 KERNEL /fit.itb#cfg2 Configuration can be use also for overlay management : KERNEL /fit.itb#cfg1#dtbo1#dtbo3 see doc/uImage.FIT/overlay-fdt-boot.txt for details Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- cmd/pxe.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++--- doc/README.pxe | 7 +++++++ 2 files changed, 58 insertions(+), 3 deletions(-) diff --git a/cmd/pxe.c b/cmd/pxe.c index 5609545..2745553 100644 --- a/cmd/pxe.c +++ b/cmd/pxe.c @@ -471,6 +471,7 @@ struct pxe_label { char *name; char *menu; char *kernel; + char *config; char *append; char *initrd; char *fdt; @@ -538,6 +539,9 @@ static void label_destroy(struct pxe_label *label) if (label->kernel) free(label->kernel); + if (label->config) + free(label->config); + if (label->append) free(label->append); @@ -618,6 +622,7 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) char initrd_str[28]; char mac_str[29] = ""; char ip_str[68] = ""; + char *fit_addr = NULL; int bootm_argc = 2; int len = 0; ulong kernel_addr; @@ -699,6 +704,18 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) } bootm_argv[1] = env_get("kernel_addr_r"); + /* for FIT, append the configuration identifier */ + if (label->config) { + int len = strlen(bootm_argv[1]) + strlen(label->config) + 1; + + fit_addr = malloc(len); + if (!fit_addr) { + printf("malloc fail (FIT address)\n"); + return 1; + } + snprintf(fit_addr, len, "%s%s", bootm_argv[1], label->config); + bootm_argv[1] = fit_addr; + } /* * fdt usage is optional: @@ -758,7 +775,7 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) fdtfilefree = malloc(len); if (!fdtfilefree) { printf("malloc fail (FDT filename)\n"); - return 1; + goto cleanup; } snprintf(fdtfilefree, len, "%s%s%s%s%s%s", @@ -772,7 +789,7 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) if (err < 0) { printf("Skipping %s for failure retrieving fdt\n", label->name); - return 1; + goto cleanup; } } else { bootm_argv[3] = NULL; @@ -803,6 +820,10 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) do_bootz(cmdtp, 0, bootm_argc, bootm_argv); #endif unmap_sysmem(buf); + +cleanup: + if (fit_addr) + free(fit_addr); return 1; } @@ -1188,6 +1209,33 @@ static int parse_label_menu(char **c, struct pxe_menu *cfg, } /* + * Handles parsing a 'kernel' label. + * expecting "filename" or "<fit_filename>#cfg" + */ +static int parse_label_kernel(char **c, struct pxe_label *label) +{ + char *s; + int err; + + err = parse_sliteral(c, &label->kernel); + if (err < 0) + return err; + + s = strstr(label->kernel, "#"); + if (!s) + return 1; + + label->config = malloc(strlen(s) + 1); + if (!label->config) + return -ENOMEM; + + strcpy(label->config, s); + *s = 0; + + return 1; +} + +/* * Parses a label and adds it to the list of labels for a menu. * * A label ends when we either get to the end of a file, or @@ -1228,7 +1276,7 @@ static int parse_label(char **c, struct pxe_menu *cfg) case T_KERNEL: case T_LINUX: - err = parse_sliteral(c, &label->kernel); + err = parse_label_kernel(c, label); break; case T_APPEND: diff --git a/doc/README.pxe b/doc/README.pxe index 98862cd..42f913c 100644 --- a/doc/README.pxe +++ b/doc/README.pxe @@ -140,6 +140,13 @@ kernel <path> - if this label is chosen, use tftp to retrieve the kernel (or FIT image) at <path>. it will be stored at the address indicated in the kernel_addr_r environment variable, and that address will be passed to bootm to boot this kernel. + For FIT image, The configuration specification can be + appended to the file name, with the format: + <path>#<conf>[#<extra-conf[#...]] + It will passed to bootm with that address. + (see: doc/uImage.FIT/command_syntax_extensions.txt) + It useful for overlay selection in pxe file + (see: doc/uImage.FIT/overlay-fdt-boot.txt) append <string> - use <string> as the kernel command line when booting this label. -- 2.7.4

2 1

[U-Boot] [PATCH v2 1/1] ARM: meson: Extend mem_map to support 3GiB of RAM
by Loic Devulder 11 Oct '18

11 Oct '18

The current mem_map definition for Meson SoCs has support for up to 2GiB of RAM. According to S905, S905X, S912 and S805X datasheets the DDR region is set from 0x00000000 to 0xBFFFFFFF, so mem_map's definition should be changed accordingly. It is also needed to be able to boot Khadas VIM2 board with S912 SoC. Signed-off-by: Loic Devulder <ldevulder(a)suse.de> --- v2: set the correct size for devices memory map arch/arm/mach-meson/board.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-meson/board.c b/arch/arm/mach-meson/board.c index 1ef7e5a6d1..48096ca7cf 100644 --- a/arch/arm/mach-meson/board.c +++ b/arch/arm/mach-meson/board.c @@ -111,13 +111,13 @@ static struct mm_region gx_mem_map[] = { { .virt = 0x0UL, .phys = 0x0UL, - .size = 0x80000000UL, + .size = 0xc0000000UL, .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_INNER_SHARE }, { - .virt = 0x80000000UL, - .phys = 0x80000000UL, - .size = 0x80000000UL, + .virt = 0xc0000000UL, + .phys = 0xc0000000UL, + .size = 0x30000000UL, .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN -- 2.16.4

4 3