From: Andreas Oberritter Date: Mon, 28 Sep 2020 23:26:14 +0000 (+0200) Subject: rtl838x: bundle phy firmware with Linux kernel X-Git-Tag: v21.02.0-rc1~1350 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0c26c9395bafb905a7eab240bdfc52cef686cd62;p=openwrt%2Fstaging%2Fchunkeey.git 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 --- diff --git a/target/linux/rtl838x/base-files/lib/firmware/rtl838x_phy/rtl838x_8214fc.fw b/target/linux/rtl838x/base-files/lib/firmware/rtl838x_phy/rtl838x_8214fc.fw deleted file mode 100644 index 035c02d804..0000000000 Binary files a/target/linux/rtl838x/base-files/lib/firmware/rtl838x_phy/rtl838x_8214fc.fw and /dev/null differ diff --git a/target/linux/rtl838x/base-files/lib/firmware/rtl838x_phy/rtl838x_8218b.fw b/target/linux/rtl838x/base-files/lib/firmware/rtl838x_phy/rtl838x_8218b.fw deleted file mode 100644 index a907849fb9..0000000000 Binary files a/target/linux/rtl838x/base-files/lib/firmware/rtl838x_phy/rtl838x_8218b.fw and /dev/null differ diff --git a/target/linux/rtl838x/base-files/lib/firmware/rtl838x_phy/rtl838x_8380.fw b/target/linux/rtl838x/base-files/lib/firmware/rtl838x_phy/rtl838x_8380.fw deleted file mode 100644 index ef84c71753..0000000000 Binary files a/target/linux/rtl838x/base-files/lib/firmware/rtl838x_phy/rtl838x_8380.fw and /dev/null differ 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/files/firmware/rtl838x_phy/rtl838x_8214fc.fw b/target/linux/rtl838x/files/firmware/rtl838x_phy/rtl838x_8214fc.fw new file mode 100644 index 0000000000..035c02d804 Binary files /dev/null and b/target/linux/rtl838x/files/firmware/rtl838x_phy/rtl838x_8214fc.fw differ diff --git a/target/linux/rtl838x/files/firmware/rtl838x_phy/rtl838x_8218b.fw b/target/linux/rtl838x/files/firmware/rtl838x_phy/rtl838x_8218b.fw new file mode 100644 index 0000000000..a907849fb9 Binary files /dev/null and b/target/linux/rtl838x/files/firmware/rtl838x_phy/rtl838x_8218b.fw differ diff --git a/target/linux/rtl838x/files/firmware/rtl838x_phy/rtl838x_8380.fw b/target/linux/rtl838x/files/firmware/rtl838x_phy/rtl838x_8380.fw new file mode 100644 index 0000000000..ef84c71753 Binary files /dev/null and b/target/linux/rtl838x/files/firmware/rtl838x_phy/rtl838x_8380.fw differ