diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-12-22 16:09:03 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-12-22 16:09:03 +0000 |
| commit | aaeed76ded1ef1341faa16179fe2d6efd10fbbb1 (patch) | |
| tree | 8671e8ddf80585664134680beaab966d157f00ad | |
| parent | 5c49a649609bd694c6484d852e2ff151d960cdc4 (diff) | |
| download | upstream-aaeed76ded1ef1341faa16179fe2d6efd10fbbb1.tar.gz upstream-aaeed76ded1ef1341faa16179fe2d6efd10fbbb1.tar.bz2 upstream-aaeed76ded1ef1341faa16179fe2d6efd10fbbb1.zip | |
ramips: unify eeprom file name for the built-in wireless MAC
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34860 3c298f89-4303-0410-b956-a3cf2f4a3e73
4 files changed, 5 insertions, 6 deletions
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 21c9f5f886..ace4c1acd5 100644 --- 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 7f4d45019b..196810a30f 100644 --- 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 a8e0604e34..557eb10c18 100644 --- 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 fef4cc554e..3a1bf26333 100644 --- 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); } |