February 2018 - U-Boot

[U-Boot] [PATCH] Build system: Don't check for CONFIG_SYS_TEXT_BASE being set
by Alexey Brodkin 12 Feb '18

12 Feb '18

CONFIG_SYS_TEXT_BASE must be set anyways and then it is used in many places in the same Makefile without any checks so there's no point in keeping this check araound just in one place. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> Cc: Tom Rini <trini(a)konsulko.com> --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index ab3453dcebdc..6f15612b4d07 100644 --- a/Makefile +++ b/Makefile @@ -820,9 +820,7 @@ LDFLAGS_u-boot += $(LDFLAGS_FINAL) # Avoid 'Not enough room for program headers' error on binutils 2.28 onwards. LDFLAGS_u-boot += $(call ld-option, --no-dynamic-linker) -ifneq ($(CONFIG_SYS_TEXT_BASE),) LDFLAGS_u-boot += -Ttext $(CONFIG_SYS_TEXT_BASE) -endif # Normally we fill empty space with 0xff quiet_cmd_objcopy = OBJCOPY $@ -- 2.14.3

5 14

[U-Boot] SPARC support
by Travis Waters 12 Feb '18

12 Feb '18

Hi All! For several years, my organization has built and maintained boards SPARCH-architecture processors (specifically Gaisler's implementation of the LEON3), and we have depended on u-boot as our primary bootloader. But when attempting to update u-boot this morning, we were disappointed to find that the SPARC support was completely removed last March with commits: 936478e797a87bcd4e002bf70430b6f58584b155 54f302f1197a490c2c4e3564c698ecd090d5013b What was the reasoning for completely removing support for SPARC? What will it take to get it back in? Thanks! -Travis Waters

2 3

[U-Boot] [PATCH] CMD_PXE: Ramdisk does not pass to the kernel if FDT image does not specified
by vlaomao＠gmail.com 12 Feb '18

12 Feb '18

From: VlaoMao <vlaomao(a)gmail.com> --- cmd/pxe.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmd/pxe.c b/cmd/pxe.c index 7043ad11fd..cf12b780b1 100644 --- a/cmd/pxe.c +++ b/cmd/pxe.c @@ -783,6 +783,11 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) if (!bootm_argv[3]) bootm_argv[3] = env_get("fdt_addr"); + if (bootm_argv[2]) { + if(!bootm_argv[3]) + bootm_argc = 3; + } + if (bootm_argv[3]) { if (!bootm_argv[2]) bootm_argv[2] = "-"; -- 2.16.1

1 0

[U-Boot] [PATCH] core: add ofnode_get_by_phandle() api
by Kever Yang 12 Feb '18

12 Feb '18

We need to get ofnode from a phandle, add interface to support both live dt and fdt. Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- drivers/core/ofnode.c | 13 +++++++++++++ include/dm/ofnode.h | 8 ++++++++ 2 files changed, 21 insertions(+) diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index 0fc8bd4..59c8ff3 100644 --- a/drivers/core/ofnode.c +++ b/drivers/core/ofnode.c @@ -177,6 +177,19 @@ const char *ofnode_get_name(ofnode node) return fdt_get_name(gd->fdt_blob, ofnode_to_offset(node), NULL); } +ofnode ofnode_get_by_phandle(uint phandle) +{ + ofnode node; + + if (of_live_active()) + node = np_to_ofnode(of_find_node_by_phandle(phandle)); + else + node.of_offset = fdt_node_offset_by_phandle(gd->fdt_blob, + phandle); + + return node; +} + int ofnode_read_size(ofnode node, const char *propname) { int len; diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h index 8b9932a..b1681e2 100644 --- a/include/dm/ofnode.h +++ b/include/dm/ofnode.h @@ -310,6 +310,14 @@ ofnode ofnode_next_subnode(ofnode node); const char *ofnode_get_name(ofnode node); /** + * ofnode_get_by_phandle() - get ofnode from phandle + * + * @phandle: phandle to look up + * @return ofnode reference to the phandle + */ +ofnode ofnode_get_by_phandle(uint phandle); + +/** * ofnode_read_size() - read the size of a property * * @node: node to check -- 1.9.1

2 1

[U-Boot] [PATCH] block: Migrate SystemACE chip to Kconfig
by Tom Rini 12 Feb '18

12 Feb '18

Migrate the base and sub-options to Kconfig. Note that we only enable this in the base sandbox config now. Cc: Alexey Brodkin <alexey.brodkin(a)gmail.com> Cc: Michal Simek <michal.simek(a)xilinx.com> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- Is this driver still used anywhere? It's fishy that it's only enabled in sandbox anymore. --- README | 12 ------------ configs/sandbox_defconfig | 3 +++ drivers/block/Kconfig | 18 ++++++++++++++++++ include/configs/sandbox.h | 4 ---- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/README b/README index 2f9034ed5e22..57d985d0f1d4 100644 --- a/README +++ b/README @@ -2274,18 +2274,6 @@ The following options need to be configured: CONFIG_SF_DEFAULT_MODE (see include/spi.h) CONFIG_SF_DEFAULT_SPEED in Hz - CONFIG_SYSTEMACE - - Adding this option adds support for Xilinx SystemACE - chips attached via some sort of local bus. The address - of the chip must also be defined in the - CONFIG_SYS_SYSTEMACE_BASE macro. For example: - - #define CONFIG_SYSTEMACE - #define CONFIG_SYS_SYSTEMACE_BASE 0xf0000000 - - When SystemACE support is added, the "ace" device type - becomes available to the fat commands, i.e. fatls. - TFTP Fixed UDP Port: CONFIG_TFTP_PORT diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 41a2e34235dd..3acf9089cdb4 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -80,6 +80,9 @@ CONFIG_DEVRES=y CONFIG_DEBUG_DEVRES=y CONFIG_ADC=y CONFIG_ADC_SANDBOX=y +CONFIG_SYSTEMACE=y +CONFIG_SYS_SYSTEMACE_BASE=0x0 +CONFIG_SYS_SYSTEMACE_WIDTH=16 CONFIG_CLK=y CONFIG_CPU=y CONFIG_DM_DEMO=y diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 26760895f99d..e2c80f2075e2 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -38,3 +38,21 @@ config IDE This allows access to raw blocks and filesystems on an IDE drive from U-Boot. See also CMD_IDE which provides an 'ide' command for performing various IDE operations. + +config SYSTEMACE + bool "Xilinx SystemACE support" + help + Adding this option adds support for Xilinx SystemACE chips attached + via some sort of local bus. The address of the chip must also be + defined in the CONFIG_SYS_SYSTEMACE_BASE macro. + + When SystemACE support is added, the "ace" device type becomes + available to the fat commands, i.e. fatls. + +config SYS_SYSTEMACE_BASE + hex "Base address of SystemACE chip" + depends on SYSTEMACE + +config SYS_SYSTEMACE_WIDTH + int "Word size of access to the of SystemACE chip" + depends on SYSTEMACE diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index de1c8a2a3855..b0a749caecc2 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -142,10 +142,6 @@ #define CONFIG_SYS_SATA_MAX_DEVICE 2 -#define CONFIG_SYSTEMACE -#define CONFIG_SYS_SYSTEMACE_WIDTH 16 -#define CONFIG_SYS_SYSTEMACE_BASE 0 - #define CONFIG_MISC_INIT_F #endif -- 2.7.4

3 3

[U-Boot] [PATCH 3/8] Convert CONFIG_BOOTCOUNT_AM33XX to Kconfig
by Alex Kiernan 12 Feb '18

12 Feb '18

This converts the following to Kconfig: CONFIG_BOOTCOUNT_AM33XX Signed-off-by: Alex Kiernan <alex.kiernan(a)gmail.com> --- drivers/bootcount/Kconfig | 9 +++++++++ drivers/bootcount/Makefile | 1 - include/configs/am335x_evm.h | 1 - include/configs/am335x_sl50.h | 1 - include/configs/baltos.h | 2 -- include/configs/bav335x.h | 1 - include/configs/brppt1.h | 1 - include/configs/chiliboard.h | 1 - scripts/config_whitelist.txt | 1 - 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig index 26fec89..e905295 100644 --- a/drivers/bootcount/Kconfig +++ b/drivers/bootcount/Kconfig @@ -12,6 +12,7 @@ if BOOTCOUNT_LIMIT choice prompt "Boot count device" + default BOOTCOUNT_AM33XX if AM33XX || SOC_DA8XX config BOOTCOUNT_EXT bool "Boot counter on EXT filesystem" @@ -19,6 +20,14 @@ config BOOTCOUNT_EXT Add support for maintaining boot count in a file on an EXT filesystem. +config BOOTCOUNT_AM33XX + bool "Boot counter in AM33XX RTC IP block" + depends on AM33XX || SOC_DA8XX + help + A bootcount driver for the RTC IP block found on many TI platforms. + This requires the RTC clocks, etc, to be enabled prior to use and + not all boards with this IP block on it will have the RTC in use. + endchoice config SYS_BOOTCOUNT_SINGLEWORD diff --git a/drivers/bootcount/Makefile b/drivers/bootcount/Makefile index 45445d2..62bf55e 100644 --- a/drivers/bootcount/Makefile +++ b/drivers/bootcount/Makefile @@ -4,7 +4,6 @@ obj-y += bootcount.o obj-$(CONFIG_AT91SAM9XE) += bootcount_at91.o -obj-$(CONFIG_SOC_DA8XX) += bootcount_davinci.o obj-$(CONFIG_BOOTCOUNT_AM33XX) += bootcount_davinci.o obj-$(CONFIG_BOOTCOUNT_RAM) += bootcount_ram.o obj-$(CONFIG_BOOTCOUNT_ENV) += bootcount_env.o diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 03791de..fff463e 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -177,7 +177,6 @@ /* SPL */ #ifndef CONFIG_NOR_BOOT /* Bootcount using the RTC block */ -#define CONFIG_BOOTCOUNT_AM33XX #define CONFIG_SYS_BOOTCOUNT_BE /* USB gadget RNDIS */ diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index 1cb3578..4bcbaee 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -74,7 +74,6 @@ /* SPL */ /* Bootcount using the RTC block */ -#define CONFIG_BOOTCOUNT_AM33XX #define CONFIG_SYS_BOOTCOUNT_BE #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 440dbf5..10979c7 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -230,8 +230,6 @@ /* SPL */ #ifndef CONFIG_NOR_BOOT -/* Bootcount using the RTC block */ -#define CONFIG_BOOTCOUNT_AM33XX /* USB gadget RNDIS */ diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 7bbb7d1..27cb8f6 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -339,7 +339,6 @@ DEFAULT_LINUX_BOOT_ENV \ /* SPL */ #ifndef CONFIG_NOR_BOOT /* Bootcount using the RTC block */ -#define CONFIG_BOOTCOUNT_AM33XX #define CONFIG_SYS_BOOTCOUNT_BE /* USB gadget RNDIS */ diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index fb2845f..30ea2d2 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -22,7 +22,6 @@ /* Bootcount using the RTC block */ #define CONFIG_SYS_BOOTCOUNT_ADDR 0x44E3E000 -#define CONFIG_BOOTCOUNT_AM33XX /* memory */ #define CONFIG_SYS_MALLOC_LEN (5 * 1024 * 1024) diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h index 234cd6a..92e0479 100644 --- a/include/configs/chiliboard.h +++ b/include/configs/chiliboard.h @@ -123,7 +123,6 @@ /* SPL */ /* Bootcount using the RTC block */ -#define CONFIG_BOOTCOUNT_AM33XX #define CONFIG_SYS_BOOTCOUNT_BE /* NAND: device related configs */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1be3f23..46d9d5c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -148,7 +148,6 @@ CONFIG_BOOGER CONFIG_BOOM CONFIG_BOOTBLOCK CONFIG_BOOTCOUNT_ALEN -CONFIG_BOOTCOUNT_AM33XX CONFIG_BOOTCOUNT_ENV CONFIG_BOOTCOUNT_I2C CONFIG_BOOTCOUNT_LIMIT -- 2.7.4

3 2

[U-Boot] [PATCH v1 0/5] Provide SPL support for bootcount (in the case of using falcon boot mode)
by Lukasz Majewski 12 Feb '18

12 Feb '18

This patch series provides support for controlling bootcount limits in SPL. It also enables this feature on display5 board to present usage patterns. "Green" travis CI build: https://travis-ci.org/lmajewski/u-boot-dfu This patch has been applied on top of u-boot/master: SHA1: 1811a928c6c7604d6d05a84b4d552a7c31b4994e This patch series shall be applied on top of: [U-Boot,1/2] Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig http://patchwork.ozlabs.org/patch/871585/ [U-Boot,2/2] Convert CONFIG_SYS_BOOTCOUNT_SINGLEWORD to Kconfig http://patchwork.ozlabs.org/patch/871586/ Lukasz Majewski (5): bootcount: config: Make the SYS_BOOTCOUNT_ADDR available also for non EXT setups bootcount: Add function wrappers to handle bootcount increment and error checking spl: bootcount: Enable bootcount support in SPL config: display5: Enable boot count feature in the display5 board arm: display5: Extend SPL to support bootcount checking board/liebherr/display5/spl.c | 4 +++- common/spl/Kconfig | 9 +++++++++ configs/display5_defconfig | 5 +++++ drivers/Makefile | 1 + drivers/bootcount/Kconfig | 13 ++++++------- include/bootcount.h | 25 +++++++++++++++++++++++++ 6 files changed, 49 insertions(+), 8 deletions(-) -- 2.11.0

2 6

[U-Boot] [PATCH] common: build ymodem and s_record only on need
by Jun Nie 12 Feb '18

12 Feb '18

Build ymodem and s_record only on need to shrink spl image size. Signed-off-by: Jun Nie <jun.nie(a)linaro.org> --- common/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/Makefile b/common/Makefile index c7bde23..8e1569f 100644 --- a/common/Makefile +++ b/common/Makefile @@ -28,6 +28,8 @@ obj-$(CONFIG_DISPLAY_BOARDINFO_LATE) += board_info.o obj-$(CONFIG_CMD_BOOTM) += bootm.o bootm_os.o obj-$(CONFIG_CMD_BOOTZ) += bootm.o bootm_os.o obj-$(CONFIG_CMD_BOOTI) += bootm.o bootm_os.o +obj-$(CONFIG_CMD_LOADS) += s_record.o +obj-$(CONFIG_CMD_LOADB) += xyzModem.o obj-$(CONFIG_CMD_BEDBUG) += bedbug.o obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o @@ -132,5 +134,3 @@ obj-$(CONFIG_CMD_DFU) += dfu.o obj-y += command.o obj-$(CONFIG_$(SPL_)LOG) += log.o obj-$(CONFIG_$(SPL_)LOG_CONSOLE) += log_console.o -obj-y += s_record.o -obj-y += xyzModem.o -- 1.9.1

2 2

[U-Boot] [PATCH] Remove more checks for CONFIG_SYS_TEXT_BASE being set
by Alexey Brodkin 11 Feb '18

11 Feb '18

Now when Blackfin is gone CONFIG_SYS_TEXT_BASE is supposed to be set for each and every board which makes checks for this macro being set completely redundant. Note there're still checks for CONFIG_SYS_TEXT_BASE in quite a few board configurations in "include/configs/XXX.h" which at some point might be cleaned-up too. But at least sources are clean now. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> Cc: Masahiro Yamada <yamada.masahiro(a)socionext.com> Cc: Tom Rini <trini(a)konsulko.com> --- arch/x86/lib/relocate.c | 4 ---- common/autoboot.c | 4 ++-- common/board_f.c | 6 ------ 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c index 114f602f7aba..352f5512a9ea 100644 --- a/arch/x86/lib/relocate.c +++ b/arch/x86/lib/relocate.c @@ -145,11 +145,7 @@ int do_elf_reloc_fixups(void) if (re_src == re_end) panic("No relocation data"); -#ifdef CONFIG_SYS_TEXT_BASE text_base = CONFIG_SYS_TEXT_BASE; -#else - panic("No CONFIG_SYS_TEXT_BASE"); -#endif #if CONFIG_IS_ENABLED(X86_64) do_elf_reloc_fixups64(text_base, size, re_src, re_end); #else diff --git a/common/autoboot.c b/common/autoboot.c index 2eef7a04cc73..3d029c35a122 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -272,7 +272,7 @@ static int abortboot(int bootdelay) static void process_fdt_options(const void *blob) { -#if defined(CONFIG_OF_CONTROL) && defined(CONFIG_SYS_TEXT_BASE) +#ifdef CONFIG_OF_CONTROL ulong addr; /* Add an env variable to point to a kernel payload, if available */ @@ -284,7 +284,7 @@ static void process_fdt_options(const void *blob) addr = fdtdec_get_config_int(gd->fdt_blob, "rootdisk-offset", 0); if (addr) env_set_addr("rootaddr", (void *)(CONFIG_SYS_TEXT_BASE + addr)); -#endif /* CONFIG_OF_CONTROL && CONFIG_SYS_TEXT_BASE */ +#endif /* CONFIG_OF_CONTROL */ } const char *bootdelay_process(void) diff --git a/common/board_f.c b/common/board_f.c index c6bc53e1bf05..a4f614a5322a 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -129,11 +129,7 @@ static int display_text_info(void) bss_start = (ulong)&__bss_start; bss_end = (ulong)&__bss_end; -#ifdef CONFIG_SYS_TEXT_BASE text_base = CONFIG_SYS_TEXT_BASE; -#else - text_base = CONFIG_SYS_MONITOR_BASE; -#endif debug("U-Boot code: %08lX -> %08lX BSS: -> %08lX\n", text_base, bss_start, bss_end); @@ -620,7 +616,6 @@ static int setup_reloc(void) return 0; } -#ifdef CONFIG_SYS_TEXT_BASE #ifdef ARM gd->reloc_off = gd->relocaddr - (unsigned long)__image_copy_start; #elif defined(CONFIG_M68K) @@ -631,7 +626,6 @@ static int setup_reloc(void) gd->reloc_off = gd->relocaddr - (CONFIG_SYS_TEXT_BASE + 0x400); #else gd->reloc_off = gd->relocaddr - CONFIG_SYS_TEXT_BASE; -#endif #endif memcpy(gd->new_gd, (char *)gd, sizeof(gd_t)); -- 2.14.3

2 2

[U-Boot] [PATCH 2/8] Prepare for multiple bootcount drivers
by Alex Kiernan 11 Feb '18

11 Feb '18

Signed-off-by: Alex Kiernan <alex.kiernan(a)gmail.com> --- drivers/bootcount/Kconfig | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig index da2ccab..26fec89 100644 --- a/drivers/bootcount/Kconfig +++ b/drivers/bootcount/Kconfig @@ -2,29 +2,30 @@ # Boot count configuration # -menu "Boot count support" - -config BOOTCOUNT_LIMIT +menuconfig BOOTCOUNT_LIMIT bool "Enable support for checking boot count limit" help Enable checking for exceeding the boot count limit. More information: http://www.denx.de/wiki/DULG/UBootBootCountLimit -config SYS_BOOTCOUNT_SINGLEWORD - bool "Use single word to pack boot count and magic value" - help - This option enables packing boot count magic value and boot count - into single word (32 bits). - if BOOTCOUNT_LIMIT +choice + prompt "Boot count device" + config BOOTCOUNT_EXT bool "Boot counter on EXT filesystem" help Add support for maintaining boot count in a file on an EXT filesystem. -if BOOTCOUNT_EXT +endchoice + +config SYS_BOOTCOUNT_SINGLEWORD + bool "Use single word to pack boot count and magic value" + help + This option enables packing boot count magic value and boot count + into single word (32 bits). config SYS_BOOTCOUNT_EXT_INTERFACE string "Interface on which to find boot counter EXT filesystem" @@ -57,7 +58,3 @@ config SYS_BOOTCOUNT_ADDR Set the address used for reading and writing the boot counter. endif - -endif - -endmenu -- 2.7.4

2 1