ramips: unify eeprom file name for the built-in wireless MAC

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 34860

diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
index 21c9f5f886dfe5b15ff1a864d70495bc3727f953..ace4c1acd556887161464a4df6d41f564f6098ef 100644 (file)
--- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
+++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
@@ -28,9 +28,7 @@ rt2x00_eeprom_extract() {
 board=$(ramips_board_name)
 
 case "$FIRMWARE" in
-"RT288X.eeprom" | \
-"RT305X.eeprom" | \
-"RT3883.eeprom")
+"soc_wmac.eeprom")
        case $board in
        dir-300-b1 | \
        dir-600-b1 | \

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/devices.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/devices.c
index 7f4d45019bf8f78bcca01aa4b9ee3074cf250f1e..196810a30f92b101d831c6b0c0702bc7f139167e 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/devices.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/devices.c
@@ -134,7 +134,7 @@ static struct platform_device rt288x_wifi_device = {
 
 void __init rt288x_register_wifi(void)
 {
-       rt288x_wifi_data.eeprom_file_name = "RT288X.eeprom";
+       rt288x_wifi_data.eeprom_file_name = "soc_wmac.eeprom";
        platform_device_register(&rt288x_wifi_device);
 }
 

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c
index a8e0604e340faf8ea012951c1caba5ea0ffcb15a..557eb10c18d520ebc8726467dfcfc7f896647b61 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c
@@ -216,7 +216,8 @@ static struct platform_device rt305x_wifi_device = {
 void __init rt305x_register_wifi(void)
 {
        u32 t;
-       rt305x_wifi_data.eeprom_file_name = "RT305X.eeprom";
+
+       rt305x_wifi_data.eeprom_file_name = "soc_wmac.eeprom";
 
        if (soc_is_rt3352() || soc_is_rt5350()) {
                t = rt305x_sysc_rr(SYSC_REG_SYSTEM_CONFIG);

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt3883/devices.c b/target/linux/ramips/files/arch/mips/ralink/rt3883/devices.c
index fef4cc554e8d51305e691f130ac848e39400c4ff..3a1bf2633322d8d6a300e44a4c5ded986afa2205 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt3883/devices.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt3883/devices.c
@@ -319,7 +319,7 @@ static struct platform_device rt3883_wlan_device = {
 
 void __init rt3883_register_wlan(void)
 {
-       rt3883_wlan_data.eeprom_file_name = "RT3883.eeprom",
+       rt3883_wlan_data.eeprom_file_name = "soc_wmac.eeprom",
        platform_device_register(&rt3883_wlan_device);
 }