July 2019 - U-Boot

[U-Boot] Getting address and size of loadable images through DT
by Rossier Daniel 05 Jul '19

05 Jul '19

Dear all, I would like to use a FIT its description with two images (one hypervisor, one Linux kernel). I'm starting the hypervisor with bootm <itb_addr> and I would like to retrieve the start address and size of the Linux kernel image in my hypervisor. Ideally, I would like to get that through a dynamically created entry in the device tree passed to the hypervisor (the DT being contained in the its file as well). I discovered the fdt_record_loadable() function which could do the job, but this function does not seem not be called systematically when such loadables are present (and a device tree). Any suggestion to achieve this? Do I need to patch U-boot some way? Many thanks for your support. Kind regards Daniel

1 0

[U-Boot] [PATCH v2 1/9] usb: r8a66597: return -ENOTSUPP from unimplemented submit_int_msg
by Michal Suchanek 05 Jul '19

05 Jul '19

Signed-off-by: Michal Suchanek <msuchanek(a)suse.de> --- drivers/usb/host/r8a66597-hcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c index 3c263e51c160..7b699d3f4788 100644 --- a/drivers/usb/host/r8a66597-hcd.c +++ b/drivers/usb/host/r8a66597-hcd.c @@ -826,7 +826,7 @@ int submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer, { /* no implement */ R8A66597_DPRINT("%s\n", __func__); - return 0; + return -ENOTSUPP; } int usb_lowlevel_init(int index, enum usb_init_type init, void **controller) -- 2.21.0

4 21

[U-Boot] [GIT PULL] Pull request: u-boot-imx u -boot-imx-20190704
by Stefano Babic 05 Jul '19

05 Jul '19

Hi Tom, this is just a series from Fabio to fix Wandboard. Travis: https://travis-ci.org/sbabic/u-boot-imx/builds/551742900 The following changes since commit ca4491f2d2af93d8b77c48c5d272d88094fc06eb: Merge tag 'rockchip-for-v2019.07-rc5-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip (2019-07-02 08:18:19 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git tags/u-boot-imx-20190704 for you to fetch changes up to 4d981f5f27ab30af5e248245696b6a051c872ec4: wandboard: README: Adjust the U-Boot proper binary name (2019-07-04 14:19:49 +0200) ---------------------------------------------------------------- Fixes for 2019.07 ----------------- - Wandboard ---------------------------------------------------------------- Fabio Estevam (7): mx6: dts: Keep dtb entries sorted mx6: dts: Move dtbs under SoC level wandboard: Sync with devicetree files from kernel 5.1.9 wandboard: Import extra wandboard devicetree files wandboard: Add mmc0 alias wandboard: Add FIT image support wandboard: README: Adjust the U-Boot proper binary name arch/arm/dts/Makefile | 16 +++++++--------- arch/arm/dts/imx6dl-wandboard-revb1.dts | 1 + arch/arm/dts/imx6q-wandboard-revb1.dts | 23 +++++++++++++++++++++++ arch/arm/dts/imx6qdl-wandboard-revb1.dtsi | 15 +++++---------- arch/arm/dts/imx6qdl-wandboard-revd1.dtsi | 195 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl-wandboard.dtsi | 111 +++++++++------------------------------------------------------------------------------------------------------ arch/arm/dts/imx6qp-wandboard-revd1.dts | 23 +++++++++++++++++++++++ board/wandboard/README | 2 +- board/wandboard/wandboard.c | 18 ++++++++++++++++++ configs/wandboard_defconfig | 7 +++++++ 10 files changed, 289 insertions(+), 122 deletions(-) create mode 100644 arch/arm/dts/imx6q-wandboard-revb1.dts create mode 100644 arch/arm/dts/imx6qdl-wandboard-revd1.dtsi create mode 100644 arch/arm/dts/imx6qp-wandboard-revd1.dts Regards, Stefano -- ===================================================================== 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 =====================================================================

2 1

[U-Boot] [RFC] env: ti: Handle reboot reason from BCB
by Sam Protsenko 04 Jul '19

04 Jul '19

*** PLEASE DO NOT MERGE. *** This is only RFC, a discussion thread. Patch is only for the *** reference here right now, to create a discussion context. There are 2 possible reboot use-cases: 1. User did "fastboot reboot bootloader" (we're setting "dofastboot" variable as an indicator in this case) 2. User did "adb reboot bootloader" or "reboot bootloader" from Linux shell (Android sets "bootonce-bootloader" string into command field of BCB area inside of 'misc' partition as an indicator in this case) We already had (1) handling implemented. This patch adds implementation of (2). Possible drawbacks are: - user is able to re-define 'preboot' variable and break this mechanism this way - performance penalty due to scripting usage in 'preboot' DISCUSSION ITEM 1: possible solution to those can be checking BCB area (and 'dofastboot' variable) in C code, somewhere in board file, like in late_init() function, and on;y set 'preboot' variable from there, if conditions are met, to something like this: preboot=fastboot 1; setenv preboot; so that next time 'preboot' variable will be empty. But this way also has its shortcomings, like the necessity of board file modification, need of BCB C API exposure, etc. DISCUSSION ITEM 2: this patch only implements reboot reason handling for TI platforms. I presume there could be another parties interested in this feature. Should we somehow provide some generic way for handling that (at least mechanism for checking), or is it a bad idea, and everyone should handle this in their own way? DISCUSSION ITEM 3: I didn't handle "reboot recovery" reason here. Does anyone have some ideas on that? This doc [1] a bit of confuses me, but as I understand, the 'recovery' partition will remain, so in case of "reboot recovery" we just need to load recovery partition into the RAM and run bootm for that. Is that correct or I'm missing something? [1] https://source.android.com/devices/tech/ota/ab/ab_implement Signed-off-by: Sam Protsenko <semen.protsenko(a)linaro.org> --- include/environment/ti/boot.h | 43 ++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/include/environment/ti/boot.h b/include/environment/ti/boot.h index 8ddb0416c4..943adcad40 100644 --- a/include/environment/ti/boot.h +++ b/include/environment/ti/boot.h @@ -126,13 +126,44 @@ "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine device tree to use; fi; \0" -#define CONFIG_PREBOOT \ +#define FASTBOOT_CMD \ + "echo Booting into fastboot ...; " \ + "fastboot " __stringify(CONFIG_FASTBOOT_USB_DEV) "; " + +/* Check we are booting from "fastboot reboot bootloader" */ +#define PREBOOT_CHECK_DOFASTBOOT \ "if test ${dofastboot} -eq 1; then " \ - "echo Boot fastboot requested, resetting dofastboot ...;" \ - "setenv dofastboot 0; saveenv;" \ - "echo Booting into fastboot ...; " \ - "fastboot " __stringify(CONFIG_FASTBOOT_USB_DEV) "; " \ - "fi;" \ + "echo Boot fastboot requested, resetting dofastboot ...; " \ + "setenv dofastboot 0; saveenv; " \ + FASTBOOT_CMD \ + "fi; " + +/* Check reboot reason in BCB area of 'misc' partition */ +#define PREBOOT_CHECK_BCB \ + "if bcb load " __stringify(CONFIG_FASTBOOT_FLASH_MMC_DEV) " misc; " \ + "then " \ + "if bcb test command = bootonce-bootloader; then " \ + "echo Boot fastboot requested, resetting BCB ...; " \ + "bcb clear command; bcb store; " \ + FASTBOOT_CMD \ + "elif bcb test command = boot-recovery; then " \ + "echo Boot recovery requested; resetting BCB ...; " \ + "bcb clear command; bcb store; " \ + "echo TODO: RECOVERY_CMD is not implemented; " \ + "fi; " \ + "else " \ + "echo Error: BCB/misc is corrupted or does not exist; " \ + "fi; " + +/* Enter fastboot mode if user requested it */ +#if CONFIG_IS_ENABLED(CMD_BCB) +# define CONFIG_PREBOOT \ + PREBOOT_CHECK_DOFASTBOOT \ + PREBOOT_CHECK_BCB +#else +# define CONFIG_PREBOOT \ + PREBOOT_CHECK_DOFASTBOOT +#endif #define CONFIG_BOOTCOMMAND \ "if test ${boot_fit} -eq 1; then " \ -- 2.20.1

2 2

[U-Boot] [PATCH v2] fastboot: Remove "bootloader-version" variable
by Sam Protsenko 04 Jul '19

04 Jul '19

As per [1], there is no such fastboot variable as "bootloader-version". Only "version-bootloader" is supported. Let's reflect this and not confuse users further. [1] https://android.googlesource.com/platform/system/core/+/refs/tags/android-q… Fixes: 3aab70afc531d1 ("usb/gadget: add the fastboot gadget") Signed-off-by: Sam Protsenko <semen.protsenko(a)linaro.org> --- Changes in v2: - add "Fixes:" tag - use fixed link (tag instead of branch) - remove section in link (which may be changed in future) - fixed bootloader version in doc (to not confuse the user) doc/android/fastboot.txt | 6 +++--- drivers/fastboot/fb_getvar.c | 9 +++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/doc/android/fastboot.txt b/doc/android/fastboot.txt index 431191c473..a1377b4b23 100644 --- a/doc/android/fastboot.txt +++ b/doc/android/fastboot.txt @@ -169,9 +169,9 @@ On the client side you can fetch the bootloader version for instance: :: - $ fastboot getvar bootloader-version - bootloader-version: U-Boot 2014.04-00005-gd24cabc - finished. total time: 0.000s + $ fastboot getvar version-bootloader + version-bootloader: U-Boot 2019.07-rc4-00240-g00c9f2a2ec + Finished. Total time: 0.005s or initiate a reboot: diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c index fd0823b2bf..ebe5c8a104 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -12,7 +12,7 @@ #include <version.h> static void getvar_version(char *var_parameter, char *response); -static void getvar_bootloader_version(char *var_parameter, char *response); +static void getvar_version_bootloader(char *var_parameter, char *response); static void getvar_downloadsize(char *var_parameter, char *response); static void getvar_serialno(char *var_parameter, char *response); static void getvar_version_baseband(char *var_parameter, char *response); @@ -37,12 +37,9 @@ static const struct { { .variable = "version", .dispatch = getvar_version - }, { - .variable = "bootloader-version", - .dispatch = getvar_bootloader_version }, { .variable = "version-bootloader", - .dispatch = getvar_bootloader_version + .dispatch = getvar_version_bootloader }, { .variable = "downloadsize", .dispatch = getvar_downloadsize @@ -131,7 +128,7 @@ static void getvar_version(char *var_parameter, char *response) fastboot_okay(FASTBOOT_VERSION, response); } -static void getvar_bootloader_version(char *var_parameter, char *response) +static void getvar_version_bootloader(char *var_parameter, char *response) { fastboot_okay(U_BOOT_VERSION, response); } -- 2.20.1

2 1

[U-Boot] [PATCH] fastboot: Remove "bootloader-version" variable
by Sam Protsenko 04 Jul '19

04 Jul '19

As per [1], there is no such fastboot variable as "bootloader-version". Only "version-bootloader" is supported. Let's reflect this and not confuse users further. [1] https://android.googlesource.com/platform/system/core/+/master/fastboot/REA… Signed-off-by: Sam Protsenko <semen.protsenko(a)linaro.org> --- doc/README.android-fastboot | 4 ++-- drivers/fastboot/fb_getvar.c | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/doc/README.android-fastboot b/doc/README.android-fastboot index 431191c473..ce852a4fd1 100644 --- a/doc/README.android-fastboot +++ b/doc/README.android-fastboot @@ -169,8 +169,8 @@ On the client side you can fetch the bootloader version for instance: :: - $ fastboot getvar bootloader-version - bootloader-version: U-Boot 2014.04-00005-gd24cabc + $ fastboot getvar version-bootloader + version-bootloader: U-Boot 2014.04-00005-gd24cabc finished. total time: 0.000s or initiate a reboot: diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c index fd0823b2bf..ebe5c8a104 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -12,7 +12,7 @@ #include <version.h> static void getvar_version(char *var_parameter, char *response); -static void getvar_bootloader_version(char *var_parameter, char *response); +static void getvar_version_bootloader(char *var_parameter, char *response); static void getvar_downloadsize(char *var_parameter, char *response); static void getvar_serialno(char *var_parameter, char *response); static void getvar_version_baseband(char *var_parameter, char *response); @@ -37,12 +37,9 @@ static const struct { { .variable = "version", .dispatch = getvar_version - }, { - .variable = "bootloader-version", - .dispatch = getvar_bootloader_version }, { .variable = "version-bootloader", - .dispatch = getvar_bootloader_version + .dispatch = getvar_version_bootloader }, { .variable = "downloadsize", .dispatch = getvar_downloadsize @@ -131,7 +128,7 @@ static void getvar_version(char *var_parameter, char *response) fastboot_okay(FASTBOOT_VERSION, response); } -static void getvar_bootloader_version(char *var_parameter, char *response) +static void getvar_version_bootloader(char *var_parameter, char *response) { fastboot_okay(U_BOOT_VERSION, response); } -- 2.20.1

4 7

[U-Boot] [PATCH 1/8] usb: r8a66597: return -ENOTSUPP from unimplemented submit_int_msg
by Michal Suchanek 04 Jul '19

04 Jul '19

--- drivers/usb/host/r8a66597-hcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c index 3c263e51c160..7b699d3f4788 100644 --- a/drivers/usb/host/r8a66597-hcd.c +++ b/drivers/usb/host/r8a66597-hcd.c @@ -826,7 +826,7 @@ int submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer, { /* no implement */ R8A66597_DPRINT("%s\n", __func__); - return 0; + return -ENOTSUPP; } int usb_lowlevel_init(int index, enum usb_init_type init, void **controller) -- 2.21.0

4 34

[U-Boot] [PATCH v2] fastboot: getvar: Add "is-userspace" variable
by Sam Protsenko 04 Jul '19

04 Jul '19

As per documentation [1], Android-Q requires for bootloader to provide "is-userspace" variable. "no" value should be always returned. This patch implements this fastboot variable. [1] https://android.googlesource.com/platform/system/core/+/refs/tags/android-q… Signed-off-by: Sam Protsenko <semen.protsenko(a)linaro.org> --- Changes in v2: - use the fixed link for tag instead of floating one for master branch - add "getvar:" in the commit title to be more specific drivers/fastboot/fb_getvar.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c index 9ee5054485..fd0823b2bf 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -28,6 +28,7 @@ static void getvar_partition_type(char *part_name, char *response); #if CONFIG_IS_ENABLED(FASTBOOT_FLASH) static void getvar_partition_size(char *part_name, char *response); #endif +static void getvar_is_userspace(char *var_parameter, char *response); static const struct { const char *variable; @@ -78,6 +79,9 @@ static const struct { .variable = "partition-size", .dispatch = getvar_partition_size #endif + }, { + .variable = "is-userspace", + .dispatch = getvar_is_userspace } }; @@ -243,6 +247,11 @@ static void getvar_partition_size(char *part_name, char *response) } #endif +static void getvar_is_userspace(char *var_parameter, char *response) +{ + fastboot_okay("no", response); +} + /** * fastboot_getvar() - Writes variable indicated by cmd_parameter to response. * -- 2.20.1

2 1

[U-Boot] [PATCH 0/3] amlogic: add unique MAC address generatio
by Neil Armstrong 04 Jul '19

04 Jul '19

This patchset adds support for generating an unique MAC address per-SoC, and enables it on the q200 (VIM2) and P212 (libretech-cc, khadas-vim, libretech-ac) based boards. Neil Armstrong (3): ARM: meson: sm: Add secure monitor calls to retrieve SoC serial number ARM: meson: add unique MAC address generation board: amlogic: Generate unique MAC address for Q200 and P212 based boards arch/arm/include/asm/arch-meson/eth.h | 3 +++ arch/arm/include/asm/arch-meson/sm.h | 4 ++++ arch/arm/mach-meson/board-common.c | 31 +++++++++++++++++++++++++++ arch/arm/mach-meson/sm.c | 24 +++++++++++++++++++++ board/amlogic/p212/p212.c | 2 ++ board/amlogic/q200/q200.c | 2 ++ 6 files changed, 66 insertions(+) -- 2.21.0

1 4

Re: [U-Boot] [PATCH] ARM: imx6: DHCOM i.MX6 PDK: Switch to DM for I2C
by Ludwig Zenz 04 Jul '19

04 Jul '19

Marek Vasut <marex(a)denx.de> Wednesday 3rd July 2019 14:06: > > On 7/3/19 10:20 AM, Ludwig Zenz wrote: > [...] > > > static int setup_dhcom_mac_from_fuse(void) > > { > > + struct udevice *dev; > > unsigned char enetaddr[6]; > > int ret; > > > > @@ -228,13 +145,14 @@ static int setup_dhcom_mac_from_fuse(void) > > return 0; > > } > > > > - ret = i2c_set_bus_num(2); > > +#ifdef CONFIG_SYS_I2C_MXC_I2C3 > > + ret = i2c_get_chip_for_busnum(2, EEPROM_I2C_ADDRESS, 1, &dev); > > Isn't there some DM way which avoids using bus sequence numbers ? > If there is, subsequent patch is fine. > I searched the U-Boot source tree in particular also drivers/i2c/i2c-uclass.c and unfortunately found no better variant. Of course I am open for suggestions. > > if (ret) { > > - printf("Error switching I2C bus!\n"); > > + printf("Cannot find EEPROM!\n"); > > return ret; > > } > > > > - ret = i2c_read(EEPROM_I2C_ADDRESS, 0xfa, 0x1, enetaddr, 0x6); > > + ret = dm_i2c_read(dev, 0xfa, enetaddr, 0x6); > > if (ret) { > > printf("Error reading configuration EEPROM!\n"); > > return ret; > > [...] > > > diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig > > index 4734ed76e5..b0749a054f 100644 > > --- a/configs/dh_imx6_defconfig > > +++ b/configs/dh_imx6_defconfig > > @@ -48,6 +48,13 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y > > CONFIG_DWC_AHSATA=y > > CONFIG_BOOTCOUNT_LIMIT=y > > CONFIG_DM_GPIO=y > > +CONFIG_DM_I2C=y > > +CONFIG_I2C_SET_DEFAULT_BUS_NUM=y > > +CONFIG_I2C_DEFAULT_BUS_NUMBER=0x2 > > Are these two ^ needed ? > Bus number 2 is the i2c bus for the system on module components. The first thought was that it would add some comfort. On the other hand, of course, there is also additional overhead. I will leave it out in v2. > > +CONFIG_SYS_I2C_MXC=y > > +CONFIG_SYS_I2C_MXC_I2C1=y > > +CONFIG_SYS_I2C_MXC_I2C2=y > > +CONFIG_SYS_I2C_MXC_I2C3=y > > Are these three ^ really needed ? You're right. It is not needed (I did test it). I was irritated by the fact that this is used on many boards. Unfortunately I get the following warnings when compiling (maybe that is the reason why so many boards use it): /work/dhcom/imx6/u-boot-imx/drivers/i2c/mxc_i2c.c:793:12: warning: ‘mxc_i2c_set_bus_speed’ defined but not used [-Wunused-function] static u32 mxc_i2c_set_bus_speed(struct i2c_adapter *adap, uint speed) ^~~~~~~~~~~~~~~~~~~~~ /work/dhcom/imx6/u-boot-imx/drivers/i2c/mxc_i2c.c:785:13: warning: ‘mxc_i2c_init’ defined but not used [-Wunused-function] static void mxc_i2c_init(struct i2c_adapter *adap, int speed, int slaveaddr) ^~~~~~~~~~~~ /work/dhcom/imx6/u-boot-imx/drivers/i2c/mxc_i2c.c:721:12: warning: ‘mxc_i2c_probe’ defined but not used [-Wunused-function] static int mxc_i2c_probe(struct i2c_adapter *adap, uint8_t chip) ^~~~~~~~~~~~~ /work/dhcom/imx6/u-boot-imx/drivers/i2c/mxc_i2c.c:711:12: warning: ‘mxc_i2c_write’ defined but not used [-Wunused-function] static int mxc_i2c_write(struct i2c_adapter *adap, uint8_t chip, ^~~~~~~~~~~~~ /work/dhcom/imx6/u-boot-imx/drivers/i2c/mxc_i2c.c:704:12: warning: ‘mxc_i2c_read’ defined but not used [-Wunused-function] static int mxc_i2c_read(struct i2c_adapter *adap, uint8_t chip, with CONFIG_SYS_I2C_MXC_I2Cx in the dh_imx6_defconfig everything is fine. Can you make a suggestion on how to solve it? > [...] > Thanks and regards, Ludwig Zenz

2 1