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 <[email protected]>

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 (file)
index 035c02d..0000000
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 (file)
index a907849..0000000
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 (file)
index ef84c71..0000000
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 a9955b8f927f527c3607c7a12f17b26d77cdd17c..4d1ba372e6a0c267bdf049167be7dcf2ded007fe 100644 (file)
--- 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 (file)
index 0000000..035c02d
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 (file)
index 0000000..a907849
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 (file)
index 0000000..ef84c71
Binary files /dev/null and b/target/linux/rtl838x/files/firmware/rtl838x_phy/rtl838x_8380.fw differ