April 2019 - U-Boot

[U-Boot] [PATCH 1/2] DM: I2C: Introduce 'u-boot, i2c-transaction-bytes' property
by Lukasz Majewski 10 Apr '19

10 Apr '19

The 'u-boot,i2c-transaction-bytes' device tree property provides information regarding number of bytes transferred by a device in a single transaction. This change is necessary to avoid hanging devices after soft reset. One notable example is communication with MC34708 device: 1. Reset when communicating with MC34708 via I2C. 2. The u-boot (after reboot -f) tries to setup the I2C and then calls force_idle_bus. In the same time MC34708 still has some data to be sent (as it transfers data in 24 bits chunks). 3. The force_idle_bus() is not able to make the bus idle as 8 SCL clocks may be not enough to have the full transmission. 4. We end up with I2C inconsistency with MC34708. This PMIC device requires 24+ SCL cycles to make finish any pending I2C transmission. Signed-off-by: Lukasz Majewski <lukma(a)denx.de> --- doc/device-tree-bindings/i2c/i2c.txt | 5 +++++ drivers/i2c/i2c-uclass.c | 24 ++++++++++++++++++++++++ drivers/i2c/mxc_i2c.c | 19 +++++++++++++++++-- include/i2c.h | 2 ++ 4 files changed, 48 insertions(+), 2 deletions(-) diff --git a/doc/device-tree-bindings/i2c/i2c.txt b/doc/device-tree-bindings/i2c/i2c.txt index de818d4713..9698e4899b 100644 --- a/doc/device-tree-bindings/i2c/i2c.txt +++ b/doc/device-tree-bindings/i2c/i2c.txt @@ -12,6 +12,10 @@ property which allows the chip offset length to be selected. Optional properties: - u-boot,i2c-offset-len - length of chip offset in bytes. If omitted the default value of 1 is used. +- u-boot,i2c-transaction-bytes - the length of single I2C transaction on + the bus. Some devices require more than single byte transmission + (e.g. mc34708 mfd). This information is necessary to correctly + initialize (put into idle state) I2C bus after soft reset. - gpios = <sda ...>, <scl ...>; pinctrl-names = "default", "gpio"; pinctrl-0 = <&i2c_xfer>; @@ -28,6 +32,7 @@ i2c4: i2c@12ca0000 { compatible = "google,cros-ec"; i2c-max-frequency = <100000>; u-boot,i2c-offset-len = <0>; + u-boot,i2c-transaction-bytes = <3>; ec-interrupt = <&gpx1 6 GPIO_ACTIVE_LOW>; }; }; diff --git a/drivers/i2c/i2c-uclass.c b/drivers/i2c/i2c-uclass.c index 49e23a0a4b..e47abf1833 100644 --- a/drivers/i2c/i2c-uclass.c +++ b/drivers/i2c/i2c-uclass.c @@ -593,6 +593,29 @@ int i2c_chip_ofdata_to_platdata(struct udevice *dev, struct dm_i2c_chip *chip) } #endif +static int i2c_pre_probe(struct udevice *dev) +{ +#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) + struct dm_i2c_bus *i2c = dev_get_uclass_priv(dev); + unsigned int max = 0; + ofnode node; + int ret; + + i2c->max_transaction_bytes = 0; + dev_for_each_subnode(node, dev) { + ret = ofnode_read_u32(node, + "u-boot,i2c-transaction-bytes", + &max); + if (!ret && max > i2c->max_transaction_bytes) + i2c->max_transaction_bytes = max; + } + + debug("%s: I2C bus: %s max transaction bytes: %d\n", __func__, + dev->name, i2c->max_transaction_bytes); +#endif + return 0; +} + static int i2c_post_probe(struct udevice *dev) { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) @@ -674,6 +697,7 @@ UCLASS_DRIVER(i2c) = { .post_bind = i2c_post_bind, .init = i2c_uclass_init, .priv_auto_alloc_size = sizeof(struct i2c_priv), + .pre_probe = i2c_pre_probe, .post_probe = i2c_post_probe, .per_device_auto_alloc_size = sizeof(struct dm_i2c_bus), .per_child_platdata_auto_alloc_size = sizeof(struct dm_i2c_chip), diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index 9999d9fe5e..5420afbc8e 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -354,9 +354,10 @@ int i2c_idle_bus(struct mxc_i2c_bus *i2c_bus) int i2c_idle_bus(struct mxc_i2c_bus *i2c_bus) { struct udevice *bus = i2c_bus->bus; + struct dm_i2c_bus *i2c = dev_get_uclass_priv(bus); struct gpio_desc *scl_gpio = &i2c_bus->scl_gpio; struct gpio_desc *sda_gpio = &i2c_bus->sda_gpio; - int sda, scl; + int sda, scl, idle_sclks; int i, ret = 0; ulong elapsed, start_time; @@ -380,8 +381,22 @@ int i2c_idle_bus(struct mxc_i2c_bus *i2c_bus) if ((sda & scl) == 1) goto exit; /* Bus is idle already */ + /* + * In most cases it is just enough to generate 8 + 1 SCLK + * clocks to recover I2C slave device from 'stuck' state + * (when for example SW reset was performed, in the middle of + * I2C transmission). + * + * However, there are devices which send data in packets of + * N bytes (N > 1). In such case we do need N * 8 + 1 SCLK + * clocks. + */ + idle_sclks = 8 + 1; + + if (i2c->max_transaction_bytes > 0) + idle_sclks = i2c->max_transaction_bytes * 8 + 1; /* Send high and low on the SCL line */ - for (i = 0; i < 9; i++) { + for (i = 0; i < idle_sclks; i++) { dm_gpio_set_dir_flags(scl_gpio, GPIOD_IS_OUT); dm_gpio_set_value(scl_gpio, 0); udelay(50); diff --git a/include/i2c.h b/include/i2c.h index ccffc19552..a5c760c711 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -68,9 +68,11 @@ struct dm_i2c_chip { * I2C bus udevice. * * @speed_hz: Bus speed in hertz (typically 100000) + * @max_transaction_bytes: Maximal size of single I2C transfer */ struct dm_i2c_bus { int speed_hz; + int max_transaction_bytes; }; /* -- 2.11.0

2 5

[U-Boot] [PATCH 1/2] misc: i2c_eeprom: support DT pagesize property
by Baruch Siach 10 Apr '19

10 Apr '19

Read the page size from DT when available. Signed-off-by: Baruch Siach <baruch(a)tkos.co.il> --- drivers/misc/i2c_eeprom.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/misc/i2c_eeprom.c b/drivers/misc/i2c_eeprom.c index 29ad87c1d7b4..ce2cad44d8d4 100644 --- a/drivers/misc/i2c_eeprom.c +++ b/drivers/misc/i2c_eeprom.c @@ -50,6 +50,12 @@ static int i2c_eeprom_std_ofdata_to_platdata(struct udevice *dev) { struct i2c_eeprom *priv = dev_get_priv(dev); u64 data = dev_get_driver_data(dev); + u32 pagesize; + + if (dev_read_u32(dev, "pagesize", &pagesize) == 0) { + priv->pagesize = pagesize; + return 0; + } /* 6 bit -> page size of up to 2^63 (should be sufficient) */ priv->pagewidth = data & 0x3F; -- 2.20.1

2 5

[U-Boot] [PATCH v2] ARM: dts: i.MX6Q: fix avoid_unnecessary_addr_size warnings
by Marcel Ziswiler 10 Apr '19

10 Apr '19

From: Marcel Ziswiler <marcel.ziswiler(a)toradex.com> Re-synced the device tree with Linux 5.0. This fixes the following warnings: w+arch/arm/dts/imx6-apalis.dtb: Warning (reg_format): /soc/ipu@2800000/ port@2/endpoint@0:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1) w+arch/arm/dts/imx6-apalis.dtb: Warning (reg_format): /soc/ipu@2800000/ port@2/endpoint@1:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1) w+arch/arm/dts/imx6-apalis.dtb: Warning (reg_format): /soc/ipu@2800000/ port@2/endpoint@2:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1) w+arch/arm/dts/imx6-apalis.dtb: Warning (reg_format): /soc/ipu@2800000/ port@2/endpoint@3:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1) w+arch/arm/dts/imx6-apalis.dtb: Warning (reg_format): /soc/ipu@2800000/ port@2/endpoint@4:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1) w+arch/arm/dts/imx6-apalis.dtb: Warning (reg_format): /soc/ipu@2800000/ port@3/endpoint@1:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1) w+arch/arm/dts/imx6-apalis.dtb: Warning (reg_format): /soc/ipu@2800000/ port@3/endpoint@2:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1) w+arch/arm/dts/imx6-apalis.dtb: Warning (reg_format): /soc/ipu@2800000/ port@3/endpoint@3:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1) w+arch/arm/dts/imx6-apalis.dtb: Warning (reg_format): /soc/ipu@2800000/ port@3/endpoint@4:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1) w+arch/arm/dts/imx6-apalis.dtb: Warning (avoid_default_addr_size): /soc/ipu@2800000/port@2/endpoint@0: Relying on default #address-cells value w+arch/arm/dts/imx6-apalis.dtb: Warning (avoid_default_addr_size): /soc/ipu@2800000/port@2/endpoint@0: Relying on default #size-cells value w+arch/arm/dts/imx6-apalis.dtb: Warning (avoid_default_addr_size): /soc/ipu@2800000/port@2/endpoint@1: Relying on default #address-cells value w+arch/arm/dts/imx6-apalis.dtb: Warning (avoid_default_addr_size): /soc/ipu@2800000/port@2/endpoint@1: Relying on default #size-cells value w+arch/arm/dts/imx6-apalis.dtb: Warning (avoid_default_addr_size): /soc/ipu@2800000/port@2/endpoint@2: Relying on default #address-cells value w+arch/arm/dts/imx6-apalis.dtb: Warning (avoid_default_addr_size): /soc/ipu@2800000/port@2/endpoint@2: Relying on default #size-cells value w+arch/arm/dts/imx6-apalis.dtb: Warning (avoid_default_addr_size): /soc/ipu@2800000/port@2/endpoint@3: Relying on default #address-cells value w+arch/arm/dts/imx6-apalis.dtb: Warning (avoid_default_addr_size): /soc/ipu@2800000/port@2/endpoint@3: Relying on default #size-cells value w+arch/arm/dts/imx6-apalis.dtb: Warning (avoid_default_addr_size): /soc/ipu@2800000/port@2/endpoint@4: Relying on default #address-cells value w+arch/arm/dts/imx6-apalis.dtb: Warning (avoid_default_addr_size): /soc/ipu@2800000/port@2/endpoint@4: Relying on default #size-cells value w+arch/arm/dts/imx6-apalis.dtb: Warning (avoid_default_addr_size): /soc/ipu@2800000/port@3/endpoint@1: Relying on default #address-cells value w+arch/arm/dts/imx6-apalis.dtb: Warning (avoid_default_addr_size): /soc/ipu@2800000/port@3/endpoint@1: Relying on default #size-cells value w+arch/arm/dts/imx6-apalis.dtb: Warning (avoid_default_addr_size): /soc/ipu@2800000/port@3/endpoint@2: Relying on default #address-cells value w+arch/arm/dts/imx6-apalis.dtb: Warning (avoid_default_addr_size): /soc/ipu@2800000/port@3/endpoint@2: Relying on default #size-cells value w+arch/arm/dts/imx6-apalis.dtb: Warning (avoid_default_addr_size): /soc/ipu@2800000/port@3/endpoint@3: Relying on default #address-cells value w+arch/arm/dts/imx6-apalis.dtb: Warning (avoid_default_addr_size): /soc/ipu@2800000/port@3/endpoint@3: Relying on default #size-cells value w+arch/arm/dts/imx6-apalis.dtb: Warning (avoid_default_addr_size): /soc/ipu@2800000/port@3/endpoint@4: Relying on default #address-cells value w+arch/arm/dts/imx6-apalis.dtb: Warning (avoid_default_addr_size): /soc/ipu@2800000/port@3/endpoint@4: Relying on default #size-cells value w+arch/arm/dts/imx6-apalis.dtb: Warning (avoid_unnecessary_addr_size): Failed prerequisite 'avoid_default_addr_size' Signed-off-by: Marcel Ziswiler <marcel.ziswiler(a)toradex.com> --- Changes in v2: - Re-synced the device tree with Linux 5.0 as suggested by Fabio. arch/arm/dts/imx6q.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/dts/imx6q.dtsi b/arch/arm/dts/imx6q.dtsi index ab1716b6b0..d038f41170 100644 --- a/arch/arm/dts/imx6q.dtsi +++ b/arch/arm/dts/imx6q.dtsi @@ -202,6 +202,7 @@ <&clks IMX6QDL_CLK_GPU2D_CORE>; clock-names = "bus", "core"; power-domains = <&pd_pu>; + #cooling-cells = <2>; }; ipu2: ipu@2800000 { @@ -234,6 +235,8 @@ }; ipu2_di0: port@2 { + #address-cells = <1>; + #size-cells = <0>; reg = <2>; ipu2_di0_disp0: endpoint@0 { @@ -262,6 +265,8 @@ }; ipu2_di1: port@3 { + #address-cells = <1>; + #size-cells = <0>; reg = <3>; ipu2_di1_hdmi: endpoint@1 { -- 2.20.1

3 2

[U-Boot] [PATCH v2 0/6] pico-imx7d: Add support for BL33 case
by Jun Nie 10 Apr '19

10 Apr '19

Add configuration to boot U-boot as BL33 case. The boot flow is ATF -> OPTEE -> U-boot. Changes vs V1: - Remove DCD file. - Add a patch to fix uart clock root ID. - Change file name from pico-pi-imx7d_bl33_defconfig to pico-imx7d_bl33_defconfig Jun Nie (6): mx7_common: Share configs to skip low level init imx: mx7: Add empty arch_cpu_init if skipped pico-imx7d: Reserve region of memory to OPTEE pico-imx7d: Add boot option for verified boot pico-imx7d: Add bl33 config pico-imx7d: Correct uart clock root arch/arm/include/asm/arch-mx7/clock.h | 5 +++ arch/arm/mach-imx/mx7/clock.c | 2 +- arch/arm/mach-imx/mx7/soc.c | 4 +++ board/technexion/pico-imx7d/pico-imx7d.c | 5 +++ configs/pico-imx7d_bl33_defconfig | 61 ++++++++++++++++++++++++++++++++ include/configs/mx7_common.h | 11 ++++++ include/configs/pico-imx7d.h | 39 ++++++++++++++++++-- include/configs/warp7.h | 11 ------ 8 files changed, 123 insertions(+), 15 deletions(-) create mode 100644 configs/pico-imx7d_bl33_defconfig -- 2.7.4

2 13

[U-Boot] [RFC PATCH v1] MLK-12883 usb: limit USB_MAX_XFER_BLK to 256
by Marcel Ziswiler 10 Apr '19

10 Apr '19

From: Peng Fan <peng.fan(a)nxp.com> For Some USB mass storage devices, such as: " - Kingston DataTraveler 2.0 001D7D06CF09B04199C7B3EA - Class: (from Interface) Mass Storage - PacketSize: 64 Configurations: 1 - Vendor: 0x0930 Product 0x6545 Version 1.16 " When `usb read 0x80000000 0 0x2000`, we met "EHCI timed out on TD - token=0x80008d80". The devices does not support scsi VPD page, we are not able to get the maximum transfer length for READ(10)/WRITE(10). So we limit this to 256 blocks as READ(6). Signed-off-by: Peng Fan <peng.fan(a)nxp.com> Acked-by: Marcel Ziswiler <marcel.ziswiler(a)toradex.com> (cherry picked from commit df0052575b2bc9d66ae73584768e1a457ed5d914) --- This comes from NXP's downstream and has proven to tremendously improve the situation with those odd USB mass storage aka memory sticks. This is why I post it here asking whether or not this may be something benefiting more people. Any feedback and suggestions are welcome. common/usb_storage.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/usb_storage.c b/common/usb_storage.c index 8c889bb1a6..7420438363 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -949,7 +949,11 @@ static void usb_stor_set_max_xfer_blk(struct usb_device *udev, * there is enough free heap space left, but the SCSI READ(10) and * WRITE(10) commands are limited to 65535 blocks. */ - blk = USHRT_MAX; + /* + * Some USB Massstorage devices have issues, limiting this to 256 + * fixes this. + */ + blk = 256; #else blk = 20; #endif -- 2.20.1

2 1

[U-Boot] Possible bug in release: fdisk in linux cannot read /dev/mmcblk0 anymore
by U.Mutlu 10 Apr '19

10 Apr '19

Hi folks, # U-Boot 2019.04 Configuration I just updated to the latest version via git. My previous version was the recent 2019.04-rc4. Now in this latest version I think a bug shows up: Inside Linux on the device, suddenly the following command no longer works: # fdisk -l /dev/mmcblk0 fdisk: cannot open /dev/mmcblk0: Input/output error # ls -l /dev/mmcblk0 brw-rw---- 1 root disk 179, 0 Jan 1 1970 /dev/mmcblk0 The device is present, but fdisk cannot read the partitions, although u-boot has successfully used the boot partition of this SD card to boot Linux. IMHO a funny situation, isn't it? :-) This always had worked for me, up until now. Is this more a linux issue or a u-boot issue? Let me know if you need specific data. Thx

1 1

[U-Boot] [PATCH 1/1] efi_loader: remove stray #define LOG_CATEGORY LOGL_ERR
by Heinrich Schuchardt 09 Apr '19

09 Apr '19

The statement '#define LOG_CATEGORY LOGL_ERR' makes not sense. LOGL_ERR is not a LOG_CATEGORY. Remove the statement. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_device_path.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c index 53b40c8c3c..1b08ca8f62 100644 --- a/lib/efi_loader/efi_device_path.c +++ b/lib/efi_loader/efi_device_path.c @@ -5,8 +5,6 @@ * (C) Copyright 2017 Rob Clark */ -#define LOG_CATEGORY LOGL_ERR - #include <common.h> #include <blk.h> #include <dm.h> -- 2.20.1

1 0

[U-Boot] [PATCH v2 0/4] arm: socfpga: clean up socfpga_common.h
by Simon Goldschmidt 09 Apr '19

09 Apr '19

This series cleans up the include/configs/socfpga_common.h file a bit. It removes some defines that are used nowhere and cleans up some leftovers after various subsystems have been converted to use DM. Changes in v2: - added patch to move socfpga_vining to DM_I2C - remove even more outdated things - added patch with further cleanups to the socfpga board config files Simon Goldschmidt (4): arm: socfpga: move vining_fpga to DM_I2C arm: socfpga: clean up socfpga_common.h arm: socfpga: remove CONFIG_SYS_BOOTMAPSZ arm: socfpga: clean up board config files configs/socfpga_vining_fpga_defconfig | 8 ++- include/configs/socfpga_arria10_socdk.h | 6 --- include/configs/socfpga_arria5_socdk.h | 2 - include/configs/socfpga_common.h | 68 ------------------------ include/configs/socfpga_cyclone5_socdk.h | 2 - include/configs/socfpga_de0_nano_soc.h | 2 - include/configs/socfpga_de10_nano.h | 2 - include/configs/socfpga_de1_soc.h | 2 - include/configs/socfpga_is1.h | 2 - include/configs/socfpga_sockit.h | 2 - include/configs/socfpga_socrates.h | 2 - include/configs/socfpga_sr1500.h | 11 ---- include/configs/socfpga_vining_fpga.h | 18 ------- 13 files changed, 7 insertions(+), 120 deletions(-) -- 2.17.1

2 12

[U-Boot] [PATCH v4 0/4] arm: socfpga: stack and Kconfig cleanups
by Simon Goldschmidt 09 Apr '19

09 Apr '19

This series cleans up stack definitions in socfpga_common.h as well as cleans up defconfig files by implying/defaulting common things in Kconfig files. Finally, it reduces the malloc pool size used in first stage of gen5 SPL (without ddr available) in order to have more space available for code. As this series does not contain direct bugfixes, it targets the socfpga-next branch. Note that this series is meant for socfpga-next but depends on the generic series "spl: full-featured heap cleanups" from: https://patchwork.ozlabs.org/project/uboot/list/?series=99561 Changes in v4: - make this patch 2/4 work without changing a10 heap allocation strategy (as the series doing that has been rejected) - adapt to socfpga-next Changes in v3: - removed patch 2/5 from v2 (moved to patchwork #1067366, series #99561) - adapt to socfpge-next: imply USE_TINY_PRINTF only for gen5 & a10, not s10 - adapt to socfpga-next Changes in v2: - fix commit message: "SPL post-reloc", not "SPL pre-reloc" - added patch to imply/default common config options - added patch to reduce gen5 SPL initial malloc pool to 2 KiB Simon Goldschmidt (4): arm: socfpga: fix comment about SPL memory layout arm: socfpga: put initial U-Boot stack into DDR arm: socfpga: imply/default common config options arm: socfpga: gen5: reduce SPL pre-reloc malloc arch/arm/Kconfig | 2 ++ arch/arm/mach-socfpga/Kconfig | 23 ++++++++++++ configs/socfpga_arria10_defconfig | 6 ---- configs/socfpga_arria5_defconfig | 10 ------ configs/socfpga_cyclone5_defconfig | 10 ------ configs/socfpga_dbm_soc1_defconfig | 10 ------ configs/socfpga_de0_nano_soc_defconfig | 10 ------ configs/socfpga_de10_nano_defconfig | 10 ------ configs/socfpga_de1_soc_defconfig | 10 ------ configs/socfpga_is1_defconfig | 8 ----- configs/socfpga_sockit_defconfig | 10 ------ configs/socfpga_socrates_defconfig | 10 ------ configs/socfpga_sr1500_defconfig | 10 ------ configs/socfpga_stratix10_defconfig | 2 -- configs/socfpga_vining_fpga_defconfig | 10 ------ include/configs/socfpga_common.h | 48 ++++++++++++-------------- 16 files changed, 48 insertions(+), 141 deletions(-) -- 2.17.1

2 9

[U-Boot] [PATCH] fastboot: add support for 'getvar platform'
by Eugeniu Rosca 09 Apr '19

09 Apr '19

Our R-Car3 Android userspace relies on the output of 'fastboot getvar platform' and U-Boot currently is not able to handle it: host $> fastboot getvar platform getvar:platform FAILED (remote: Variable not implemented) finished. total time: 0.001s We either have the option of adding 'fastboot.platform' variable to the default/saved environment as a workaround or add proper 'fastboot getvar platform' support in U-Boot via this patch. In the latter case, other platforms can benefit from it too. Note that R-Car3 already exports 'platform' environment variable via v2019.01 commit 00e4b57e9e71c3 ("ARM: rmobile: Set environment variable containing CPU type"). Signed-off-by: Eugeniu Rosca <erosca(a)de.adit-jv.com> --- drivers/fastboot/fb_getvar.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c index 4d264c985d7e..bc2481b57d73 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -17,6 +17,7 @@ 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); static void getvar_product(char *var_parameter, char *response); +static void getvar_platform(char *var_parameter, char *response); static void getvar_current_slot(char *var_parameter, char *response); static void getvar_slot_suffixes(char *var_parameter, char *response); static void getvar_has_slot(char *var_parameter, char *response); @@ -55,6 +56,9 @@ static const struct { }, { .variable = "product", .dispatch = getvar_product + }, { + .variable = "platform", + .dispatch = getvar_platform }, { .variable = "current-slot", .dispatch = getvar_current_slot @@ -117,6 +121,16 @@ static void getvar_product(char *var_parameter, char *response) fastboot_fail("Board not set", response); } +static void getvar_platform(char *var_parameter, char *response) +{ + const char *p = env_get("platform"); + + if (p) + fastboot_okay(p, response); + else + fastboot_fail("platform not set", response); +} + static void getvar_current_slot(char *var_parameter, char *response) { /* A/B not implemented, for now always return _a */ -- 2.21.0

1 0