[openwrt/openwrt] rtl838x: bundle phy firmware with Linux kernel

[LEDE Commits]

blogic pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/0c26c9395bafb905a7eab240bdfc52cef686cd62

commit 0c26c9395bafb905a7eab240bdfc52cef686cd62
Author: Andreas Oberritter <obi at saftware.de>
AuthorDate: Tue Sep 29 01:26:14 2020 +0200

    rtl838x: bundle phy firmware with Linux kernel
    
    Fixes long delay on boot when booting from flash. The driver waits
    for one minute for userspace to load firmware, before it becomes
    available.
    
    Signed-off-by: Andreas Oberritter <obi at saftware.de>
---
 target/linux/rtl838x/config-5.4                             |   2 ++
 .../lib => files}/firmware/rtl838x_phy/rtl838x_8214fc.fw    | Bin
 .../lib => files}/firmware/rtl838x_phy/rtl838x_8218b.fw     | Bin
 .../lib => files}/firmware/rtl838x_phy/rtl838x_8380.fw      | Bin
 4 files changed, 2 insertions(+)

diff --git a/target/linux/rtl838x/config-5.4 b/target/linux/rtl838x/config-5.4
index a9955b8f92..4d1ba372e6 100644
--- a/target/linux/rtl838x/config-5.4
+++ b/target/linux/rtl838x/config-5.4
@@ -53,6 +53,8 @@ CONFIG_DTC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_EFI_EARLYCON=y
 CONFIG_ETHERNET_PACKET_MANGLE=y
+CONFIG_EXTRA_FIRMWARE="rtl838x_phy/rtl838x_8214fc.fw rtl838x_phy/rtl838x_8218b.fw rtl838x_phy/rtl838x_8380.fw"
+CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 CONFIG_FIXED_PHY=y
 CONFIG_FONT_8x16=y
 CONFIG_FONT_AUTOSELECT=y
diff --git a/target/linux/rtl838x/base-files/lib/firmware/rtl838x_phy/rtl838x_8214fc.fw b/target/linux/rtl838x/files/firmware/rtl838x_phy/rtl838x_8214fc.fw
similarity index 100%
rename from target/linux/rtl838x/base-files/lib/firmware/rtl838x_phy/rtl838x_8214fc.fw
rename to target/linux/rtl838x/files/firmware/rtl838x_phy/rtl838x_8214fc.fw
diff --git a/target/linux/rtl838x/base-files/lib/firmware/rtl838x_phy/rtl838x_8218b.fw b/target/linux/rtl838x/files/firmware/rtl838x_phy/rtl838x_8218b.fw
similarity index 100%
rename from target/linux/rtl838x/base-files/lib/firmware/rtl838x_phy/rtl838x_8218b.fw
rename to target/linux/rtl838x/files/firmware/rtl838x_phy/rtl838x_8218b.fw
diff --git a/target/linux/rtl838x/base-files/lib/firmware/rtl838x_phy/rtl838x_8380.fw b/target/linux/rtl838x/files/firmware/rtl838x_phy/rtl838x_8380.fw
similarity index 100%
rename from target/linux/rtl838x/base-files/lib/firmware/rtl838x_phy/rtl838x_8380.fw
rename to target/linux/rtl838x/files/firmware/rtl838x_phy/rtl838x_8380.fw