Hello community, here is the log from the commit of package u-boot for openSUSE:Factory checked in at 2018-03-19 23:37:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/u-boot (Old) and /work/SRC/openSUSE:Factory/.u-boot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "u-boot" Mon Mar 19 23:37:26 2018 rev:94 rq:587600 version:2018.03 Changes: -------- --- /work/SRC/openSUSE:Factory/u-boot/u-boot-a10-olinuxino-lime.changes 2018-01-31 19:50:53.868250180 +0100 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-a10-olinuxino-lime.changes 2018-03-19 23:37:39.362916442 +0100 @@ -1,0 +2,47 @@ +Thu Mar 15 16:34:22 UTC 2018 - [email protected] + +- Enable new RPi3 B+ (bsc#1085262) +- Fix network boot (bsc#1070775) +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.03 +* Patches added: + 0005-rpi3-Enable-lan78xx-driver.patch + 0006-net-Only-access-network-devices-aft.patch + 0007-rpi-Add-identifier-for-the-new-RPi3.patch + 0008-efi_loader-Fix-network-DP-with-DM_E.patch + +------------------------------------------------------------------- +Wed Mar 14 15:13:44 UTC 2018 - [email protected] + +- Updated to 2018.03 + +------------------------------------------------------------------- +Tue Mar 6 13:26:21 UTC 2018 - [email protected] + +- Updated to 2018.03-rc4 + +------------------------------------------------------------------- +Thu Feb 22 08:43:30 UTC 2018 - [email protected] + +- Updated to 2018.03-rc3 + +------------------------------------------------------------------- +Wed Feb 21 16:48:20 UTC 2018 - [email protected] + +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.03 +* Patches added: + 0004-rpi-Use-firmware-provided-device-tr.patch + +------------------------------------------------------------------- +Tue Feb 13 12:26:59 UTC 2018 - [email protected] + +- Updated to 2018.03-rc2 + +------------------------------------------------------------------- +Tue Jan 30 07:48:10 UTC 2018 - [email protected] + +- Updated to 2018.03-rc1 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.03 +* Patches dropped: + 0004-Fix-MMC1-external-SD-slot-on-Samsun.patch (Fixed upstream) + +------------------------------------------------------------------- u-boot-a13-olinuxino.changes: same change u-boot-a13-olinuxinom.changes: same change u-boot-a20-olinuxino-lime.changes: same change u-boot-a20-olinuxino-lime2.changes: same change u-boot-a20-olinuxinomicro.changes: same change u-boot-am335xboneblack.changes: same change u-boot-am335xevm.changes: same change u-boot-am57xxevm.changes: same change u-boot-arndale.changes: same change u-boot-bananapi.changes: same change u-boot-clearfog.changes: same change u-boot-colibrit20.changes: same change u-boot-cubieboard.changes: same change u-boot-cubieboard2.changes: same change u-boot-cubietruck.changes: same change u-boot-dragonboard410c.changes: same change u-boot-evb-rk3399.changes: same change u-boot-firefly-rk3288.changes: same change u-boot-firefly-rk3399.changes: same change u-boot-geekbox.changes: same change u-boot-highbank.changes: same change u-boot-hikey.changes: same change u-boot-hyundaia7hd.changes: same change u-boot-jetson-tk1.changes: same change u-boot-lamobor1.changes: same change u-boot-ls1012afrdmqspi.changes: same change u-boot-melea1000.changes: same change u-boot-merriia80optimus.changes: same change u-boot-mvebudb-88f3720.changes: same change u-boot-mvebudbarmada8k.changes: same change u-boot-mvebuespressobin-88f3720.changes: same change u-boot-mvebumcbin-88f8040.changes: same change u-boot-mx53loco.changes: same change u-boot-mx6cuboxi.changes: same change u-boot-mx6qsabrelite.changes: same change u-boot-nanopia64.changes: same change u-boot-nanopineo.changes: same change u-boot-nanopineoair.changes: same change u-boot-odroid-c2.changes: same change u-boot-odroid-xu3.changes: same change u-boot-odroid.changes: same change u-boot-omap3beagle.changes: same change u-boot-omap4panda.changes: same change u-boot-orangepipc.changes: same change u-boot-orangepipc2.changes: same change u-boot-p2371-2180.changes: same change u-boot-paz00.changes: same change u-boot-pcm051rev3.changes: same change u-boot-pine64plus.changes: same change u-boot-qemu-ppce500.changes: same change u-boot-rpi.changes: same change u-boot-rpi2.changes: same change u-boot-rpi3.changes: same change u-boot-rpi332b.changes: same change u-boot-sinovoipbpim2plus.changes: same change u-boot-snow.changes: same change u-boot-socfpgade0nanosoc.changes: same change u-boot-spring.changes: same change u-boot-tinker-rk3288.changes: same change u-boot-turrisomnia.changes: same change u-boot-udoo.changes: same change u-boot-udooneo.changes: same change u-boot.changes: same change Old: ---- 0004-Fix-MMC1-external-SD-slot-on-Samsun.patch u-boot-2018.01.tar.bz2 u-boot-2018.01.tar.bz2.sig New: ---- 0004-rpi-Use-firmware-provided-device-tr.patch 0005-rpi3-Enable-lan78xx-driver.patch 0006-net-Only-access-network-devices-aft.patch 0007-rpi-Add-identifier-for-the-new-RPi3.patch 0008-efi_loader-Fix-network-DP-with-DM_E.patch u-boot-2018.03.tar.bz2 u-boot-2018.03.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ u-boot-a10-olinuxino-lime.spec ++++++ --- /var/tmp/diff_new_pack.lu1Pkv/_old 2018-03-19 23:37:45.238704478 +0100 +++ /var/tmp/diff_new_pack.lu1Pkv/_new 2018-03-19 23:37:45.238704478 +0100 @@ -32,10 +32,10 @@ %endif # archive_version differs from version for RC version only -%define archive_version 2018.01 +%define archive_version 2018.03 Name: u-boot-a10-olinuxino-lime -Version: 2018.01 +Version: 2018.03 Release: 0 Summary: The U-Boot firmware for the a10-olinuxino-lime platform License: GPL-2.0 @@ -49,7 +49,11 @@ Patch0001: 0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch Patch0002: 0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch Patch0003: 0003-Revert-rockchip-mkimage-remove-plac.patch -Patch0004: 0004-Fix-MMC1-external-SD-slot-on-Samsun.patch +Patch0004: 0004-rpi-Use-firmware-provided-device-tr.patch +Patch0005: 0005-rpi3-Enable-lan78xx-driver.patch +Patch0006: 0006-net-Only-access-network-devices-aft.patch +Patch0007: 0007-rpi-Add-identifier-for-the-new-RPi3.patch +Patch0008: 0008-efi_loader-Fix-network-DP-with-DM_E.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0 BuildRequires: arm-trusted-firmware-pine64 @@ -98,6 +102,10 @@ %patch0002 -p1 %patch0003 -p1 %patch0004 -p1 +%patch0005 -p1 +%patch0006 -p1 +%patch0007 -p1 +%patch0008 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) u-boot-a13-olinuxino.spec: same change u-boot-a13-olinuxinom.spec: same change u-boot-a20-olinuxino-lime.spec: same change u-boot-a20-olinuxino-lime2.spec: same change u-boot-a20-olinuxinomicro.spec: same change u-boot-am335xboneblack.spec: same change u-boot-am335xevm.spec: same change u-boot-am57xxevm.spec: same change u-boot-arndale.spec: same change u-boot-bananapi.spec: same change u-boot-clearfog.spec: same change u-boot-colibrit20.spec: same change u-boot-cubieboard.spec: same change u-boot-cubieboard2.spec: same change u-boot-cubietruck.spec: same change u-boot-dragonboard410c.spec: same change u-boot-evb-rk3399.spec: same change u-boot-firefly-rk3288.spec: same change u-boot-firefly-rk3399.spec: same change u-boot-geekbox.spec: same change u-boot-highbank.spec: same change u-boot-hikey.spec: same change u-boot-hyundaia7hd.spec: same change u-boot-jetson-tk1.spec: same change u-boot-lamobor1.spec: same change u-boot-ls1012afrdmqspi.spec: same change u-boot-melea1000.spec: same change u-boot-merriia80optimus.spec: same change u-boot-mvebudb-88f3720.spec: same change u-boot-mvebudbarmada8k.spec: same change u-boot-mvebuespressobin-88f3720.spec: same change u-boot-mvebumcbin-88f8040.spec: same change u-boot-mx53loco.spec: same change u-boot-mx6cuboxi.spec: same change u-boot-mx6qsabrelite.spec: same change u-boot-nanopia64.spec: same change u-boot-nanopineo.spec: same change u-boot-nanopineoair.spec: same change u-boot-odroid-c2.spec: same change u-boot-odroid-xu3.spec: same change u-boot-odroid.spec: same change u-boot-omap3beagle.spec: same change u-boot-omap4panda.spec: same change u-boot-orangepipc.spec: same change u-boot-orangepipc2.spec: same change u-boot-p2371-2180.spec: same change u-boot-paz00.spec: same change u-boot-pcm051rev3.spec: same change u-boot-pine64plus.spec: same change u-boot-qemu-ppce500.spec: same change u-boot-rpi.spec: same change u-boot-rpi2.spec: same change u-boot-rpi3.spec: same change u-boot-rpi332b.spec: same change u-boot-sinovoipbpim2plus.spec: same change u-boot-snow.spec: same change u-boot-socfpgade0nanosoc.spec: same change u-boot-spring.spec: same change u-boot-tinker-rk3288.spec: same change u-boot-turrisomnia.spec: same change u-boot-udoo.spec: same change u-boot-udooneo.spec: same change ++++++ u-boot.spec ++++++ --- /var/tmp/diff_new_pack.lu1Pkv/_old 2018-03-19 23:37:47.102637237 +0100 +++ /var/tmp/diff_new_pack.lu1Pkv/_new 2018-03-19 23:37:47.106637094 +0100 @@ -19,10 +19,10 @@ # 'archive_version' differs from 'version' for RC version only -%define archive_version 2018.01 +%define archive_version 2018.03 Name: u-boot -Version: 2018.01 +Version: 2018.03 Release: 0 Summary: Tools for the U-Boot Firmware License: GPL-2.0 ++++++ 0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch ++++++ --- /var/tmp/diff_new_pack.lu1Pkv/_old 2018-03-19 23:37:47.126636372 +0100 +++ /var/tmp/diff_new_pack.lu1Pkv/_new 2018-03-19 23:37:47.130636228 +0100 @@ -1,4 +1,4 @@ -From 39b8c870cb0fe26a155f667e9f3244bcb9ad4370 Mon Sep 17 00:00:00 2001 +From f9856b798578670b682889a05a9e4df078a53dd6 Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Wed, 13 Apr 2016 13:44:29 +0200 Subject: [PATCH] XXX openSUSE XXX: Load dtb from partition 2 @@ -16,10 +16,10 @@ 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h -index 5c469a23fa..ee286f04ca 100644 +index f567cebd38..96b05aeeed 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h -@@ -130,16 +130,16 @@ +@@ -135,16 +135,16 @@ "fi\0" \ \ "load_efi_dtb=" \ ++++++ 0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch ++++++ --- /var/tmp/diff_new_pack.lu1Pkv/_old 2018-03-19 23:37:47.138635939 +0100 +++ /var/tmp/diff_new_pack.lu1Pkv/_new 2018-03-19 23:37:47.138635939 +0100 @@ -1,4 +1,4 @@ -From 32137ec9752a551769d465a214b1e6a3940365cb Mon Sep 17 00:00:00 2001 +From ac419f82c82becdd6ee09bd3c5574a181deff939 Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Mon, 2 May 2016 23:25:07 +0200 Subject: [PATCH] Revert "Revert "omap3: Use raw SPL by default for mmc1"" @@ -9,7 +9,7 @@ 1 file changed, 2 deletions(-) diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c -index 26245aa169..15a78b8cf7 100644 +index db68a9d7e2..d246ebc12d 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c @@ -134,8 +134,6 @@ void save_omap_boot_params(void) ++++++ 0003-Revert-rockchip-mkimage-remove-plac.patch ++++++ --- /var/tmp/diff_new_pack.lu1Pkv/_old 2018-03-19 23:37:47.154635361 +0100 +++ /var/tmp/diff_new_pack.lu1Pkv/_new 2018-03-19 23:37:47.154635361 +0100 @@ -1,4 +1,4 @@ -From 56a11c1430c4057f207cacad283eece724e7f587 Mon Sep 17 00:00:00 2001 +From f45226d20a4bcdeedc3226f272ecd07ed9fa743c Mon Sep 17 00:00:00 2001 From: Guillaume GARDET <[email protected]> Date: Thu, 22 Jun 2017 10:04:06 +0200 Subject: [PATCH] Revert 'rockchip: mkimage: remove placeholder functions from ++++++ 0004-rpi-Use-firmware-provided-device-tr.patch ++++++ >From 9bdcbebe4b666a372d86a9832db4aca036fa6423 Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Wed, 21 Feb 2018 17:41:13 +0100 Subject: [PATCH] rpi: Use firmware provided device tree Currently the firmware generates a device tree for us that we could just use to adjust ourselves. We then on boot throw that away and use our own built-in device tree to configure device access. This is bad for a multitude of reasons. For starters, it breaks overlay support in config.txt, confusing users. Much worse however is that we are stuck with individual U-Boot builds per board. The firmware can easily give us the right DT depending on the target board and revision though. So let's use the firmware provided device tree instead. That way U-Boot as well as payloads loaded by it can automatically adapt to variants of RPi hardware. Signed-off-by: Alexander Graf <[email protected]> --- configs/rpi_0_w_defconfig | 2 +- configs/rpi_2_defconfig | 2 +- configs/rpi_3_32b_defconfig | 2 +- configs/rpi_3_defconfig | 2 +- configs/rpi_defconfig | 2 +- include/configs/rpi.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig index 04717d5e50..3b7e4f7ad9 100644 --- a/configs/rpi_0_w_defconfig +++ b/configs/rpi_0_w_defconfig @@ -12,7 +12,7 @@ CONFIG_SYS_PROMPT="U-Boot> " CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y -CONFIG_OF_EMBED=y +CONFIG_OF_BOARD=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_DM_KEYBOARD=y diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig index f8203c9d47..de9c0e1937 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -12,7 +12,7 @@ CONFIG_SYS_PROMPT="U-Boot> " CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y -CONFIG_OF_EMBED=y +CONFIG_OF_BOARD=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_DM_KEYBOARD=y diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig index 317fc28f71..2bbe687359 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig @@ -13,7 +13,7 @@ CONFIG_SYS_PROMPT="U-Boot> " CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y -CONFIG_OF_EMBED=y +CONFIG_OF_BOARD=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_DM_KEYBOARD=y diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig index 0f3a54ec9a..ca55f8dc66 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -13,7 +13,7 @@ CONFIG_SYS_PROMPT="U-Boot> " CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y -CONFIG_OF_EMBED=y +CONFIG_OF_BOARD=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_DM_KEYBOARD=y diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig index d13d3d3e2e..d75032c420 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig @@ -12,7 +12,7 @@ CONFIG_SYS_PROMPT="U-Boot> " CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y -CONFIG_OF_EMBED=y +CONFIG_OF_BOARD=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_DM_KEYBOARD=y diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 17cdecd1c3..bea4ab1b9a 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -125,7 +125,7 @@ #define ENV_MEM_LAYOUT_SETTINGS \ "fdt_high=ffffffff\0" \ "initrd_high=ffffffff\0" \ - "fdt_addr_r=0x00000100\0" \ + "fdt_addr_r=0x01f00000\0" \ "pxefile_addr_r=0x00100000\0" \ "kernel_addr_r=0x01000000\0" \ "scriptaddr=0x02000000\0" \ ++++++ 0005-rpi3-Enable-lan78xx-driver.patch ++++++ >From e75d103c47d687ecc49cb522833084ebf5da04fd Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Thu, 15 Mar 2018 09:54:10 +0100 Subject: [PATCH] rpi3: Enable lan78xx driver The new Raspberry Pi B 3+ has a lan78xx device attached to it. Let's add driver support in U-Boot for it. Signed-off-by: Alexander Graf <[email protected]> --- configs/rpi_3_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig index ca55f8dc66..1ee04c68f8 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -36,3 +36,5 @@ CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_PHYLIB=y +CONFIG_USB_ETHER_LAN78XX=y ++++++ 0006-net-Only-access-network-devices-aft.patch ++++++ >From 18d741c98c7fdeca3c8ed1df40bd35fbebaa8571 Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Thu, 15 Mar 2018 11:02:33 +0100 Subject: [PATCH] net: Only access network devices after init In the efi_loader main loop we call eth_rx() occasionally. This rx function might end up calling into devices that haven't been initialized yet, potentially resulting in a lot of transfer timeouts. Instead, let's make sure the ethernet device is actually initialized before reading from or writing to it. Signed-off-by: Alexander Graf <[email protected]> --- net/eth-uclass.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/eth-uclass.c b/net/eth-uclass.c index d30b04ba86..240b596534 100644 --- a/net/eth-uclass.c +++ b/net/eth-uclass.c @@ -336,7 +336,7 @@ int eth_send(void *packet, int length) if (!current) return -ENODEV; - if (!device_active(current)) + if (!eth_is_active(current)) return -EINVAL; ret = eth_get_ops(current)->send(current, packet, length); @@ -359,7 +359,7 @@ int eth_rx(void) if (!current) return -ENODEV; - if (!device_active(current)) + if (!eth_is_active(current)) return -EINVAL; /* Process up to 32 packets at one time */ ++++++ 0007-rpi-Add-identifier-for-the-new-RPi3.patch ++++++ >From 3cb00841e501f6fce91dd9133f6fdfbf2cdd4d39 Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Thu, 15 Mar 2018 11:05:46 +0100 Subject: [PATCH] rpi: Add identifier for the new RPi3 B+ The Raspberr Pi Foundation released a new RPi3 version which we want to detect as well, so we can enable ethernet on it and know the correct device tree file name. Add an identifier for it. Signed-off-by: Alexander Graf <[email protected]> --- board/raspberrypi/rpi/rpi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 177f4af265..279a9c3cda 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -111,6 +111,11 @@ static const struct rpi_model rpi_models_new_scheme[] = { DTB_DIR "bcm2835-rpi-zero-w.dtb", false, }, + [0xD] = { + "3 Model B+", + DTB_DIR "bcm2837-rpi-3-b-plus.dtb", + true, + }, }; static const struct rpi_model rpi_models_old_scheme[] = { ++++++ 0008-efi_loader-Fix-network-DP-with-DM_E.patch ++++++ >From 8826cedd1df8cf82da69dce55e837f6498208ce9 Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Thu, 15 Mar 2018 17:28:10 +0100 Subject: [PATCH] efi_loader: Fix network DP with DM_ETH When CONFIG_DM_ETH is set, we assemble the device path properly with a full device hierarchy. Our helper function dp_fill() even put the MAC node itself in it for us. However, for non-DM compatibility we also have code in that added the MAC node manually. That code now runs on top of the existing MAC node: Handle 0x3db2f6b0 /HardwareVendor(e61d73b9-a384-4acc-aeab-82e828f3628b)[0: ] /USBClass(0,0,9,0,0)/USBClass(424,9514,9,0,2)/MacAddr(b8:27:eb:e1:81:47,1) /MacAddr(b8:27:eb:e1:81:47,57)/EndEntire We obviously don't need the additional node and in fact, grub chokes on it and fails to match the DP against the ethernet device node. So this patch moves the additional MAC node into the non-DM code path: Handle 0x3db3fde0 /HardwareVendor(e61d73b9-a384-4acc-aeab-82e828f3628b)[0: ] /USBClass(0,0,9,0,0)/USBClass(424,9514,9,0,2)/MacAddr(b8:27:eb:e1:81:47,1) /EndEntire While at it, we also mark the non-DM MAC node as ethernet. Fixes: b66c60dde9d ("efi_loader: add device-path utils") Signed-off-by: Alexander Graf <[email protected]> --- lib/efi_loader/efi_device_path.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c index 3c735e60d3..22627824f0 100644 --- a/lib/efi_loader/efi_device_path.c +++ b/lib/efi_loader/efi_device_path.c @@ -749,7 +749,9 @@ struct efi_device_path *efi_dp_from_file(struct blk_desc *desc, int part, #ifdef CONFIG_CMD_NET struct efi_device_path *efi_dp_from_eth(void) { +#ifndef CONFIG_DM_ETH struct efi_device_path_mac_addr *ndp; +#endif void *buf, *start; unsigned dpsize = 0; @@ -759,8 +761,8 @@ struct efi_device_path *efi_dp_from_eth(void) dpsize += dp_size(eth_get_dev()); #else dpsize += sizeof(ROOT); -#endif dpsize += sizeof(*ndp); +#endif start = buf = dp_alloc(dpsize + sizeof(END)); if (!buf) @@ -771,14 +773,15 @@ struct efi_device_path *efi_dp_from_eth(void) #else memcpy(buf, &ROOT, sizeof(ROOT)); buf += sizeof(ROOT); -#endif ndp = buf; ndp->dp.type = DEVICE_PATH_TYPE_MESSAGING_DEVICE; ndp->dp.sub_type = DEVICE_PATH_SUB_TYPE_MSG_MAC_ADDR; ndp->dp.length = sizeof(*ndp); + ndp->if_type = 1; /* Ethernet */ memcpy(ndp->mac.addr, eth_get_ethaddr(), ARP_HLEN); buf = &ndp[1]; +#endif *((struct efi_device_path *)buf) = END; ++++++ u-boot-2018.01.tar.bz2 -> u-boot-2018.03.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/u-boot/u-boot-2018.01.tar.bz2 /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-2018.03.tar.bz2 differ: char 11, line 1 ++++++ u-boot.spec.in ++++++ --- /var/tmp/diff_new_pack.lu1Pkv/_old 2018-03-19 23:37:47.610618912 +0100 +++ /var/tmp/diff_new_pack.lu1Pkv/_new 2018-03-19 23:37:47.610618912 +0100 @@ -1,7 +1,7 @@ # # spec file for package u-boot-BOARDNAME # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon # Copyright (c) 2007-2010 by Silvan Calarco <[email protected]> # ++++++ update_git.sh ++++++ --- /var/tmp/diff_new_pack.lu1Pkv/_old 2018-03-19 23:37:47.634618047 +0100 +++ /var/tmp/diff_new_pack.lu1Pkv/_new 2018-03-19 23:37:47.638617902 +0100 @@ -13,8 +13,8 @@ GIT_TREE=git://github.com/openSUSE/u-boot.git GIT_LOCAL_TREE=~/git/u-boot-opensuse -GIT_BRANCH=tumbleweed-2018.01 -GIT_UPSTREAM_TAG=v2018.01 +GIT_BRANCH=tumbleweed-2018.03 +GIT_UPSTREAM_TAG=v2018.03 GIT_DIR=/dev/shm/u-boot-factory-git-dir CMP_DIR=/dev/shm/u-boot-factory-cmp-dir
