March 2019 - U-Boot

[U-Boot] [PATCH 1/2] fastboot: getvar_partition_{type, size}: Sanitize arguments
by Eugeniu Rosca 28 Mar '19

28 Mar '19

Correct usage of "fastboot getvar_partition_{type,size}" is: host $> fastboot getvar partition-size:misc partition-size:misc: 0x0000000000000400 Finished. Total time: 0.214s When the partition name is omitted, current behavior is: host $> fastboot getvar partition-size getvar:partition-size FAILED (remote: partition not found) finished. total time: 0.005s host $> fastboot getvar partition-size: getvar:partition-size: FAILED (remote: partition not found) finished. total time: 0.006s host $> fastboot getvar partition-type getvar:partition-type FAILED (remote: partition not found) finished. total time: 0.005s host $> fastboot getvar partition-type: getvar:partition-type: FAILED (remote: partition not found) finished. total time: 0.006s Tell the user the real cause of command failure: host $> fastboot getvar partition-size getvar:partition-size FAILED (remote: missing partition name) Finished. Total time: 0.003s host $> fastboot getvar partition-size: getvar:partition-size: FAILED (remote: missing partition name) Finished. Total time: 0.003s host $> fastboot getvar partition-type getvar:partition-type FAILED (remote: missing partition name) Finished. Total time: 0.003s host $> fastboot getvar partition-type: getvar:partition-type: FAILED (remote: missing partition name) Finished. Total time: 0.003s Fixes: f73a7df984a9 ("net: fastboot: Merge AOSP UDP fastboot") Signed-off-by: Eugeniu Rosca <erosca(a)de.adit-jv.com> --- drivers/fastboot/fb_getvar.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c index 4d264c985d7e..28e3e2fa1619 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -144,6 +144,11 @@ static void getvar_partition_type(char *part_name, char *response) struct blk_desc *dev_desc; disk_partition_t part_info; + if (!part_name || !strcmp(part_name, "")) { + fastboot_fail("missing partition name", response); + return; + } + r = fastboot_mmc_get_part_info(part_name, &dev_desc, &part_info, response); if (r >= 0) { @@ -162,6 +167,11 @@ static void getvar_partition_size(char *part_name, char *response) int r; size_t size; + if (!part_name || !strcmp(part_name, "")) { + fastboot_fail("missing partition name", response); + return; + } + #if CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC) struct blk_desc *dev_desc; disk_partition_t part_info; -- 2.21.0

1 4

[U-Boot] board/raspberrypi/rpi/MAINTAINERS
by Heinrich Schuchardt 28 Mar '19

28 Mar '19

Hello Matthias, in board/raspberrypi/rpi/MAINTAINERS there is still Alex's old email address. Are you also picking up maintainership for those files? Guillaume was asking yesterday on the IRC channel. Cf. https://lists.denx.de/pipermail/u-boot/2019-February/358939.html Best regards Heinrich

3 2

[U-Boot] [V6 PATCH 3/3] sunxi: Use clrsetbits_le32 instead of multiple instruction
by Shyam Saini 28 Mar '19

28 Mar '19

From: Michael Trimarchi <michael(a)amarulasolutions.com> This will improve code readabilty Signed-off-by: Michael Trimarchi <michael(a)amarulasolutions.com> Signed-off-by: Shyam Saini <shyam.saini(a)amarulasolutions.com> --- Changelogs: V1->V2: none V2->V3: Fix use of clrsetbits_le32 and setbits_le32 functions V3->V4: Rebase to original series's patch 2 and 3 V4->V5: Use correct clear bit function V5->V6: Use one single function same as clrsetbits_le32 and make everything logically correct --- arch/arm/mach-sunxi/dram_sun8i_a33.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-sunxi/dram_sun8i_a33.c b/arch/arm/mach-sunxi/dram_sun8i_a33.c index 63e18f17d0..36c46096a5 100644 --- a/arch/arm/mach-sunxi/dram_sun8i_a33.c +++ b/arch/arm/mach-sunxi/dram_sun8i_a33.c @@ -145,12 +145,8 @@ static void auto_set_timing_para(struct dram_para *para) reg_val = (tcksrx << 24) | (tcksre << 16) | (tckesr << 8) | (tcke << 0); writel(reg_val, &mctl_ctl->dramtmg5); /* Set two rank timing and exit self-refresh timing */ - reg_val = readl(&mctl_ctl->dramtmg8); - reg_val &= ~(0xff << 8); - reg_val &= ~(0xff << 0); - reg_val |= (0x33 << 8); - reg_val |= (0x10 << 0); - writel(reg_val, &mctl_ctl->dramtmg8); + clrsetbits_le32(&mctl_ctl->dramtmg8, (0xff << 8) | (0xff << 0), + (0x33 << 8) | (0x10 << 0)); /* Set phy interface time */ reg_val = (0x2 << 24) | (t_rdata_en << 16) | (0x1 << 8) | (wr_latency << 0); -- 2.11.0

3 2

[U-Boot] [PATCH 00/10] rockchip: enable board_debug_uart_init for all soc
by Kever Yang 28 Mar '19

28 Mar '19

ALl rockchip soc use DEBUG UART, and need init the uart iomux in board_debug_uart_init(). Move the board_debug_uart_init() into soc file so that we can make all soc config in soc file and share a common board file later for all rockchip SoCs. Kever Yang (10): rockchip: enable DEBUG_UART_BOARD_INIT by default rockchip; kylin-rk3036: enabl DEBUG UART rockchip: rk3036: add board_debug_uart_init() rockchip: rk3188: add board_debug_uart_init() rockchip: rk322x: move board_debug_uart_init() to rk322x.c rockchip: rk3288: use grf structure to access soc_con2 rockchip: rk3288: add board_debug_uart_init() rockchip: rk3368: move board_debug_uart_init() to rk3368.c rockchip: rk3399: use grf structure to access reg rockchip: rk3399: add board_debug_uart_init() arch/arm/Kconfig | 2 ++ arch/arm/mach-rockchip/Kconfig | 3 --- arch/arm/mach-rockchip/rk3036-board-spl.c | 19 +------------ arch/arm/mach-rockchip/rk3036/Makefile | 1 + arch/arm/mach-rockchip/rk3036/rk3036.c | 40 +++++++++++++++++++++++++++ arch/arm/mach-rockchip/rk3188-board-spl.c | 12 +-------- arch/arm/mach-rockchip/rk3188/Makefile | 1 + arch/arm/mach-rockchip/rk3188/rk3188.c | 37 +++++++++++++++++++++++++ arch/arm/mach-rockchip/rk322x-board-spl.c | 43 ++--------------------------- arch/arm/mach-rockchip/rk322x-board.c | 31 +-------------------- arch/arm/mach-rockchip/rk322x/Makefile | 2 +- arch/arm/mach-rockchip/rk322x/rk322x.c | 45 +++++++++++++++++++++++++++++++ arch/arm/mach-rockchip/rk3288-board-spl.c | 11 ++------ arch/arm/mach-rockchip/rk3288-board-tpl.c | 13 ++------- arch/arm/mach-rockchip/rk3288/rk3288.c | 19 +++++++++++-- arch/arm/mach-rockchip/rk3368-board-spl.c | 5 ---- arch/arm/mach-rockchip/rk3368-board-tpl.c | 33 +---------------------- arch/arm/mach-rockchip/rk3368/rk3368.c | 31 +++++++++++++++++++++ arch/arm/mach-rockchip/rk3399-board-spl.c | 31 +-------------------- arch/arm/mach-rockchip/rk3399/rk3399.c | 34 ++++++++++++++++++++++- configs/kylin-rk3036_defconfig | 4 +++ 21 files changed, 223 insertions(+), 194 deletions(-) create mode 100644 arch/arm/mach-rockchip/rk3036/rk3036.c create mode 100644 arch/arm/mach-rockchip/rk3188/rk3188.c create mode 100644 arch/arm/mach-rockchip/rk322x/rk322x.c -- 1.9.1

3 35

[U-Boot] [PATCH 34/34] drivers/net/fec: phy_init: remove redundant logic
by sbabic＠denx.de 28 Mar '19

28 Mar '19

> The phy_connect_dev(...) function from phy.c does all the handling > (inclusive catching fixed-link). > So we drop here the single steps and call just phy_connect_dev(...). > Signed-off-by: Hannes Schmelzer <hannes.schmelzer(a)br-automation.com> > Acked-by: Joe Hershberger <joe.hershberger(a)ni.com> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

5 7

[U-Boot] [PATCH] fastboot: getvar: fix broken 'fastboot flash' when partition has slots
by Eugeniu Rosca 28 Mar '19

28 Mar '19

With eMMC partitioning [1], 'fastboot getvar has-slot:<part-name>' returns 'yes' only for 'system' and 'boot', while it is clear that [1] has more partitions featuring slots (i.e. dtb, dtbo, vbmeta and vendor). One not so obvious consequence is that 'fastboot flash {dtb,dtbo,vbmeta,vendor} img' will fail [2], while 'fastboot flash {boot,system} img' will succeed [3]. This is because 'fastboot flash' relies on the outcome of 'fastboot has-slot:<part-name>' behind the scene. Assuming that the list of partitions featuring slots is vendor- specific, U-Boot fastboot driver is not the best place for such list. To avoid creating __weak functions overridden by board code, one simple solution seems to be taking the user-provided partition as base, append the "_a" suffix and checking if the result is a valid partition name. This approach assumes that the 'has-slot:' API is specifically designed to work with partition names chopped of their slot suffixes. Reviewing the usage of 'has-slot' in upstream fastboot [4], this assumption seems to be fortified, but to be 100% sure we need an Ack from a fastboot expert. [1] R-Car-H3 eMMC partitioning used for testing: (bootloader) Created new GPT partition table: (bootloader) /misc (512 KiB, raw) (bootloader) /pst (512 KiB, raw) (bootloader) /vbmeta_a (512 KiB, raw) (bootloader) /vbmeta_b (512 KiB, raw) (bootloader) /dtb_a (1024 KiB, raw) (bootloader) /dtb_b (1024 KiB, raw) (bootloader) /dtbo_a (512 KiB, raw) (bootloader) /dtbo_b (512 KiB, raw) (bootloader) /boot_a (16384 KiB, raw) (bootloader) /boot_b (16384 KiB, raw) (bootloader) /metadata (16384 KiB, raw) (bootloader) /system_a (2301952 KiB, ext4) (bootloader) /system_b (2301952 KiB, ext4) (bootloader) /vendor_a (262144 KiB, ext4) (bootloader) /vendor_b (262144 KiB, ext4) (bootloader) /userdata (2451951 KiB, ext4) [2] fastboot flash vbmeta vbmeta.img target reported max download size of 16777216 bytes Sending 'vbmeta' (4 KB)... OKAY [ 0.025s] Writing 'vbmeta'... FAILED (remote: cannot find partition) Finished. Total time: 0.332s [3] fastboot flash boot boot.img target reported max download size of 16777216 bytes Sending 'boot_a' (16384 KB)... OKAY [ 1.586s] Writing 'boot_a'... OKAY [ 0.379s] Finished. Total time: 2.054s [4] core (f959fffc1c8c) git grep -l has-slot fastboot/constants.h fastboot/fastboot.cpp fastboot/fuzzy_fastboot/main.cpp fs_mgr/tests/adb-remount-test.sh Fixes: f73a7df984a9 ("net: fastboot: Merge AOSP UDP fastboot") Signed-off-by: Eugeniu Rosca <erosca(a)de.adit-jv.com> --- drivers/fastboot/fb_getvar.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c index 4d264c985d7e..03bcd7162b37 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -130,8 +130,17 @@ static void getvar_slot_suffixes(char *var_parameter, char *response) static void getvar_has_slot(char *part_name, char *response) { - if (part_name && (!strcmp(part_name, "boot") || - !strcmp(part_name, "system"))) + struct blk_desc *dev_desc; + disk_partition_t info; + char name[32]; + + if (!part_name || !strcmp(part_name, "")) + return; + + strlcpy(name, part_name, sizeof(name) - 2); + strcat(name, "_a"); + + if (fastboot_mmc_get_part_info(name, &dev_desc, &info, response) >= 0) fastboot_okay("yes", response); else fastboot_okay("no", response); -- 2.21.0

2 5

[U-Boot] raspberrypi0w issue when change cmdline.txt -> FDT_ERR_BADMAGIC
by Belisko Marek 28 Mar '19

28 Mar '19

Hi, I'm having strange issue that when update cmdline.txt in boot partition (basically after first boot there is resize of data partition) then I get this: U-Boot 2018.07-g981cc831e3 (Mar 26 2019 - 11:14:55 +0100) DRAM: 448 MiB RPI Zero W (0x9000c1) MMC: sdhci@7e300000: 0 Loading Environment from FAT... *** Warning - bad CRC, using default environment Failed (-5) Loading Environment from MMC... OK In: serial Out: serial Err: serial Net: No ethernet found. Hit any key to stop autoboot: 0 switch to partitions #0, OK mmc0 is current device Scanning mmc 0:1... Found U-Boot script /boot.scr 300 bytes read in 6 ms (48.8 KiB/s) ## Executing script at 02400000 libfdt fdt_check_header(): FDT_ERR_BADMAGIC switch to partitions #0, OK mmc0 is current device 4688856 bytes read in 307 ms (14.6 MiB/s) Kernel image @ 0x080000 [ 0x000000 - 0x478bd8 ] ERROR: Did not find a cmdline Flattened Device Tree Could not find a valid device tree SCRIPT FAILED: continuing... starting USB... USB0: scanning bus 0 for devices... 1 USB Device(s) found scanning usb for storage devices... 0 Storage Device(s) found when checking fdt_addr there was no dtb loaded at all (juts 0xaa on that address). When remove resize from cmdline.txt before booting then board boots fine. Any ideas if broadcom FW can change something in that regard and break things? Thanks for any pointers. BR, marek -- as simple and primitive as possible ------------------------------------------------- Marek Belisko - OPEN-NANDRA Freelance Developer Ruska Nova Ves 219 | Presov, 08005 Slovak Republic Tel: +421 915 052 184 skype: marekwhite twitter: #opennandra web: http://open-nandra.com

1 0

[U-Boot] [PATCH 1/1] efi_loader: update TODOs in doc/README.uefi
by Heinrich Schuchardt 28 Mar '19

28 Mar '19

The following TODOs are closed: - GetNextVariableName is not implemented - event groups - manage events in a linked list Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- doc/README.uefi | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/doc/README.uefi b/doc/README.uefi index cda29cdcf7..b38efbc0cc 100644 --- a/doc/README.uefi +++ b/doc/README.uefi @@ -299,7 +299,7 @@ This driver is only available if U-Boot is configured with CONFIG_BLK=y CONFIG_PARTITIONS=y -## TODOs as of U-Boot 2018.07 +## TODOs as of U-Boot 2019.04 * unimplemented or incompletely implemented boot services * Exit - call unload function, unload applications only @@ -308,16 +308,13 @@ This driver is only available if U-Boot is configured with * unimplemented or incompletely implemented runtime services * SetVariable() ignores attribute EFI_VARIABLE_APPEND_WRITE - * GetNextVariableName is not implemented * QueryVariableInfo is not implemented * unimplemented events * EVT_RUNTIME * EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE - * event groups * data model - * manage events in a linked list * manage configuration tables in a linked list * UEFI drivers -- 2.20.1

2 3

[U-Boot] [ANN] U-Boot v2019.04-rc3 released
by Tom Rini 28 Mar '19

28 Mar '19

Hey all, So it's release day and I've put up v2019.04-rc3, I've updated git and the tarballs are also up now. Thanks again to having signed tags, between -rc2 and -rc3 we have a good changelog under 'git log --merges v2019.04-rc2..v2019.04-rc3' We're looking at release on April 8th, 2019. Thanks all! -- Tom

4 8

[U-Boot] [PATCH] ARM: at91: sama5d2: Wrap cpu detection to fix macb driver
by Alexander Dahl 28 Mar '19

28 Mar '19

When introducing the SAMA5D27 SoCs, the SAMA5D2 series got an additional chip id. The check if the cpu is sama5d2 was changed from a preprocessor definition (inlining a call to 'get_chip_id()') to a C function, probably to not call get_chip_id twice? That however broke a check in the macb ethernet driver. That driver is more generic and also used for other platforms. I suppose this solution was implemented to use it in 'gem_is_gigabit_capable()', without having to stricly depend on the at91 platform: #ifndef cpu_is_sama5d2 #define cpu_is_sama5d2() 0 #endif That only works as long as cpu_is_sama5d2 is a preprocessor definition. (The same is still true for sama5d4 by the way.) So this is a straight forward fix for the workaround. The not working check on the SAMA5D2 CPU lead to an issue on a custom board with a LAN8720A ethernet phy connected to the SoC: => dhcp ethernet@f8008000: PHY present at 1 ethernet@f8008000: Starting autonegotiation... ethernet@f8008000: Autonegotiation complete ethernet@f8008000: link up, 1000Mbps full-duplex (lpa: 0xffff) BOOTP broadcast 1 BOOTP broadcast 2 BOOTP broadcast 3 BOOTP broadcast 4 BOOTP broadcast 5 BOOTP broadcast 6 BOOTP broadcast 7 BOOTP broadcast 8 BOOTP broadcast 9 BOOTP broadcast 10 BOOTP broadcast 11 BOOTP broadcast 12 BOOTP broadcast 13 BOOTP broadcast 14 BOOTP broadcast 15 BOOTP broadcast 16 BOOTP broadcast 17 Retry time exceeded; starting again Notice the wrong reported link speed, although both SoC and phy only support 100 MBit/s! The real issue on reliably detecting the features of that cadence ethernet mac IP block, is probably more complicated, though. Fixes: 245cbc583db7c1ca52aa32428b8e86f3449d4af2 Signed-off-by: Alexander Dahl <ada(a)thorsis.com> --- arch/arm/mach-at91/armv7/sama5d2_devices.c | 2 +- arch/arm/mach-at91/include/mach/sama5d2.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-at91/armv7/sama5d2_devices.c b/arch/arm/mach-at91/armv7/sama5d2_devices.c index 6432f66c82..59a0c44913 100644 --- a/arch/arm/mach-at91/armv7/sama5d2_devices.c +++ b/arch/arm/mach-at91/armv7/sama5d2_devices.c @@ -9,7 +9,7 @@ #include <asm/arch/clk.h> #include <asm/arch/sama5d2.h> -int cpu_is_sama5d2(void) +int _cpu_is_sama5d2(void) { unsigned int chip_id = get_chip_id(); diff --git a/arch/arm/mach-at91/include/mach/sama5d2.h b/arch/arm/mach-at91/include/mach/sama5d2.h index 37806cbf34..c7d9bb5ad3 100644 --- a/arch/arm/mach-at91/include/mach/sama5d2.h +++ b/arch/arm/mach-at91/include/mach/sama5d2.h @@ -222,6 +222,9 @@ #define ARCH_EXID_SAMA5D27C_D1G 0x00000033 #define ARCH_EXID_SAMA5D28C_D1G 0x00000013 +/* Checked if defined in ethernet driver macb */ +#define cpu_is_sama5d2 _cpu_is_sama5d2 + /* PIT Timer(PIT_PIIR) */ #define CONFIG_SYS_TIMER_COUNTER 0xf804803c @@ -231,7 +234,7 @@ #ifndef __ASSEMBLY__ unsigned int get_chip_id(void); unsigned int get_extension_chip_id(void); -int cpu_is_sama5d2(void); +int _cpu_is_sama5d2(void); unsigned int has_lcdc(void); char *get_cpu_name(void); #endif -- 2.11.0

4 6