October 2019 - U-Boot

[U-Boot] [PATCH] net: eth-uclass: Remove warning about ROM MAC address
by Soeren Moch 09 Feb '20

09 Feb '20

Using a MAC address from ROM storage is the normal case for most ethernet hardware. Why should we warn about this? Signed-off-by: Soeren Moch <smoch(a)web.de> --- Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: u-boot(a)lists.denx.de --- net/eth-uclass.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/eth-uclass.c b/net/eth-uclass.c index 3bd98b01ad..8b29de37bb 100644 --- a/net/eth-uclass.c +++ b/net/eth-uclass.c @@ -538,8 +538,6 @@ static int eth_post_probe(struct udevice *dev) memcpy(pdata->enetaddr, env_enetaddr, ARP_HLEN); } else if (is_valid_ethaddr(pdata->enetaddr)) { eth_env_set_enetaddr_by_index("eth", dev->seq, pdata->enetaddr); - printf("\nWarning: %s using MAC address from ROM\n", - dev->name); } else if (is_zero_ethaddr(pdata->enetaddr) || !is_valid_ethaddr(pdata->enetaddr)) { #ifdef CONFIG_NET_RANDOM_ETHADDR -- 2.17.1

4 8

[U-Boot] [PATCH] board: ax25-ae350: Print board information.
by Andes 06 Feb '20

06 Feb '20

From: Rick Chen <rick(a)andestech.com> Add to print board and bit information message. Signed-off-by: Rick Chen <rick(a)andestech.com> Cc: Greentime Hu <greentime(a)andestech.com> --- board/AndesTech/ax25-ae350/ax25-ae350.c | 1 + 1 file changed, 1 insertion(+) diff --git a/board/AndesTech/ax25-ae350/ax25-ae350.c b/board/AndesTech/ax25-ae350/ax25-ae350.c index 5f4ca0f..61ca10b 100644 --- a/board/AndesTech/ax25-ae350/ax25-ae350.c +++ b/board/AndesTech/ax25-ae350/ax25-ae350.c @@ -20,6 +20,7 @@ DECLARE_GLOBAL_DATA_PTR; int board_init(void) { + printf("Board: %s (%d)\n" , CONFIG_SYS_BOARD, __riscv_xlen); gd->bd->bi_boot_params = PHYS_SDRAM_0 + 0x400; return 0; -- 2.7.4

3 3

[U-Boot] [PATCH v3] riscv: add Kconfig entries for the F and D ISA extensions support
by Eric Lin 05 Feb '20

05 Feb '20

This patch adds Kconfig entries for the F (Single-Precision) and D (Double-Precision) floating point instruction-set extensions. Signed-off-by: Eric Lin <tesheng(a)andestech.com> --- Changes for v2: - Grammatical correction in commit message "adds" - Fixed the config name to indicate both F and D Changes for v3: - Separate the config name for ISA_F and ISA_D arch/riscv/Kconfig | 14 ++++++++++++++ arch/riscv/Makefile | 16 ++++++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 362f3cdc65..7a2463ffe2 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -91,6 +91,20 @@ config RISCV_ISA_C when building U-Boot, which results in compressed instructions in the U-Boot binary. +config RISCV_ISA_F + bool "Emit single-precision floating-point instructions" + help + Adds "F" to the ISA subsets that the toolchain is allowed to emit + when building U-Boot, which results in single-precision instructions + in the U-Boot binary. + +config RISCV_ISA_D + bool "Emit double-precision floating-point instructions" + help + Adds "D" to the ISA subsets that the toolchain is allowed to emit + when building U-Boot, which results in double-precision instructions + in the U-Boot binary. + config RISCV_ISA_A def_bool y diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile index 0b80eb8d86..f834d11720 100644 --- a/arch/riscv/Makefile +++ b/arch/riscv/Makefile @@ -5,15 +5,23 @@ ifeq ($(CONFIG_ARCH_RV64I),y) ARCH_BASE = rv64im - ABI = lp64 + ABI := lp64 endif ifeq ($(CONFIG_ARCH_RV32I),y) ARCH_BASE = rv32im - ABI = ilp32 + ABI := ilp32 endif ifeq ($(CONFIG_RISCV_ISA_A),y) ARCH_A = a endif +ifeq ($(CONFIG_RISCV_ISA_F),y) + ARCH_F = f + ABI := $(ABI)f +endif +ifeq ($(CONFIG_RISCV_ISA_D),y) + ARCH_D = fd + ABI := $(ABI)d +endif ifeq ($(CONFIG_RISCV_ISA_C),y) ARCH_C = c endif @@ -24,8 +32,8 @@ ifeq ($(CONFIG_CMODEL_MEDANY),y) CMODEL = medany endif -ARCH_FLAGS = -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_C) -mabi=$(ABI) \ - -mcmodel=$(CMODEL) +ARCH_FLAGS = -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_F)$(ARCH_D)$(ARCH_C) -mabi=$(ABI) \ + -mcmodel=$(CMODEL) PLATFORM_CPPFLAGS += $(ARCH_FLAGS) CFLAGS_EFI += $(ARCH_FLAGS) -- 2.17.0

3 3

[U-Boot] [PATCH] qemu-riscv64_smode, sifive-fu540: fix extlinux (define preboot)
by David Abdurachmanov 04 Feb '20

04 Feb '20

Commit 37304aaf60bf92a5dc3ef222ba520698bd862a44 removed preboot commands in RISC-V targets and broke extlinux support as reported by Fu Wei <wefu(a)redhat.com>. The patch finishes migration of CONFIG_USE_PREBOOT and CONFIG_REBOOT to Kconfig. Signed-off-by: David Abdurachmanov <david.abdurachmanov(a)sifive.com> --- configs/qemu-riscv64_smode_defconfig | 2 ++ configs/sifive_fu540_defconfig | 2 ++ include/configs/sifive-fu540.h | 4 ---- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/qemu-riscv64_smode_defconfig b/configs/qemu-riscv64_smode_defconfig index 74743a5ebe..2e1f7fa91f 100644 --- a/configs/qemu-riscv64_smode_defconfig +++ b/configs/qemu-riscv64_smode_defconfig @@ -9,3 +9,5 @@ CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y # CONFIG_CMD_MII is not set CONFIG_OF_PRIOR_STAGE=y +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};" diff --git a/configs/sifive_fu540_defconfig b/configs/sifive_fu540_defconfig index 48865e5f11..a852579309 100644 --- a/configs/sifive_fu540_defconfig +++ b/configs/sifive_fu540_defconfig @@ -9,3 +9,5 @@ CONFIG_MISC_INIT_R=y CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y CONFIG_OF_PRIOR_STAGE=y +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};" diff --git a/include/configs/sifive-fu540.h b/include/configs/sifive-fu540.h index 858b7a7da1..ba4aa0652c 100644 --- a/include/configs/sifive-fu540.h +++ b/include/configs/sifive-fu540.h @@ -40,8 +40,4 @@ "ramdisk_addr_r=0x88300000\0" \ BOOTENV -#define CONFIG_PREBOOT \ - "setenv fdt_addr ${fdtcontroladdr};" \ - "fdt addr ${fdtcontroladdr};" - #endif /* __CONFIG_H */ -- 2.21.0

4 9

[U-Boot] [PATCH] fit: Do not automatically decompress ramdisk images
by Julius Werner 04 Feb '20

04 Feb '20

The Linux ramdisk should always be decompressed by the kernel itself, not by U-Boot. Therefore, the 'compression' node in the FIT image should always be set to "none" for ramdisk images, since the only point of using that node is if you want U-Boot to do the decompression itself. Yet some systems populate the node to the compression algorithm used by the kernel instead. This used to be ignored, but now that we support decompression of all image types it becomes a problem. Since ramdisks should never be decompressed by U-Boot anyway, this patch adds a special exception for them to avoid these issues. Still, setting the 'compression' node like that is wrong in the first place, so we still want to print out a warning so that third-party distributions doing this can notice and fix it. Signed-off-by: Julius Werner <jwerner(a)chromium.org> --- common/image-fit.c | 13 +++++++++---- test/py/tests/test_fit.py | 10 +++++++++- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/common/image-fit.c b/common/image-fit.c index e346fed550..5c63c769de 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -1998,10 +1998,11 @@ int fit_image_load(bootm_headers_t *images, ulong addr, comp = IH_COMP_NONE; loadbuf = buf; /* Kernel images get decompressed later in bootm_load_os(). */ - if (!(image_type == IH_TYPE_KERNEL || - image_type == IH_TYPE_KERNEL_NOLOAD) && - !fit_image_get_comp(fit, noffset, &comp) && - comp != IH_COMP_NONE) { + if (!fit_image_get_comp(fit, noffset, &comp) && + comp != IH_COMP_NONE && + !(image_type == IH_TYPE_KERNEL || + image_type == IH_TYPE_KERNEL_NOLOAD || + image_type == IH_TYPE_RAMDISK)) { ulong max_decomp_len = len * 20; if (load == data) { loadbuf = malloc(max_decomp_len); @@ -2021,6 +2022,10 @@ int fit_image_load(bootm_headers_t *images, ulong addr, memcpy(loadbuf, buf, len); } + if (image_type == IH_TYPE_RAMDISK && comp != IH_COMP_NONE) + puts("WARNING: 'compression' nodes for ramdisks are deprecated," + " please fix your .its file!\n"); + /* verify that image data is a proper FDT blob */ if (image_type == IH_TYPE_FLATDT && fdt_check_header(loadbuf)) { puts("Subimage data is not a FDT"); diff --git a/test/py/tests/test_fit.py b/test/py/tests/test_fit.py index 8009d2907b..e3210ed43f 100755 --- a/test/py/tests/test_fit.py +++ b/test/py/tests/test_fit.py @@ -269,6 +269,11 @@ def test_fit(u_boot_console): def check_equal(expected_fname, actual_fname, failure_msg): """Check that a file matches its expected contents + This is always used on out-buffers whose size is decided by the test + script anyway, which in some cases may be larger than what we're + actually looking for. So it's safe to truncate it to the size of the + expected data. + Args: expected_fname: Filename containing expected contents actual_fname: Filename containing actual contents @@ -276,6 +281,8 @@ def test_fit(u_boot_console): """ expected_data = read_file(expected_fname) actual_data = read_file(actual_fname) + if len(expected_data) < len(actual_data): + actual_data = actual_data[:len(expected_data)] assert expected_data == actual_data, failure_msg def check_not_equal(expected_fname, actual_fname, failure_msg): @@ -435,7 +442,8 @@ def test_fit(u_boot_console): output = cons.run_command_list(cmd.splitlines()) check_equal(kernel, kernel_out, 'Kernel not loaded') check_equal(control_dtb, fdt_out, 'FDT not loaded') - check_equal(ramdisk, ramdisk_out, 'Ramdisk not loaded') + check_not_equal(ramdisk, ramdisk_out, 'Ramdisk got decompressed?') + check_equal(ramdisk + '.gz', ramdisk_out, 'Ramdist not loaded') cons = u_boot_console -- 2.20.1

5 4

[U-Boot] [PATCH] gpio: search for gpio label if gpio is not found through bank name
by Heiko Schocher 30 Jan '20

30 Jan '20

dm_gpio_lookup_name() searches for a gpio through the bank name. But we have also gpio labels, and it makes sense to search for a gpio also in the labels we have defined, if no gpio is found through the bank name definition. This is useful for example if you have a wp pin on different gpios on different board versions. If dm_gpio_lookup_name() searches also for the gpio labels, you can give the gpio an unique label name and search for this label, and do not need to differ between board revisions. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- Example on the aristainetos board: => gpio clear wp_spi_nor.gpio-hog gpio: pin wp_spi_nor.gpio-hog (gpio 47) value is 0 => before this patch, you need to know where your pin is: => gpio clear GPIO2_15 gpio: pin GPIO2_15 (gpio 47) value is 0 => travis build: https://travis-ci.org/hsdenx/u-boot-test/builds/604290746 drivers/gpio/gpio-uclass.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c index 90fbed455b..755744bc00 100644 --- a/drivers/gpio/gpio-uclass.c +++ b/drivers/gpio/gpio-uclass.c @@ -79,6 +79,26 @@ int dm_gpio_lookup_name(const char *name, struct gpio_desc *desc) if (!strncasecmp(name, uc_priv->bank_name, len)) { if (!strict_strtoul(name + len, 10, &offset)) break; + } else { + /* + * if we did not found a gpio through its bank + * name, we search for a valid gpio label. + */ + bool found = 0; + + len = strlen(name); + for (offset = 0; offset < uc_priv->gpio_count; + offset++) { + if (!uc_priv->name[offset]) + continue; + if (!strncmp(name, uc_priv->name[offset], + len)) { + found = 1; + break; + } + } + if (found) + break; } } -- 2.21.0

2 3

[U-Boot] [PATCH v2 0/9] miscellaneous ubispl and ubi improvements
by Markus Klotzbuecher 29 Jan '20

29 Jan '20

From: Markus Klotzbuecher <markus.klotzbuecher(a)kistler.com> This series contains a couple of UBI and UBI SPL improvements, notably a ubispl extension to allow loading volumes by name. The motivation is to use the UBI atomic volume rename functionality to allow double copy software updates of U-Boot on UBI. To do that we configured the SPL to always load the same volume name (e.g. "u-boot"), and the software updater always installs into the secondary volume "u-boot_r". After a successful upgrade, these two volume names are switched. This extension is protected by #ifdefs as it will somewhat slow down loading of volumes by id. This is because the code needs to disable the optimization of ignoring all volume ids which are not to-be-loaded, since these can only be resolved after attaching. We have tested both with and without fastmap enabled and both paths seems to work reliably. As per Heikos request, this v2 adds two patches that migrate the omap2plus and at91 CONFIG_ENV_* to defconfigs and likewise for the two boards using ubispl. The first migration was supported by an extension to the moveconfig script (patch 1) to expand simple expressions. Both migrations were tested to be binary equal before and after the change. Changes v2: - Add a patch (1) for moveconfig to expand simple expressions - Add patch (3) to move at91 and omap2plus CONFIG_ENV_ to defconfigs - Add patch (7) to migrate boards using ubispl to KConfig - Add missing commit messages - Indicate version of kernel code which was used in ubispl Hamish Guthrie (2): env: ubi: support configurable VID offset ubispl: add support for loading volumes by name Markus Klotzbuecher (7): moveconfig: expand simple expressions env: ubi: KConfig: add CONFIG_ENV_UBI_VOLUME_REDUND at91, omap2plus: configs: migrate CONFIG_ENV_ to defconfigs ubi: fix UBI_SILENCE_MSG ubispl: migrate configuration to Kconfig configs: migrate ubispl boards to KConfig ubispl: introduce separate CONFIG_UBI_SPL_SILENCE_MSG common/spl/Kconfig | 98 ++++++++ common/spl/spl_ubi.c | 7 + configs/am335x_guardian_defconfig | 2 + configs/am335x_igep003x_defconfig | 16 ++ configs/am335x_pdu001_defconfig | 1 + configs/am335x_shc_defconfig | 2 + configs/am335x_shc_ict_defconfig | 2 + configs/am335x_shc_netboot_defconfig | 2 + configs/am335x_shc_sdboot_defconfig | 2 + configs/am335x_sl50_defconfig | 1 + configs/am43xx_evm_defconfig | 1 + configs/am43xx_evm_qspiboot_defconfig | 3 + configs/am43xx_evm_rtconly_defconfig | 1 + configs/am43xx_evm_usbhost_boot_defconfig | 1 + configs/am43xx_hs_evm_defconfig | 1 + configs/at91rm9200ek_defconfig | 3 + configs/at91rm9200ek_ram_defconfig | 3 + configs/at91sam9260ek_dataflash_cs0_defconfig | 3 + configs/at91sam9260ek_dataflash_cs1_defconfig | 3 + configs/at91sam9261ek_dataflash_cs0_defconfig | 3 + configs/at91sam9261ek_dataflash_cs3_defconfig | 3 + configs/at91sam9263ek_dataflash_cs0_defconfig | 3 + configs/at91sam9263ek_dataflash_defconfig | 3 + configs/at91sam9263ek_norflash_boot_defconfig | 3 + configs/at91sam9263ek_norflash_defconfig | 3 + configs/at91sam9g10ek_dataflash_cs0_defconfig | 3 + configs/at91sam9g10ek_dataflash_cs3_defconfig | 3 + configs/at91sam9g20ek_2mmc_defconfig | 2 + configs/at91sam9g20ek_dataflash_cs0_defconfig | 3 + configs/at91sam9g20ek_dataflash_cs1_defconfig | 3 + configs/at91sam9m10g45ek_mmc_defconfig | 1 + configs/at91sam9n12ek_mmc_defconfig | 1 + configs/at91sam9n12ek_spiflash_defconfig | 3 + configs/at91sam9rlek_dataflash_defconfig | 3 + configs/at91sam9rlek_mmc_defconfig | 1 + configs/at91sam9x5ek_dataflash_defconfig | 3 + configs/at91sam9x5ek_mmc_defconfig | 1 + configs/at91sam9x5ek_spiflash_defconfig | 3 + configs/at91sam9xeek_dataflash_cs0_defconfig | 3 + configs/at91sam9xeek_dataflash_cs1_defconfig | 3 + configs/axm_defconfig | 1 + configs/brppt1_mmc_defconfig | 2 + configs/brppt1_nand_defconfig | 2 + configs/brppt1_spi_defconfig | 3 + configs/brxre1_defconfig | 2 + configs/chiliboard_defconfig | 2 + configs/cm_t335_defconfig | 2 + configs/cm_t35_defconfig | 1 + configs/cm_t43_defconfig | 3 + configs/cm_t54_defconfig | 2 + configs/corvus_defconfig | 1 + configs/draco_defconfig | 1 + configs/eco5pk_defconfig | 1 + configs/etamin_defconfig | 2 + configs/ethernut5_defconfig | 3 + .../gardena-smart-gateway-at91sam_defconfig | 4 + configs/gurnard_defconfig | 2 + configs/igep00x0_defconfig | 17 ++ configs/mcx_defconfig | 1 + configs/meesc_dataflash_defconfig | 3 + configs/meesc_defconfig | 1 + configs/mt_ventoux_defconfig | 1 + configs/omap3_overo_defconfig | 1 + configs/omap4_sdp4430_defconfig | 1 + configs/pengwyn_defconfig | 1 + configs/picosam9g45_defconfig | 1 + configs/pm9261_defconfig | 3 + configs/pm9263_defconfig | 3 + configs/pxm2_defconfig | 1 + configs/rastaban_defconfig | 1 + configs/rut_defconfig | 1 + configs/sama5d27_som1_ek_mmc1_defconfig | 1 + configs/sama5d27_som1_ek_mmc_defconfig | 1 + configs/sama5d2_icp_mmc_defconfig | 1 + configs/sama5d2_ptc_ek_mmc_defconfig | 1 + configs/sama5d2_xplained_emmc_defconfig | 1 + configs/sama5d2_xplained_mmc_defconfig | 1 + configs/sama5d2_xplained_spiflash_defconfig | 3 + configs/sama5d36ek_cmp_mmc_defconfig | 1 + configs/sama5d36ek_cmp_spiflash_defconfig | 3 + configs/sama5d3_xplained_mmc_defconfig | 1 + configs/sama5d3xek_mmc_defconfig | 1 + configs/sama5d3xek_spiflash_defconfig | 3 + configs/sama5d4_xplained_mmc_defconfig | 1 + configs/sama5d4_xplained_spiflash_defconfig | 3 + configs/sama5d4ek_mmc_defconfig | 1 + configs/sama5d4ek_spiflash_defconfig | 3 + configs/smartweb_defconfig | 1 + configs/snapper9260_defconfig | 2 + configs/snapper9g20_defconfig | 2 + configs/taurus_defconfig | 1 + configs/thuban_defconfig | 1 + configs/ti816x_evm_defconfig | 2 + configs/tricorder_defconfig | 2 + configs/tricorder_flash_defconfig | 1 + configs/twister_defconfig | 1 + configs/usb_a9263_dataflash_defconfig | 3 + configs/vinco_defconfig | 3 + configs/wb45n_defconfig | 1 + configs/wb50n_defconfig | 1 + drivers/mtd/ubi/Kconfig | 2 +- drivers/mtd/ubi/io.c | 2 + drivers/mtd/ubispl/ubispl.c | 215 +++++++++++++++++- drivers/mtd/ubispl/ubispl.h | 9 +- env/Kconfig | 24 +- env/ubi.c | 17 +- include/configs/am335x_evm.h | 3 - include/configs/am335x_igep003x.h | 23 -- include/configs/am335x_sl50.h | 3 - include/configs/am3517_crane.h | 2 - include/configs/am3517_evm.h | 2 - include/configs/am43xx_evm.h | 5 - include/configs/am57xx_evm.h | 2 - include/configs/at91-sama5_common.h | 5 - include/configs/at91rm9200ek.h | 2 +- include/configs/baltos.h | 3 - include/configs/bav335x.h | 3 - include/configs/brppt1.h | 5 - include/configs/chiliboard.h | 4 - include/configs/cm_t335.h | 2 - include/configs/cm_t35.h | 2 - include/configs/cm_t3517.h | 2 - include/configs/cm_t43.h | 5 - include/configs/corvus.h | 2 - include/configs/devkit8000.h | 6 - include/configs/dra7xx_evm.h | 2 - include/configs/ethernut5.h | 2 - .../configs/gardena-smart-gateway-at91sam.h | 6 - include/configs/kc1.h | 2 - include/configs/mcx.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/omap3_beagle.h | 4 - include/configs/omap3_cairo.h | 4 - include/configs/omap3_evm.h | 3 - include/configs/omap3_igep00x0.h | 20 -- include/configs/omap3_logic.h | 3 - include/configs/omap3_overo.h | 1 - include/configs/omap3_pandora.h | 3 - include/configs/omap3_zoom1.h | 3 - include/configs/omap5_uevm.h | 2 - include/configs/pcm051.h | 1 - include/configs/pepper.h | 2 - include/configs/siemens-am33x-common.h | 2 - include/configs/smartweb.h | 2 - include/configs/snapper9260.h | 2 - include/configs/snapper9g45.h | 2 - include/configs/sniper.h | 2 - include/configs/tam3517-common.h | 1 - include/configs/tao3530.h | 2 - include/configs/taurus.h | 2 - include/configs/ti814x_evm.h | 1 - include/configs/ti_omap4_common.h | 5 - include/configs/tricorder.h | 2 - include/configs/usb_a9263.h | 3 - include/configs/wb50n.h | 2 - include/ubispl.h | 6 + scripts/config_whitelist.txt | 13 -- tools/moveconfig.py | 41 ++++ 158 files changed, 628 insertions(+), 193 deletions(-) -- 2.20.1

4 23

[U-Boot] [PATCH] clk: correct spelling of bound
by Anatolij Gustschin 27 Jan '20

27 Jan '20

bound is the correct past tense of bind. Signed-off-by: Anatolij Gustschin <agust(a)denx.de> --- drivers/clk/clk-composite.c | 12 ++++++------ drivers/clk/clk-divider.c | 4 ++-- drivers/clk/clk-gate.c | 4 ++-- drivers/clk/clk-mux.c | 8 ++++---- drivers/clk/clk.c | 2 +- include/clk.h | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c index a5626c33d1..484b4a82ba 100644 --- a/drivers/clk/clk-composite.c +++ b/drivers/clk/clk-composite.c @@ -18,7 +18,7 @@ static u8 clk_composite_get_parent(struct clk *clk) { - struct clk_composite *composite = to_clk_composite(clk_dev_binded(clk) ? + struct clk_composite *composite = to_clk_composite(clk_dev_bound(clk) ? (struct clk *)dev_get_clk_ptr(clk->dev) : clk); struct clk *mux = composite->mux; @@ -27,7 +27,7 @@ static u8 clk_composite_get_parent(struct clk *clk) static int clk_composite_set_parent(struct clk *clk, struct clk *parent) { - struct clk_composite *composite = to_clk_composite(clk_dev_binded(clk) ? + struct clk_composite *composite = to_clk_composite(clk_dev_bound(clk) ? (struct clk *)dev_get_clk_ptr(clk->dev) : clk); const struct clk_ops *mux_ops = composite->mux_ops; struct clk *mux = composite->mux; @@ -37,7 +37,7 @@ static int clk_composite_set_parent(struct clk *clk, struct clk *parent) static unsigned long clk_composite_recalc_rate(struct clk *clk) { - struct clk_composite *composite = to_clk_composite(clk_dev_binded(clk) ? + struct clk_composite *composite = to_clk_composite(clk_dev_bound(clk) ? (struct clk *)dev_get_clk_ptr(clk->dev) : clk); const struct clk_ops *rate_ops = composite->rate_ops; struct clk *rate = composite->rate; @@ -47,7 +47,7 @@ static unsigned long clk_composite_recalc_rate(struct clk *clk) static ulong clk_composite_set_rate(struct clk *clk, unsigned long rate) { - struct clk_composite *composite = to_clk_composite(clk_dev_binded(clk) ? + struct clk_composite *composite = to_clk_composite(clk_dev_bound(clk) ? (struct clk *)dev_get_clk_ptr(clk->dev) : clk); const struct clk_ops *rate_ops = composite->rate_ops; struct clk *clk_rate = composite->rate; @@ -57,7 +57,7 @@ static ulong clk_composite_set_rate(struct clk *clk, unsigned long rate) static int clk_composite_enable(struct clk *clk) { - struct clk_composite *composite = to_clk_composite(clk_dev_binded(clk) ? + struct clk_composite *composite = to_clk_composite(clk_dev_bound(clk) ? (struct clk *)dev_get_clk_ptr(clk->dev) : clk); const struct clk_ops *gate_ops = composite->gate_ops; struct clk *gate = composite->gate; @@ -67,7 +67,7 @@ static int clk_composite_enable(struct clk *clk) static int clk_composite_disable(struct clk *clk) { - struct clk_composite *composite = to_clk_composite(clk_dev_binded(clk) ? + struct clk_composite *composite = to_clk_composite(clk_dev_bound(clk) ? (struct clk *)dev_get_clk_ptr(clk->dev) : clk); const struct clk_ops *gate_ops = composite->gate_ops; struct clk *gate = composite->gate; diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c index 822e09b084..d3c5db0be2 100644 --- a/drivers/clk/clk-divider.c +++ b/drivers/clk/clk-divider.c @@ -70,7 +70,7 @@ unsigned long divider_recalc_rate(struct clk *hw, unsigned long parent_rate, static ulong clk_divider_recalc_rate(struct clk *clk) { - struct clk_divider *divider = to_clk_divider(clk_dev_binded(clk) ? + struct clk_divider *divider = to_clk_divider(clk_dev_bound(clk) ? dev_get_clk_ptr(clk->dev) : clk); unsigned long parent_rate = clk_get_parent_rate(clk); unsigned int val; @@ -150,7 +150,7 @@ int divider_get_val(unsigned long rate, unsigned long parent_rate, static ulong clk_divider_set_rate(struct clk *clk, unsigned long rate) { - struct clk_divider *divider = to_clk_divider(clk_dev_binded(clk) ? + struct clk_divider *divider = to_clk_divider(clk_dev_bound(clk) ? dev_get_clk_ptr(clk->dev) : clk); unsigned long parent_rate = clk_get_parent_rate(clk); int value; diff --git a/drivers/clk/clk-gate.c b/drivers/clk/clk-gate.c index 70b8794554..905b98a448 100644 --- a/drivers/clk/clk-gate.c +++ b/drivers/clk/clk-gate.c @@ -43,7 +43,7 @@ */ static void clk_gate_endisable(struct clk *clk, int enable) { - struct clk_gate *gate = to_clk_gate(clk_dev_binded(clk) ? + struct clk_gate *gate = to_clk_gate(clk_dev_bound(clk) ? dev_get_clk_ptr(clk->dev) : clk); int set = gate->flags & CLK_GATE_SET_TO_DISABLE ? 1 : 0; u32 reg; @@ -86,7 +86,7 @@ static int clk_gate_disable(struct clk *clk) int clk_gate_is_enabled(struct clk *clk) { - struct clk_gate *gate = to_clk_gate(clk_dev_binded(clk) ? + struct clk_gate *gate = to_clk_gate(clk_dev_bound(clk) ? dev_get_clk_ptr(clk->dev) : clk); u32 reg; diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c index 5acc0b8cbd..f7d07dc1dc 100644 --- a/drivers/clk/clk-mux.c +++ b/drivers/clk/clk-mux.c @@ -35,7 +35,7 @@ int clk_mux_val_to_index(struct clk *clk, u32 *table, unsigned int flags, unsigned int val) { - struct clk_mux *mux = to_clk_mux(clk_dev_binded(clk) ? + struct clk_mux *mux = to_clk_mux(clk_dev_bound(clk) ? dev_get_clk_ptr(clk->dev) : clk); int num_parents = mux->num_parents; @@ -79,7 +79,7 @@ unsigned int clk_mux_index_to_val(u32 *table, unsigned int flags, u8 index) u8 clk_mux_get_parent(struct clk *clk) { - struct clk_mux *mux = to_clk_mux(clk_dev_binded(clk) ? + struct clk_mux *mux = to_clk_mux(clk_dev_bound(clk) ? dev_get_clk_ptr(clk->dev) : clk); u32 val; @@ -97,7 +97,7 @@ u8 clk_mux_get_parent(struct clk *clk) static int clk_fetch_parent_index(struct clk *clk, struct clk *parent) { - struct clk_mux *mux = to_clk_mux(clk_dev_binded(clk) ? + struct clk_mux *mux = to_clk_mux(clk_dev_bound(clk) ? dev_get_clk_ptr(clk->dev) : clk); int i; @@ -115,7 +115,7 @@ static int clk_fetch_parent_index(struct clk *clk, static int clk_mux_set_parent(struct clk *clk, struct clk *parent) { - struct clk_mux *mux = to_clk_mux(clk_dev_binded(clk) ? + struct clk_mux *mux = to_clk_mux(clk_dev_bound(clk) ? dev_get_clk_ptr(clk->dev) : clk); int index; u32 val; diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 39b3087067..63141e02f9 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -56,7 +56,7 @@ const char *clk_hw_get_name(const struct clk *hw) return hw->dev->name; } -bool clk_dev_binded(struct clk *clk) +bool clk_dev_bound(struct clk *clk) { if (clk->dev && (clk->dev->flags & DM_FLAG_BOUND)) return true; diff --git a/include/clk.h b/include/clk.h index 2ebc905e04..64e4bcd048 100644 --- a/include/clk.h +++ b/include/clk.h @@ -358,11 +358,11 @@ static inline bool clk_valid(struct clk *clk) int clk_get_by_id(ulong id, struct clk **clkp); /** - * clk_dev_binded() - Check whether the clk has a device binded + * clk_dev_bound() - Check whether the clk has a device bound * * @clk A pointer to the clk * - * @return true on binded, or false on no + * @return true when bound, or false otherwise */ -bool clk_dev_binded(struct clk *clk); +bool clk_dev_bound(struct clk *clk); #endif -- 2.17.1

3 4

[U-Boot] [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT
by Marek Vasut 27 Jan '20

27 Jan '20

Update Kosagi Novena to DM / DT and remove the warnings. This depends on the following patches / series: https://patchwork.ozlabs.org/patch/1095618/ https://patchwork.ozlabs.org/patch/1101171/ https://patchwork.ozlabs.org/project/uboot/list/?series=108463 Marek Vasut (7): ARM: dts: imx: novena: Import Novena DT from Linux ARM: imx: novena: Enable DM pin control ARM: imx: novena: Enable DM GPIO ARM: imx: novena: Convert block devices to DM ARM: imx: novena: Enable DM USB ARM: imx: novena: Enable DM PCI ARM: imx: novena: Convert to DM VIDEO arch/arm/dts/Makefile | 3 +- arch/arm/dts/imx6q-novena.dts | 797 ++++++++++++++++++++++++++++++++++ board/kosagi/novena/novena.c | 77 +--- board/kosagi/novena/video.c | 3 + configs/novena_defconfig | 18 +- include/configs/novena.h | 9 +- 6 files changed, 838 insertions(+), 69 deletions(-) create mode 100644 arch/arm/dts/imx6q-novena.dts Cc: Fabio Estevam <fabio.estevam(a)nxp.com> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Vagrant Cascadian <vagrant(a)debian.org> -- 2.20.1

4 25

[U-Boot] [PATCH] cmd: mtd: solve bad block support in erase command
by Patrick Delaunay 25 Jan '20

25 Jan '20

This patch modify the loop in mtd erase command to erase one by one the blocks in the requested area. It solves issue on "mtd erase" command on nand with existing bad block, the command is interrupted on the first bad block with the trace: "Skipping bad block at 0xffffffffffffffff" In MTD driver (nand/raw), when a bad block is present on the MTD device, the erase_op.fail_addr is not updated and we have the initial value MTD_FAIL_ADDR_UNKNOWN = (ULL)-1. This case seems normal in nand_base.c:nand_erase_nand(), we have the 2 exit cases during the loop: 1/ we have a bad block (nand_block_checkbad) instr->state = MTD_ERASE_FAILED loop interrupted (goto erase_exit) 2/ if block erase failed (status & NAND_STATUS_FAIL) instr->state = MTD_ERASE_FAILED; instr->fail_addr = ((loff_t)page << chip->page_shift); loop interrupted (goto erase_exit) So erase_op.fail_addr can't be used if bad blocks were present in the erased area; we need to use mtd_erase only one block to detect and skip these existing bad blocks (as it is done in nand_util.c). Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- Hi, Found a correct in the mtd erase command. I detect the issue and test the patch on STM32MP157C-EV1 board, with nor and nand. We have the block table at the end of the nand so the 4 last blocks are marked bad. And I try to erase all the nand with the command "mtd erase". Before the patch: The "nand erase" command behavior is OK: STM32MP> nand erase 0x0 0x000040000000 NAND erase: device 0 whole chip Skipping bad block at 0x3ff00000 Skipping bad block at 0x3ff40000 Skipping bad block at 0x3ff80000 Skipping bad block at 0x3ffc0000 But the "mtd erase" command is not correct: STM32MP> mtd list SF: Detected mx66l51235l with page size 256 Bytes, erase size 64 KiB, total 64 MiB List of MTD devices: * nand0 - type: NAND flash - block size: 0x40000 bytes - min I/O: 0x1000 bytes - OOB size: 224 bytes - OOB available: 118 bytes - ECC strength: 8 bits - ECC step size: 512 bytes - bitflip threshold: 6 bits - 0x000000000000-0x000040000000 : "nand0" - 0x000000000000-0x000000200000 : "fsbl" - 0x000000200000-0x000000400000 : "ssbl1" - 0x000000400000-0x000000600000 : "ssbl2" - 0x000000600000-0x000040000000 : "UBI" * nor0 - type: NOR flash - block size: 0x10000 bytes - min I/O: 0x1 bytes - 0x000000000000-0x000004000000 : "nor0" - 0x000000000000-0x000000040000 : "fsbl1" - 0x000000040000-0x000000080000 : "fsbl2" - 0x000000080000-0x000000280000 : "ssbl" - 0x000000280000-0x000000300000 : "u-boot-env" - 0x000000300000-0x000004000000 : "nor_user" STM32MP> mtd erase nand0 0x0 0x000040000000 Erasing 0x00000000 ... 0x3fffffff (4096 eraseblock(s)) Skipping bad block at 0xffffffffffffffff OK The 4 bad blocks are not correctly skipped, the command is stopped on the first error. After the patch, the "mtd erase" command skips the 4 bad block exactly as the "nand erase" command: STM32MP> mtd erase nand0 0x000000000000 0x000040000000 SF: Detected mx66l51235l with page size 256 Bytes, erase size 64 KiB, total 64 MiB Erasing 0x00000000 ... 0x3fffffff (4096 eraseblock(s)) Skipping bad block at 0x3ff00000 Skipping bad block at 0x3ff40000 Skipping bad block at 0x3ff80000 Skipping bad block at 0x3ffc0000 Regards Patrick cmd/mtd.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/cmd/mtd.c b/cmd/mtd.c index 1b6b8dda2b..a559b5a4a3 100644 --- a/cmd/mtd.c +++ b/cmd/mtd.c @@ -387,7 +387,7 @@ static int do_mtd_erase(cmd_tbl_t *cmdtp, int flag, int argc, struct mtd_info *mtd; u64 off, len; bool scrub; - int ret; + int ret = 0; if (argc < 2) return CMD_RET_USAGE; @@ -423,22 +423,22 @@ static int do_mtd_erase(cmd_tbl_t *cmdtp, int flag, int argc, erase_op.mtd = mtd; erase_op.addr = off; - erase_op.len = len; + erase_op.len = mtd->erasesize; erase_op.scrub = scrub; - while (erase_op.len) { + while (len) { ret = mtd_erase(mtd, &erase_op); - /* Abort if its not a bad block error */ - if (ret != -EIO) - break; - - printf("Skipping bad block at 0x%08llx\n", erase_op.fail_addr); + if (ret) { + /* Abort if its not a bad block error */ + if (ret != -EIO) + break; + printf("Skipping bad block at 0x%08llx\n", + erase_op.addr); + } - /* Skip bad block and continue behind it */ - erase_op.len -= erase_op.fail_addr - erase_op.addr; - erase_op.len -= mtd->erasesize; - erase_op.addr = erase_op.fail_addr + mtd->erasesize; + len -= mtd->erasesize; + erase_op.addr += mtd->erasesize; } if (ret && ret != -EIO) -- 2.17.1

5 7