Skip to content

Commit b3c4b93

Browse files
committed
[LINUX] Adapted the config to enable WiFi from module (static sometimes fails).
Add --rpi-wifi-ap to allow the WLAN on the RPI3 to act as an AccessPoint (usefull for 4G :-) Add an aditional version to the build WPEFramework. Add a network to the dnsmasq module, in case the WiFi needs to give out IP addresses (usefull for 4G :-)
1 parent 7ed4841 commit b3c4b93

File tree

7 files changed

+72
-14
lines changed

7 files changed

+72
-14
lines changed

board/raspberrypi/post-build.sh

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,42 @@ __EOF__
2222
ctrl_interface=/var/run/wpa_supplicant
2323
ap_scan=1
2424
25+
__EOF__
26+
fi
27+
;;
28+
--rpi-wifi-ap)
29+
if ! grep -qE '^auto wlan0' "${TARGET_DIR}/etc/network/interfaces"; then
30+
echo "Adding 'wlan0 network' functionality to /etc/network/interfaces as Access Point."
31+
cat << __EOF__ >> "${TARGET_DIR}/etc/network/interfaces"
32+
33+
auto wlan0
34+
iface wlan0 inet static
35+
pre-up wpa_supplicant -Dnl80211 -iwlan0 -c/etc/wpa_supplicant.conf -B
36+
down killall wpa_supplicant
37+
address 192.168.20.1
38+
netmask 255.255.255.0
39+
__EOF__
40+
cat << __EOF__ > "${TARGET_DIR}/etc/wpa_supplicant.conf"
41+
ctrl_interface=/var/run/wpa_supplicant
42+
ap_scan=1
43+
ctrl_interface_group=0
44+
fast_reauth=1
45+
update_config=1
46+
47+
network={
48+
ssid="WiFiRasp"
49+
mode=2
50+
frequency=2412
51+
key_mgmt=WPA-PSK
52+
proto=RSN
53+
pairwise=CCMP
54+
psk="12345678"
55+
}
2556
__EOF__
2657
fi
2758
;;
2859
esac
60+
2961
done
3062

3163
# Add a console on tty1

board/raspberrypi/post-image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ dtoverlay=lirc-rpi,gpio_in_pin=23,gpio_out_pin=22
110110
__EOF__
111111
fi
112112
;;
113-
--rpi-wifi)
113+
--rpi-wifi*)
114114
if ! grep -qE '^dtoverlay=sdtweak' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
115115
echo "Adding 'rpi wifi' functionality to config.txt."
116116
cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"

board/raspberrypi/rpi23-linux-4.9.config

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,19 @@ CONFIG_SYN_COOKIES=y
4141
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
4242
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
4343
# CONFIG_INET_XFRM_MODE_BEET is not set
44+
# CONFIG_INET_DIAG is not set
4445
CONFIG_IPV6_MULTIPLE_TABLES=y
46+
CONFIG_NETFILTER=y
47+
# CONFIG_NETFILTER_INGRESS is not set
48+
CONFIG_NF_CONNTRACK=y
49+
# CONFIG_NF_CONNTRACK_PROCFS is not set
50+
CONFIG_NF_CONNTRACK_IPV4=y
51+
CONFIG_IP_NF_IPTABLES=y
52+
CONFIG_IP_NF_FILTER=y
53+
CONFIG_IP_NF_TARGET_REJECT=y
54+
CONFIG_IP_NF_NAT=y
55+
CONFIG_IP_NF_TARGET_MASQUERADE=y
4556
CONFIG_VLAN_8021Q=y
46-
CONFIG_BPF_JIT=y
4757
CONFIG_BT=y
4858
CONFIG_BT_HCIUART=y
4959
CONFIG_BT_HCIUART_BCM=y
@@ -100,10 +110,11 @@ CONFIG_USB_NET_SMSC95XX=y
100110
# CONFIG_USB_NET_NET1080 is not set
101111
# CONFIG_USB_NET_CDC_SUBSET is not set
102112
# CONFIG_USB_NET_ZAURUS is not set
113+
CONFIG_USB_NET_QMI_WWAN=m
103114
# CONFIG_WLAN_VENDOR_ADMTEK is not set
104115
# CONFIG_WLAN_VENDOR_ATH is not set
105116
# CONFIG_WLAN_VENDOR_ATMEL is not set
106-
CONFIG_BRCMFMAC=y
117+
CONFIG_BRCMFMAC=m
107118
CONFIG_BRCMFMAC_USB=y
108119
# CONFIG_WLAN_VENDOR_CISCO is not set
109120
# CONFIG_WLAN_VENDOR_INTEL is not set
@@ -120,9 +131,6 @@ CONFIG_BRCMFMAC_USB=y
120131
CONFIG_INPUT_EVDEV=y
121132
# CONFIG_INPUT_KEYBOARD is not set
122133
# CONFIG_INPUT_MOUSE is not set
123-
CONFIG_INPUT_JOYSTICK=y
124-
CONFIG_INPUT_TOUCHSCREEN=y
125-
CONFIG_TOUCHSCREEN_RPI_FT5406=y
126134
CONFIG_INPUT_MISC=y
127135
CONFIG_INPUT_UINPUT=y
128136
# CONFIG_SERIO is not set
@@ -134,6 +142,8 @@ CONFIG_BCM_VC_SM=y
134142
# CONFIG_BCM2835_SMI_DEV is not set
135143
# CONFIG_LEGACY_PTYS is not set
136144
# CONFIG_DEVKMEM is not set
145+
CONFIG_SERIAL_AMBA_PL011=y
146+
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
137147
CONFIG_HW_RANDOM=y
138148
CONFIG_RAW_DRIVER=y
139149
CONFIG_I2C_CHARDEV=y
@@ -157,12 +167,11 @@ CONFIG_MEDIA_SUPPORT=y
157167
CONFIG_MEDIA_CAMERA_SUPPORT=y
158168
CONFIG_V4L_PLATFORM_DRIVERS=y
159169
CONFIG_VIDEO_BCM2835=y
160-
CONFIG_DRM=y
161-
CONFIG_DRM_VC4=m
170+
CONFIG_FB=y
162171
CONFIG_FIRMWARE_EDID=y
163-
CONFIG_FB_MODE_HELPERS=y
164172
CONFIG_FB_BCM2708=y
165173
CONFIG_FRAMEBUFFER_CONSOLE=y
174+
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
166175
CONFIG_LOGO=y
167176
# CONFIG_LOGO_LINUX_MONO is not set
168177
# CONFIG_LOGO_LINUX_VGA16 is not set
@@ -182,6 +191,9 @@ CONFIG_USB_ACM=y
182191
CONFIG_USB_SERIAL=y
183192
CONFIG_USB_SERIAL_GENERIC=y
184193
CONFIG_USB_SERIAL_FTDI_SIO=m
194+
CONFIG_USB_SERIAL_QCAUX=m
195+
CONFIG_USB_SERIAL_QUALCOMM=m
196+
CONFIG_USB_SERIAL_OPTION=m
185197
CONFIG_MMC=y
186198
CONFIG_MMC_BLOCK_MINORS=32
187199
CONFIG_MMC_BCM2835=y
@@ -200,13 +212,14 @@ CONFIG_RASPBERRYPI_POWER=y
200212
CONFIG_RASPBERRYPI_FIRMWARE=y
201213
CONFIG_EXT2_FS=y
202214
CONFIG_EXT3_FS=y
203-
CONFIG_FANOTIFY=y
204215
CONFIG_MSDOS_FS=y
205216
CONFIG_VFAT_FS=y
206217
CONFIG_FAT_DEFAULT_CODEPAGE=850
207218
CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
208219
CONFIG_TMPFS=y
209220
CONFIG_TMPFS_POSIX_ACL=y
221+
# CONFIG_MISC_FILESYSTEMS is not set
222+
# CONFIG_NETWORK_FILESYSTEMS is not set
210223
CONFIG_NLS_DEFAULT="utf8"
211224
CONFIG_NLS_CODEPAGE_437=y
212225
CONFIG_NLS_CODEPAGE_850=y
@@ -216,7 +229,10 @@ CONFIG_NLS_ISO8859_15=y
216229
CONFIG_NLS_UTF8=y
217230
CONFIG_STRIP_ASM_SYMS=y
218231
CONFIG_PANIC_ON_OOPS=y
219-
CONFIG_STRICT_DEVMEM=y
232+
# CONFIG_SCHED_DEBUG is not set
233+
# CONFIG_DEBUG_BUGVERBOSE is not set
234+
# CONFIG_FTRACE is not set
235+
# CONFIG_ARM_UNWIND is not set
220236
CONFIG_CRYPTO_ECHAINIV=y
221237
CONFIG_CRYPTO_ANSI_CPRNG=y
222238
# CONFIG_CRYPTO_HW is not set
Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
ctrl_interface=/var/run/wpa_supplicant
2+
ctrl_interface_group=0
3+
fast_reauth=1
4+
update_config=1
25
ap_scan=1
36

47
network={
5-
key_mgmt=NONE
8+
ssid="MobileRasPi"
9+
mode=2
10+
key_mgmt=WPA-PSK
11+
proto=RSN
12+
pairwise=CCMP
13+
psk="12345678"
14+
frequency=2412
615
}

package/wpe/wpeframework/wpeframework.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ WPEFRAMEWORK_INSTALL_STAGING = YES
1111
WPEFRAMEWORK_DEPENDENCIES = zlib
1212

1313
WPEFRAMEWORK_CONF_OPTS += -DWPEFRAMEWORK_TEST_APPS=ON -DWPEFRAMEWORK_TEST_LOADER=ON
14-
WPEFRAMEWORK_CONF_OPTS += -DBUILD_REFERENCE=$(WPEFRAMEWORK_VERSION)
14+
WPEFRAMEWORK_CONF_OPTS += -DBUILD_REFERENCE=$(WPEFRAMEWORK_VERSION) -DTREE_REFERENCE=$(shell $(GIT) rev-parse HEAD)
1515
WPEFRAMEWORK_CONF_OPTS += -DWPEFRAMEWORK_PORT=$(BR2_PACKAGE_WPEFRAMEWORK_PORT)
1616
WPEFRAMEWORK_CONF_OPTS += -DWPEFRAMEWORK_BINDING=$(BR2_PACKAGE_WPEFRAMEWORK_BIND)
1717
WPEFRAMEWORK_CONF_OPTS += -DWPEFRAMEWORK_IDLE_TIME=$(BR2_PACKAGE_WPEFRAMEWORK_IDLE_TIME)

system/skeleton/etc/dnsmasq.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
dhcp-range=eth0,192.168.1.100,192.168.1.200,24h
1+
dhcp-range=eth0,192.168.10.100,192.168.10.200,24h
2+
dhcp-range=wlan0,192.168.20.100,192.168.20.200,24h

0 commit comments

Comments
 (0)