wifi_drv: use report mechanism in wifi.run
Update the wifi run script to reflect the current configuration mechanism used by the wifi driver. Issue #1439.
This commit is contained in:
parent
9d5b119186
commit
47b0aea30d
|
@ -6,6 +6,9 @@ set build_components {
|
||||||
core init
|
core init
|
||||||
drivers/pci drivers/timer drivers/wifi
|
drivers/pci drivers/timer drivers/wifi
|
||||||
drivers/rtc
|
drivers/rtc
|
||||||
|
server/report_rom
|
||||||
|
server/ram_fs
|
||||||
|
server/fs_rom
|
||||||
test/lwip/http_srv
|
test/lwip/http_srv
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -56,32 +59,53 @@ set config {
|
||||||
</libc>
|
</libc>
|
||||||
</config>
|
</config>
|
||||||
</start>
|
</start>
|
||||||
|
<start name="report_rom">
|
||||||
|
<resource name="RAM" quantum="2M"/>
|
||||||
|
<provides> <service name="Report" /> <service name="ROM" /> </provides>
|
||||||
|
<config> <rom/> </config>
|
||||||
|
</start>
|
||||||
|
<start name="config_fs">
|
||||||
|
<binary name="ram_fs"/>
|
||||||
|
<resource name="RAM" quantum="4M"/>
|
||||||
|
<provides> <service name="File_system"/> </provides>
|
||||||
|
<config>
|
||||||
|
<policy label="config_rom" root="/"/>
|
||||||
|
<policy label="wifi_drv -> config" root="/" writeable="yes"/>
|
||||||
|
<content>
|
||||||
|
<inline name="wlan_configuration">
|
||||||
|
<selected_network ssid="foobar" protection="WPA-PSK" psk="foobarfoobar"/>
|
||||||
|
</inline>
|
||||||
|
<inline name="wpa_supplicant.conf"></inline>
|
||||||
|
</content>
|
||||||
|
</config>
|
||||||
|
</start>
|
||||||
|
<start name="config_rom">
|
||||||
|
<binary name="fs_rom"/>
|
||||||
|
<resource name="RAM" quantum="4M"/>
|
||||||
|
<provides><service name="ROM"/></provides>
|
||||||
|
<route>
|
||||||
|
<service name="File_system"> <child name="config_fs" /> </service>
|
||||||
|
<any-service> <parent/> <any-child/> </any-service>
|
||||||
|
</route>
|
||||||
|
</start>
|
||||||
<start name="wifi_drv">
|
<start name="wifi_drv">
|
||||||
<resource name="RAM" quantum="32M"/>
|
<resource name="RAM" quantum="32M"/>
|
||||||
<provides>
|
<provides> <service name="Nic"/> </provides>
|
||||||
<service name="Nic"/>
|
<config verbose="yes">
|
||||||
</provides>
|
|
||||||
<config mac80211_only="no">
|
|
||||||
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc">
|
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc">
|
||||||
<vfs>
|
<vfs>
|
||||||
<dir name="dev"> <log/> <rtc/>
|
<dir name="dev"> <log/> <rtc/>
|
||||||
<jitterentropy name="random"/>
|
<jitterentropy name="random"/>
|
||||||
<jitterentropy name="urandom"/>
|
<jitterentropy name="urandom"/>
|
||||||
</dir>
|
</dir>
|
||||||
<inline name="wpa_supplicant.conf">
|
<dir name="config"> <fs label="config"/> </dir>
|
||||||
network={
|
|
||||||
id_str="foobar"
|
|
||||||
ssid="foobar"
|
|
||||||
key_mgmt=NONE
|
|
||||||
#key_mgmt=WPA-PSK
|
|
||||||
#psk="foobarfoobar"
|
|
||||||
}
|
|
||||||
</inline>
|
|
||||||
</vfs>
|
</vfs>
|
||||||
</libc>
|
</libc>
|
||||||
</config>
|
</config>
|
||||||
<route>
|
<route>
|
||||||
<service name="Rtc"> <any-child /> </service>
|
<service name="Rtc"> <any-child /> </service>
|
||||||
|
<service name="File_system"> <child name="config_fs"/> </service>
|
||||||
|
<service name="ROM"> <if-arg key="label" value="wlan_configuration" /> <child name="config_rom" /> </service>
|
||||||
<any-service> <parent/> <any-child /> </any-service>
|
<any-service> <parent/> <any-child /> </any-service>
|
||||||
</route>
|
</route>
|
||||||
</start>}
|
</start>}
|
||||||
|
@ -132,24 +156,14 @@ set firmware_modules {
|
||||||
iwlwifi-7260-8.ucode
|
iwlwifi-7260-8.ucode
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach f $firmware_modules {
|
|
||||||
if ![file exists bin/$f] {
|
|
||||||
puts ""
|
|
||||||
puts "The iwlwifi driver needs the following list of firmware images to work."
|
|
||||||
puts " $firmware_modules"
|
|
||||||
puts "Please download the images from http://wireless.kernel.org/en/users/Drivers/iwlwifi into './bin'."
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Boot modules
|
# Boot modules
|
||||||
#
|
#
|
||||||
|
|
||||||
# generic modules
|
# generic modules
|
||||||
set boot_modules {
|
set boot_modules {
|
||||||
core init timer rtc_drv vfs_jitterentropy.lib.so
|
core init timer rtc_drv ram_fs report_rom fs_rom
|
||||||
|
vfs_jitterentropy.lib.so
|
||||||
ld.lib.so
|
ld.lib.so
|
||||||
libc.lib.so libcrypto.lib.so libssl.lib.so
|
libc.lib.so libcrypto.lib.so libssl.lib.so
|
||||||
wpa_driver_nl80211.lib.so wpa_supplicant.lib.so
|
wpa_driver_nl80211.lib.so wpa_supplicant.lib.so
|
||||||
|
|
Loading…
Reference in New Issue