May 2022 - U-Boot

[PATCH] arm:socfpga:soc64: To notify SDM when U-Boot pass control to Linux
by dinesh.maniyam＠intel.com 01 Jun '22

01 Jun '22

From: Dinesh Maniyam <dinesh.maniyam(a)intel.com> Prior U-Boot pass control to Linux, U-Boot will send a mailbox command "HPS_STAGE_NOTIFY" to notify Secure Device Manager (SDM) on HPS SW transition. Signed-off-by: Chin Liang See <chin.liang.see(a)intel.com> Signed-off-by: Dinesh Maniyam <dinesh.maniyam(a)intel.com> --- arch/arm/mach-socfpga/misc_soc64.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/mach-socfpga/misc_soc64.c b/arch/arm/mach-socfpga/misc_soc64.c index 2acdfad07b..3148eb46a5 100644 --- a/arch/arm/mach-socfpga/misc_soc64.c +++ b/arch/arm/mach-socfpga/misc_soc64.c @@ -89,3 +89,8 @@ void do_bridge_reset(int enable, unsigned int mask) socfpga_bridges_reset(enable); } + +void arch_preboot_os(void) +{ + mbox_hps_stage_notify(HPS_EXECUTION_STATE_OS); +} \ No newline at end of file -- 2.26.2

2 2

[PATCH] arm: socfpga: mailbox: Add mailbox command for HPS execution notifcation
by dinesh.maniyam＠intel.com 01 Jun '22

01 Jun '22

From: Dinesh Maniyam <dinesh.maniyam(a)intel.com> Add a new mailbox command "HPS_STAGE_NOTIFY" to notify Secure Device Manager (SDM) on the stage of HPS code execution. In general, there are three main code execution stages: First Stage Boot Loader (FSBL) which is U-Boot SPL, Second Stage Boot Loader (SSBL) which is U-Boot, and the Operating System which is Linux. Signed-off-by: Dinesh Maniyam <dinesh.maniyam(a)intel.com> --- arch/arm/mach-socfpga/include/mach/mailbox_s10.h | 7 +++++++ arch/arm/mach-socfpga/mailbox_s10.c | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/arch/arm/mach-socfpga/include/mach/mailbox_s10.h b/arch/arm/mach-socfpga/include/mach/mailbox_s10.h index fbaf11597e..50fe6393f9 100644 --- a/arch/arm/mach-socfpga/include/mach/mailbox_s10.h +++ b/arch/arm/mach-socfpga/include/mach/mailbox_s10.h @@ -123,6 +123,7 @@ enum ALT_SDM_MBOX_RESP_CODE { #define MBOX_QSPI_CLOSE 51 #define MBOX_QSPI_DIRECT 59 #define MBOX_REBOOT_HPS 71 +#define MBOX_HPS_STAGE_NOTIFY 93 /* Mailbox registers */ #define MBOX_CIN 0 /* command valid offset */ @@ -166,6 +167,11 @@ enum ALT_SDM_MBOX_RESP_CODE { #define RCF_SOFTFUNC_STATUS_SEU_ERROR BIT(3) #define RCF_PIN_STATUS_NSTATUS BIT(31) +/* Defines for HPS_STAGE_NOTIFY */ +#define HPS_EXECUTION_STATE_FSBL 0 +#define HPS_EXECUTION_STATE_SSBL 1 +#define HPS_EXECUTION_STATE_OS 2 + int mbox_send_cmd(u8 id, u32 cmd, u8 is_indirect, u32 len, u32 *arg, u8 urgent, u32 *resp_buf_len, u32 *resp_buf); int mbox_send_cmd_psci(u8 id, u32 cmd, u8 is_indirect, u32 len, u32 *arg, @@ -182,6 +188,7 @@ int mbox_qspi_open(void); #endif int mbox_reset_cold(void); +int mbox_hps_stage_notify(u32 execution_stage); int mbox_get_fpga_config_status(u32 cmd); int mbox_get_fpga_config_status_psci(u32 cmd); #endif /* _MAILBOX_S10_H_ */ diff --git a/arch/arm/mach-socfpga/mailbox_s10.c b/arch/arm/mach-socfpga/mailbox_s10.c index 101af23855..99f78c7c32 100644 --- a/arch/arm/mach-socfpga/mailbox_s10.c +++ b/arch/arm/mach-socfpga/mailbox_s10.c @@ -479,6 +479,12 @@ int __secure mbox_send_cmd_psci(u8 id, u32 cmd, u8 is_indirect, u32 len, urgent, resp_buf_len, resp_buf); } +int mbox_hps_stage_notify(u32 execution_stage) +{ + return mbox_send_cmd(MBOX_ID_UBOOT, MBOX_HPS_STAGE_NOTIFY, + MBOX_CMD_DIRECT, 1, &execution_stage, 0, 0, NULL); +} + int mbox_send_cmd_only(u8 id, u32 cmd, u8 is_indirect, u32 len, u32 *arg) { return mbox_send_cmd_only_common(id, cmd, is_indirect, len, arg); -- 2.26.2

2 1

[PATCH] fpga: intel_sdm_mb: Add checking for INTEL_SIP_SMC_STATUS_BUSY (1)
by dinesh.maniyam＠intel.com 01 Jun '22

01 Jun '22

From: Dinesh Maniyam <dinesh.maniyam(a)intel.com> Status busy means transfer is accepted but SDM does not have more freed buffer. It is not an error. Continue process the data if receive OK and BUSY status. Signed-off-by: Ley Foon Tan <ley.foon.tan(a)intel.com> Signed-off-by: Dinesh Maniyam <dinesh.maniyam(a)intel.com> --- drivers/fpga/intel_sdm_mb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/fpga/intel_sdm_mb.c b/drivers/fpga/intel_sdm_mb.c index f5fd9a14c2..5e0b2777e0 100644 --- a/drivers/fpga/intel_sdm_mb.c +++ b/drivers/fpga/intel_sdm_mb.c @@ -70,7 +70,8 @@ static int send_bitstream(const void *rbf_data, size_t rbf_size) debug("wr_ret = %d, rbf_data = %p, buf_size = %08lx\n", wr_ret, rbf_data, buf_size); - if (wr_ret) + if (wr_ret != INTEL_SIP_SMC_STATUS_OK && + wr_ret != INTEL_SIP_SMC_STATUS_BUSY) continue; rbf_size -= buf_size; -- 2.26.2

3 5

[PATCH] efi_loader: disk: allow blk devices even without UCLASS_PARTITION
by AKASHI Takahiro 01 Jun '22

01 Jun '22

While GPT partition is mandated in UEFI specification, CONFIG_PARTITION is seen optional under the current implementation. So modify efi_disk_rw_blocks() to allow accepting UCLASS_BLK devices. Fixes: commit d97e98c887ed ("efi_loader: disk: use udevice instead of blk_desc") Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> --- lib/efi_loader/efi_disk.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index 8fb5b2363c45..f5b462fb164a 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -99,21 +99,22 @@ static efi_status_t efi_disk_rw_blocks(struct efi_block_io *this, if (buffer_size & (blksz - 1)) return EFI_BAD_BUFFER_SIZE; -#if CONFIG_IS_ENABLED(PARTITIONS) - if (direction == EFI_DISK_READ) - n = dev_read(diskobj->dev, lba, blocks, buffer); - else - n = dev_write(diskobj->dev, lba, blocks, buffer); -#else - /* dev is always a block device (UCLASS_BLK) */ - struct blk_desc *desc; + if (CONFIG_IS_ENABLED(PARTITIONS) && + device_get_uclass_id(diskobj->dev) == UCLASS_PARTITION) { + if (direction == EFI_DISK_READ) + n = dev_read(diskobj->dev, lba, blocks, buffer); + else + n = dev_write(diskobj->dev, lba, blocks, buffer); + } else { + /* dev is a block device (UCLASS_BLK) */ + struct blk_desc *desc; - desc = dev_get_uclass_plat(diskobj->dev); - if (direction == EFI_DISK_READ) - n = blk_dread(desc, lba, blocks, buffer); - else - n = blk_dwrite(desc, lba, blocks, buffer); -#endif + desc = dev_get_uclass_plat(diskobj->dev); + if (direction == EFI_DISK_READ) + n = blk_dread(desc, lba, blocks, buffer); + else + n = blk_dwrite(desc, lba, blocks, buffer); + } /* We don't do interrupts, so check for timers cooperatively */ efi_timer_check(); -- 2.33.0

3 5

[PATCH v7 0/7] fpga: zynqmp: Adding support of loading authenticated images
by Adrian Fiergolski 01 Jun '22

01 Jun '22

This patchset introduces support for the authenticated FPGA images on ZynqMP boards, besides that introducing common way to pass the compatible property to any fpga driver. It bases on the initial work by Jorge Ramirez-Ortiz <jorge(a)foundries.io> https://patchwork.ozlabs.org/project/uboot/patch/20211015091506.2602-1-jorg… https://patchwork.ozlabs.org/project/uboot/patch/20211005111324.19749-3-jor… Changed in v7: - apply Michal Simek's suggestions As I applied changes on Oleksandr's patches, I indicated it by specifying myself as co-author in the commits logs. I am not sure if that is the convention of marking it. Changed in v6: - add support for the encrypted bitfiles Changes in v5: - replace ifdef with if() where it's possible Changes in v4: - change interface to xilinx_desc->operations->open() callback. - fix a bug from previous version of the patchset in dereferencing of a parent fpga_desc structure. Changes in v3: - remove the patch which introduced CMD_SPL_FPGA_LOAD_SECURE. - fix mixing definitions/declarations. - replace strcmp() calls with more secure strncmp(). - document the "u-boot,zynqmp-fpga-ddrauth" compatible string. - fix code style by check-patch recommendations. Changes in v2: - add function fit_fpga_load() to simplify calls of fpga_load() from contexts without a compatible attribute. - move all ZynqMP-specific logic to drivers/fpga/zynqmppl.c - prepare for passing a "compatible" FDT property to any fpga driver. Oleksandr Suvorov (6): fpga: add option for loading FPGA secure bitstreams fpga: add fit_fpga_load function fpga: xilinx: pass an address of xilinx_desc in fpga_desc fpga: xilinx: add missed identifier names fpga: xilinx: pass xilinx_desc pointer address into load() ops fpga: zynqmp: support loading authenticated images Adrian Fiergolski (1): fpga: zynqmp: support loading encrypted bitfiles boot/Kconfig | 4 +-- cmd/Kconfig | 3 ++- common/spl/spl_fit.c | 6 ++--- doc/uImage.FIT/source_file_format.txt | 7 +++++- drivers/fpga/Kconfig | 14 +++++++++++ drivers/fpga/fpga.c | 29 ++++++++++++++++++--- drivers/fpga/spartan2.c | 3 ++- drivers/fpga/spartan3.c | 3 ++- drivers/fpga/versalpl.c | 2 +- drivers/fpga/virtex2.c | 3 ++- drivers/fpga/xilinx.c | 8 +++--- drivers/fpga/zynqmppl.c | 36 ++++++++++++++++++++++++--- drivers/fpga/zynqpl.c | 3 ++- include/fpga.h | 5 ++++ include/xilinx.h | 12 +++++---- 15 files changed, 109 insertions(+), 29 deletions(-) -- 2.35.1

3 24

[PATCH v8 00/14] fpga: zynqmp: Adding support of loading authenticated images
by Oleksandr Suvorov 01 Jun '22

01 Jun '22

This patchset introduces support for the authenticated and encrypted FPGA images on ZynqMP boards, besides that introducing common way to pass the compatible property to any fpga driver. It bases on the initial work by Jorge Ramirez-Ortiz <jorge(a)foundries.io> https://patchwork.ozlabs.org/project/uboot/patch/20211015091506.2602-1-jorg… https://patchwork.ozlabs.org/project/uboot/patch/20211005111324.19749-3-jor… Changes in v8: - Michal Simek's suggestions addressed: -- introduce the compatible flags in xilinx_desc; -- pass a binary compatible flag instead of "compatible" property to an FPGA driver. - Optimize a zynqmp_load() function. Changes in v7: - apply Michal Simek's suggestions As I applied changes on Oleksandr's patches, I indicated it by specifying myself as co-author in the commits logs. I am not sure if that is the convention of marking it. Changes in v6: - add support for the encrypted bitfiles. Changes in v5: - replace ifdef with if() where it's possible. Changes in v4: - change interface to xilinx_desc->operations->open() callback. - fix a bug from previous version of the patchset in dereferencing of a parent fpga_desc structure. Changes in v3: - remove the patch which introduced CMD_SPL_FPGA_LOAD_SECURE. - fix mixing definitions/declarations. - replace strcmp() calls with more secure strncmp(). - document the "u-boot,zynqmp-fpga-ddrauth" compatible string. - fix code style by check-patch recommendations. Changes in v2: - add function fit_fpga_load() to simplify calls of fpga_load() from contexts without a compatible attribute. - move all ZynqMP-specific logic to drivers/fpga/zynqmppl.c - prepare for passing a "compatible" FDT property to any fpga driver. Adrian Fiergolski (1): fpga: zynqmp: support loading encrypted bitfiles Oleksandr Suvorov (12): fpga: add option for loading FPGA secure bitstreams fpga: xilinx: add missed identifier names fpga: xilinx: add bitstream flags to driver desc fpga: zynqmp: add str2flags call fpga: add fpga_compatible2flag fpga: xilinx: pass compatible flags to xilinx_load() fpga: pass compatible flags to fpga_load() spl: fit: pass real compatible flags to fpga_load() fpga: xilinx: pass compatible flags to load() callback fpga: zynqmp: optimize zynqmppl_load() code fpga: zynqmp: add bitstream compatible checking fpga: zynqmp: support loading authenticated images Tom Rini (1): Prepare v2022.07-rc3 Makefile | 2 +- boot/Kconfig | 4 +- boot/image-board.c | 4 +- cmd/Kconfig | 3 +- cmd/fpga.c | 8 +-- common/spl/spl_fit.c | 16 +++-- doc/uImage.FIT/source_file_format.txt | 7 +- drivers/fpga/Kconfig | 14 ++++ drivers/fpga/fpga.c | 33 +++++++++- drivers/fpga/spartan2.c | 2 +- drivers/fpga/spartan3.c | 2 +- drivers/fpga/versalpl.c | 2 +- drivers/fpga/virtex2.c | 2 +- drivers/fpga/xilinx.c | 8 +-- drivers/fpga/zynqmppl.c | 93 ++++++++++++++++++++++----- drivers/fpga/zynqpl.c | 2 +- include/fpga.h | 4 +- include/versalpl.h | 2 +- include/xilinx.h | 19 ++++-- include/zynqmppl.h | 3 +- 20 files changed, 178 insertions(+), 52 deletions(-) -- 2.36.1

1 14

Pull request for efi-2022-07-rc4-3
by Heinrich Schuchardt 31 May '22

31 May '22

Dear Tom, this replaces pull request for efi-2022-07-rc4-2. The following changes since commit 4fe629d2e8bbda5f265e870d771b92be26e885f6: Merge https://source.denx.de/u-boot/custodians/u-boot-riscv (2022-05-27 08:50:42 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2022-07-rc4-3 for you to fetch changes up to e85727ddb68b3b23382ea2d78d857ffa870bb0b7: bootmenu: use utf-8 for menu title (2022-05-31 07:57:02 +0200) ---------------------------------------------------------------- Pull request for efi-2022-07-rc4-3 UEFI: * fix a problem in loading an image from a short-path * fix building the bootmenu command for CONFIG_EFI_LOADER=n * correct the bootefi command syntax * add firmware management protocol to the documentation Others: * bootmenu: fix bootmenu title handling ---------------------------------------------------------------- AKASHI Takahiro (2): efi_loader: disk: add efi_disk_is_removable() efi_loader: bootmgr: fix a problem in loading an image from a short-path Bin Meng (2): doc: sandbox: Correct the memory size config option doc: sandbox: Add a note of disabling LTO when using gdb Heinrich Schuchardt (6): disk: incorrect message in is_gpt_valid() test: restore timeout after bootmenu unit test doc/build/gcc: add more required packages test: fix pylint warnings in test_efi_selftest.py test: don't change console timeout in EFI selftest. cmd/bootefi: correct command syntax Masahisa Kojima (3): bootmenu: U-Boot console is enabled as default lib/charset: fix compile warnings bootmenu: use utf-8 for menu title Sean Anderson (2): valgrind: Disable on Risc-V doc: sandbox: Add additional valgrind documentation Vincent Stehlé (2): efi: fix documentation warnings doc/efi: add firmware management protocol to the documentation Kconfig | 1 + boot/Kconfig | 7 +++ cmd/Kconfig | 10 ---- cmd/bootefi.c | 21 +++++--- cmd/bootmenu.c | 47 ++++++++-------- disk/part_efi.c | 4 +- doc/api/efi.rst | 6 +++ doc/arch/sandbox.rst | 107 +++++++++++++++++++++++++++++++++---- doc/build/gcc.rst | 8 +-- doc/usage/cmd/bootefi.rst | 8 +-- include/charset.h | 2 +- include/efi_loader.h | 3 ++ lib/efi_loader/efi_bootmgr.c | 107 +++++++++++++++++++++++++++++++++++-- lib/efi_loader/efi_disk.c | 27 ++++++++++ lib/efi_loader/efi_firmware.c | 10 ++-- test/py/tests/test_bootmenu.py | 66 +++++++++++------------ test/py/tests/test_efi_selftest.py | 91 ++++++++++--------------------- 17 files changed, 359 insertions(+), 166 deletions(-)

3 2

[PATCH v6 0/2] sf: Check protection before writing/erasing flash
by Jan Kiszka 31 May '22

31 May '22

Changes in v6: - fixed embarrassingly inverted logic in unlock check (and properly tested it this time) Changes in v5: - adjust unused is_locked callback to our is_unlocked needs - use this callback in sf command instead Jan Jan Kiszka (2): mtd: spi: Convert is_locked callback to is_unlocked sf: Query write-protection status before operating the flash cmd/sf.c | 12 ++++++++++++ drivers/mtd/spi/spi-nor-core.c | 26 +++++++++++++------------- include/linux/mtd/spi-nor.h | 6 +++--- 3 files changed, 28 insertions(+), 16 deletions(-) -- 2.34.1

2 4

Pull request for efi-2022-07-rc4-2
by Heinrich Schuchardt 31 May '22

31 May '22

Dear Tom, this replaces pull request for efi-2022-07-rc4. The following changes since commit 4fe629d2e8bbda5f265e870d771b92be26e885f6: Merge https://source.denx.de/u-boot/custodians/u-boot-riscv (2022-05-27 08:50:42 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2022-07-rc4-2 for you to fetch changes up to de8471a30eb399d46412b2037ba76cfa258c6115: bootmenu: use utf-8 for menu title (2022-05-29 13:18:18 +0200) Gitlab CI showed no issues: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/12157 ---------------------------------------------------------------- Pull request for efi-2022-07-rc4-2 UEFI: * fix a problem in loading an image from a short-path * fix building the bootmenu command for CONFIG_EFI_LOADER=n * correct the bootefi command syntax * add firmware management protocol to the documentation Others: * bootmenu: fix bootmenu title handling ---------------------------------------------------------------- AKASHI Takahiro (2): efi_loader: disk: add efi_disk_is_removable() efi_loader: bootmgr: fix a problem in loading an image from a short-path Bin Meng (2): doc: sandbox: Correct the memory size config option doc: sandbox: Add a note of disabling LTO when using gdb Heinrich Schuchardt (6): disk: incorrect message in is_gpt_valid() test: restore timeout after bootmenu unit test doc/build/gcc: add more required packages test: fix pylint warnings in test_efi_selftest.py test: don't change console timeout in EFI selftest. cmd/bootefi: correct command syntax Masahisa Kojima (3): bootmenu: U-Boot console is enabled as default lib/charset: fix compile warnings bootmenu: use utf-8 for menu title Sean Anderson (2): valgrind: Disable on Risc-V doc: sandbox: Add additional valgrind documentation Vincent Stehlé (2): efi: fix documentation warnings doc/efi: add firmware management protocol to the documentation Kconfig | 1 + boot/Kconfig | 7 +++ cmd/Kconfig | 10 ---- cmd/bootefi.c | 21 +++++--- cmd/bootmenu.c | 47 ++++++++-------- disk/part_efi.c | 4 +- doc/api/efi.rst | 6 +++ doc/arch/sandbox.rst | 107 +++++++++++++++++++++++++++++++++---- doc/build/gcc.rst | 8 +-- doc/usage/cmd/bootefi.rst | 8 +-- include/charset.h | 2 +- include/efi_loader.h | 3 ++ lib/efi_loader/efi_bootmgr.c | 107 +++++++++++++++++++++++++++++++++++-- lib/efi_loader/efi_disk.c | 27 ++++++++++ lib/efi_loader/efi_firmware.c | 10 ++-- test/py/tests/test_bootmenu.py | 66 +++++++++++------------ test/py/tests/test_efi_selftest.py | 91 ++++++++++--------------------- 17 files changed, 359 insertions(+), 166 deletions(-)

4 3

[PATCH v1] board: apalis_t30/tk1/colibri_t20/t30: integrate mac address via dt
by Marcel Ziswiler 31 May '22

31 May '22

From: Marcel Ziswiler <marcel.ziswiler(a)toradex.com> Use device tree to set MAC address of the Ethernet chip. Signed-off-by: Marcel Ziswiler <marcel.ziswiler(a)toradex.com> --- board/toradex/apalis-tk1/apalis-tk1.c | 19 +++++++++++++++++++ board/toradex/apalis_t30/apalis_t30.c | 20 ++++++++++++++++++++ board/toradex/colibri_t20/colibri_t20.c | 19 +++++++++++++++++++ board/toradex/colibri_t30/colibri_t30.c | 20 ++++++++++++++++++++ 4 files changed, 78 insertions(+) diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c index ccf665b2118..86b10400ffa 100644 --- a/board/toradex/apalis-tk1/apalis-tk1.c +++ b/board/toradex/apalis-tk1/apalis-tk1.c @@ -14,6 +14,7 @@ #include <asm/arch/gpio.h> #include <asm/arch/pinmux.h> #include <env_internal.h> +#include <fdt_support.h> #include <pci_tegra.h> #include <linux/delay.h> #include <power/as3722.h> @@ -99,6 +100,24 @@ int checkboard(void) #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) int ft_board_setup(void *blob, struct bd_info *bd) { + u8 enetaddr[6]; + + /* MAC addr */ + if (eth_env_get_enetaddr("ethaddr", enetaddr)) { + int err = fdt_find_and_setprop(blob, + "/pcie@1003000/pci@2,0/ethernet@0,0", + "local-mac-address", enetaddr, 6, 0); + + /* Older device trees might have used a different node name */ + if (err < 0) + err = fdt_find_and_setprop(blob, + "/pcie@1003000/pci@2,0/pcie@0", + "local-mac-address", enetaddr, 6, 0); + + if (err >= 0) + puts(" MAC address updated...\n"); + } + return ft_common_board_setup(blob, bd); } #endif diff --git a/board/toradex/apalis_t30/apalis_t30.c b/board/toradex/apalis_t30/apalis_t30.c index 0396eea56b5..ef71270d9f2 100644 --- a/board/toradex/apalis_t30/apalis_t30.c +++ b/board/toradex/apalis_t30/apalis_t30.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <env.h> #include <init.h> #include <log.h> #include <asm/arch/gp_padctrl.h> @@ -16,6 +17,7 @@ #include <asm/io.h> #include <dm.h> #include <i2c.h> +#include <fdt_support.h> #include <pci_tegra.h> #include <linux/delay.h> #include "../common/tdx-common.h" @@ -54,6 +56,24 @@ int checkboard(void) #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) int ft_board_setup(void *blob, struct bd_info *bd) { + u8 enetaddr[6]; + + /* MAC addr */ + if (eth_env_get_enetaddr("ethaddr", enetaddr)) { + int err = fdt_find_and_setprop(blob, + "/pcie@3000/pci@3,0/ethernet@0,0", + "local-mac-address", enetaddr, 6, 0); + + /* Older device trees might have used a different node name */ + if (err < 0) + err = fdt_find_and_setprop(blob, + "/pcie@3000/pci@3,0/pcie@0", + "local-mac-address", enetaddr, 6, 0); + + if (err >= 0) + puts(" MAC address updated...\n"); + } + return ft_common_board_setup(blob, bd); } #endif diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c index 73ef4d2db32..c58d2021cd3 100644 --- a/board/toradex/colibri_t20/colibri_t20.c +++ b/board/toradex/colibri_t20/colibri_t20.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <env.h> #include <init.h> #include <log.h> #include <asm/arch/clock.h> @@ -81,6 +82,24 @@ int checkboard(void) #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) int ft_board_setup(void *blob, struct bd_info *bd) { + u8 enetaddr[6]; + + /* MAC addr */ + if (eth_env_get_enetaddr("ethaddr", enetaddr)) { + int err = fdt_find_and_setprop(blob, + "/usb@7d004000/ethernet@1", + "local-mac-address", enetaddr, 6, 0); + + /* Older device trees might have used a different node name */ + if (err < 0) + err = fdt_find_and_setprop(blob, + "/usb@7d004000/asix@1", + "local-mac-address", enetaddr, 6, 0); + + if (err >= 0) + puts(" MAC address updated...\n"); + } + return ft_common_board_setup(blob, bd); } #endif diff --git a/board/toradex/colibri_t30/colibri_t30.c b/board/toradex/colibri_t30/colibri_t30.c index 20cbb75a365..b6b004669c2 100644 --- a/board/toradex/colibri_t30/colibri_t30.c +++ b/board/toradex/colibri_t30/colibri_t30.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <env.h> #include <init.h> #include <asm/arch/gp_padctrl.h> #include <asm/arch/pinmux.h> @@ -12,6 +13,7 @@ #include <asm/arch-tegra/tegra.h> #include <asm/gpio.h> #include <asm/io.h> +#include <fdt_support.h> #include <i2c.h> #include <linux/delay.h> #include "pinmux-config-colibri_t30.h" @@ -36,6 +38,24 @@ int checkboard(void) #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) int ft_board_setup(void *blob, struct bd_info *bd) { + u8 enetaddr[6]; + + /* MAC addr */ + if (eth_env_get_enetaddr("ethaddr", enetaddr)) { + int err = fdt_find_and_setprop(blob, + "/usb@7d004000/ethernet@1", + "local-mac-address", enetaddr, 6, 0); + + /* Older device trees might have used a different node name */ + if (err < 0) + err = fdt_find_and_setprop(blob, + "/usb@7d004000/asix@1", + "local-mac-address", enetaddr, 6, 0); + + if (err >= 0) + puts(" MAC address updated...\n"); + } + return ft_common_board_setup(blob, bd); } #endif -- 2.34.1

3 2