Skip to content

Commit b060813

Browse files
unixpunkunixpunk
committed
PlutoWeb changes
1 parent 01c8805 commit b060813

9 files changed

+3386
-133
lines changed

‎.config

+3,024
Large diffs are not rendered by default.

‎.defconfig

+64-51
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,64 @@
1-
#
2-
# Automatically generated make config: don't edit
3-
# Mon Feb 18 09:11:56 2008
4-
#
5-
BR2_HAVE_DOT_CONFIG=y
6-
# BR2_alpha is not set
7-
# BR2_arm is not set
8-
# BR2_armeb is not set
9-
# BR2_cris is not set
10-
# BR2_ia64 is not set
11-
BR2_i386=y
12-
# BR2_m68k is not set
13-
# BR2_mips is not set
14-
# BR2_mipsel is not set
15-
# BR2_nios2 is not set
16-
# BR2_powerpc is not set
17-
# BR2_sh is not set
18-
# BR2_sparc is not set
19-
# BR2_sparc64 is not set
20-
# BR2_x86_64 is not set
21-
# BR2_x86_i486 is not set
22-
# BR2_x86_i586 is not set
23-
BR2_x86_i686=y
24-
# BR2_x86_pentiumpro is not set
25-
# BR2_x86_pentium_mmx is not set
26-
# BR2_x86_pentium_m is not set
27-
# BR2_x86_pentium2 is not set
28-
# BR2_x86_pentium3 is not set
29-
# BR2_x86_pentium4 is not set
30-
# BR2_x86_prescott is not set
31-
# BR2_x86_nocona is not set
32-
# BR2_x86_core2 is not set
33-
# BR2_x86_k6 is not set
34-
# BR2_x86_k6_2 is not set
35-
# BR2_x86_athlon is not set
36-
# BR2_x86_athlon_4 is not set
37-
# BR2_x86_opteron is not set
38-
# BR2_x86_opteron_sse3 is not set
39-
# BR2_x86_barcelona is not set
40-
# BR2_x86_geode is not set
41-
# BR2_x86_c3 is not set
42-
# BR2_x86_winchip_c6 is not set
43-
# BR2_x86_winchip2 is not set
44-
BR2_ARCH="i686"
45-
BR2_ENDIAN="LITTLE"
46-
BR2_GCC_TARGET_TUNE="i686"
47-
BR2_GCC_TARGET_ARCH="i686"
48-
49-
#
50-
# Target options
51-
#
1+
BR2_arm=y
2+
BR2_cortex_a9=y
3+
BR2_ARM_ENABLE_NEON=y
4+
BR2_ARM_FPU_NEON=y
5+
BR2_TOOLCHAIN_EXTERNAL=y
6+
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
7+
BR2_TOOLCHAIN_EXTERNAL_PATH=""
8+
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-xilinx-linux-gnueabi"
9+
BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y
10+
BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_19=y
11+
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
12+
BR2_TOOLCHAIN_EXTERNAL_CXX=y
13+
BR2_TARGET_GENERIC_HOSTNAME="pluto"
14+
BR2_TARGET_GENERIC_ISSUE="Welcome to Pluto"
15+
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
16+
BR2_TARGET_GENERIC_ROOT_PASSWD="analog"
17+
BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0"
18+
BR2_ROOTFS_POST_BUILD_SCRIPT="board/pluto/post-build.sh"
19+
BR2_PACKAGE_STRACE=y
20+
BR2_PACKAGE_MTD=y
21+
# BR2_PACKAGE_MTD_NANDDUMP is not set
22+
# BR2_PACKAGE_MTD_NANDTEST is not set
23+
# BR2_PACKAGE_MTD_NANDWRITE is not set
24+
# BR2_PACKAGE_MTD_UBIATTACH is not set
25+
# BR2_PACKAGE_MTD_UBICRC32 is not set
26+
# BR2_PACKAGE_MTD_UBIDETACH is not set
27+
# BR2_PACKAGE_MTD_UBIFORMAT is not set
28+
# BR2_PACKAGE_MTD_UBIMKVOL is not set
29+
# BR2_PACKAGE_MTD_UBINFO is not set
30+
# BR2_PACKAGE_MTD_UBINIZE is not set
31+
# BR2_PACKAGE_MTD_UBIRENAME is not set
32+
# BR2_PACKAGE_MTD_UBIRMVOL is not set
33+
# BR2_PACKAGE_MTD_UBIRSVOL is not set
34+
# BR2_PACKAGE_MTD_UBIUPDATEVOL is not set
35+
# BR2_PACKAGE_MTD_UBIBLOCK is not set
36+
BR2_PACKAGE_LINUX_FIRMWARE=y
37+
BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61=y
38+
BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
39+
BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
40+
BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
41+
BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
42+
BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y
43+
BR2_PACKAGE_INPUT_EVENT_DAEMON=y
44+
BR2_PACKAGE_UBOOT_TOOLS=y
45+
BR2_PACKAGE_ZLIB=y
46+
BR2_PACKAGE_LIBAD9361_IIO=y
47+
BR2_PACKAGE_LIBIIO_IIOD_USBD=y
48+
BR2_PACKAGE_LIBIIO_TESTS=y
49+
BR2_PACKAGE_LIBINI=y
50+
BR2_PACKAGE_AVAHI=y
51+
BR2_PACKAGE_AVAHI_DAEMON=y
52+
BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
53+
BR2_PACKAGE_DROPBEAR=y
54+
BR2_PACKAGE_IW=y
55+
BR2_PACKAGE_WPA_SUPPLICANT=y
56+
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
57+
BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
58+
BR2_PACKAGE_POLL_SYSFS=y
59+
BR2_PACKAGE_AD936X_REF_CAL=y
60+
BR2_TARGET_ROOTFS_CPIO=y
61+
BR2_TARGET_ROOTFS_CPIO_GZIP=y
62+
BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
63+
BR2_PACKAGE_HOST_DOSFSTOOLS=y
64+
BR2_PACKAGE_HOST_GENIMAGE=y

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
/.config.cmd
55
/.config.old
66
/..config.tmp
7-
/.config
87
*.depend
98
*.o
109
/*.patch

‎board/pluto/S40network

+18-14
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ create_system_files () {
2323
ETH_IPADDR=`fw_printenv -n ipaddr_eth 2> /dev/null`
2424
ETH_NETMASK=`fw_printenv -n netmask_eth 2> /dev/null || echo 255.255.255.0`
2525

26-
WLAN_SSID=`fw_printenv -n ssid_wlan 2> /dev/null`
26+
WLAN_SSID=`fw_printenv -n ssid_wlan 2> /dev/null || echo PlutoWeb`
2727
WLAN_PWD=`fw_printenv -n pwd_wlan 2> /dev/null`
28-
WLAN_IPADDR=`fw_printenv -n ipaddr_wlan 2> /dev/null`
28+
WLAN_IPADDR=`fw_printenv -n ipaddr_wlan 2> /dev/null || echo 172.20.0.1`
2929

3030
XO_CORRECTION=`fw_printenv -n xo_correction 2> /dev/null`
3131
UDC_HANDLE_SUSPEND=`fw_printenv -n udc_handle_suspend 2> /dev/null || echo 0`
@@ -34,11 +34,21 @@ create_system_files () {
3434
echo "start $IPADDR_HOST" > $UDHCPD_CONF
3535
echo "interface usb0" >> $UDHCPD_CONF
3636
echo "option subnet $NETMASK" >> $UDHCPD_CONF
37+
if [ -e /dev/wlan0 ]; then
38+
echo "start $WLAN_IPADDR""0" > $UDHCPD_CONF
39+
echo "interface wlan0" >> $UDHCPD_CONF
40+
echo "option subnet $NETMASK" >> $UDHCPD_CONF
41+
fi
3742

3843
### /etc/network/interfaces ###
3944
echo -e "auto lo\n""iface lo inet loopback\n" > $IFAC
40-
echo -e "auto usb0\n""iface usb0 inet static" >> $IFAC
41-
echo -e "\taddress $IPADDR\n""\tnetmask $NETMASK\n" >> $IFAC
45+
if [ -e /dev/wlan0 ]; then
46+
echo -e "auto wlan0\n""iface wlan0 inet static" >> $IFAC
47+
echo -e "\taddress $WLAN_IPADDR\n""\tnetmask $NETMASK\n" >> $IFAC
48+
else
49+
echo -e "auto usb0\n""iface usb0 inet static" >> $IFAC
50+
echo -e "\taddress $IPADDR\n""\tnetmask $NETMASK\n" >> $IFAC
51+
fi
4252

4353
echo -e "auto eth0" >> $IFAC
4454
if [ -n "$ETH_IPADDR" ]
@@ -58,19 +68,13 @@ create_system_files () {
5868
else
5969
echo "network={" > /etc/wpa.conf
6070
echo " ssid=\"$WLAN_SSID\"" >> /etc/wpa.conf
71+
if [ "$WLAN_SSID" = "PlutoWeb" ]; then
72+
echo " mode=2" >> /etc/wpa.conf
73+
fi
6174
echo " key_mgmt=NONE" >> /etc/wpa.conf
6275
echo "}" >> /etc/wpa.conf
6376
fi
6477

65-
echo -e "auto wlan0" >> $IFAC
66-
67-
if [ -n "$WLAN_IPADDR" ]
68-
then
69-
echo -e "iface wlan0 inet static" >> $IFAC
70-
echo -e "\taddress $WLAN_IPADDR\n""\tnetmask 255.255.255.0" >> $IFAC
71-
else
72-
echo -e "iface wlan0 inet dhcp" >> $IFAC
73-
fi
7478
echo -e "\twpa-conf /etc/wpa.conf\n" >> $IFAC
7579
fi
7680

@@ -106,7 +110,7 @@ create_system_files () {
106110

107111
### /www/index.html ###
108112

109-
sed -i -e "s/#IP#/$IPADDR/g" -e "s/#HOSTIP#/$IPADDR_HOST/g" -e "s/#NETMASK#/$NETMASK/g" -e "s/#HOSTNAME#/$HOSTNAME/g" -e "s/#SSID_WLAN#/$WLAN_SSID/g" -e "s/#IPADDR_WLAN#/$WLAN_IPADDR/g" -e "s/#IPADDR_ETH#/$ETH_IPADDR/g" -e "s/#NETMASK_ETH#/$ETH_NETMASK/g" /www/index.html /www/img/index_*.html
113+
#sed -i -e "s/#IP#/$IPADDR/g" -e "s/#HOSTIP#/$IPADDR_HOST/g" -e "s/#NETMASK#/$NETMASK/g" -e "s/#HOSTNAME#/$HOSTNAME/g" -e "s/#SSID_WLAN#/$WLAN_SSID/g" -e "s/#IPADDR_WLAN#/$WLAN_IPADDR/g" -e "s/#IPADDR_ETH#/$ETH_IPADDR/g" -e "s/#NETMASK_ETH#/$ETH_NETMASK/g" /www/index.html /www/img/index_*.html
110114

111115
}
112116

‎board/pluto/S40network_orig

+138
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
#!/bin/sh
2+
#
3+
# Start the network....
4+
#
5+
6+
# Debian ifupdown needs the /run/network lock directory
7+
8+
source /etc/device_config
9+
10+
create_system_files () {
11+
12+
UDHCPD_CONF=/etc/udhcpd.conf
13+
CONF=/opt/config.txt
14+
IFAC=/etc/network/interfaces
15+
16+
HOSTNAME=`fw_printenv -n hostname 2> /dev/null || cat /etc/hostname`
17+
echo $HOSTNAME > /etc/hostname
18+
19+
IPADDR=`fw_printenv -n ipaddr 2> /dev/null || echo 192.168.2.1`
20+
IPADDR_HOST=`fw_printenv -n ipaddr_host 2> /dev/null || echo 192.168.2.10`
21+
NETMASK=`fw_printenv -n netmask 2> /dev/null || echo 255.255.255.0`
22+
23+
ETH_IPADDR=`fw_printenv -n ipaddr_eth 2> /dev/null`
24+
ETH_NETMASK=`fw_printenv -n netmask_eth 2> /dev/null || echo 255.255.255.0`
25+
26+
WLAN_SSID=`fw_printenv -n ssid_wlan 2> /dev/null`
27+
WLAN_PWD=`fw_printenv -n pwd_wlan 2> /dev/null`
28+
WLAN_IPADDR=`fw_printenv -n ipaddr_wlan 2> /dev/null`
29+
30+
XO_CORRECTION=`fw_printenv -n xo_correction 2> /dev/null`
31+
UDC_HANDLE_SUSPEND=`fw_printenv -n udc_handle_suspend 2> /dev/null || echo 0`
32+
33+
### /etc/udhcpd.conf ###
34+
echo "start $IPADDR_HOST" > $UDHCPD_CONF
35+
echo "interface usb0" >> $UDHCPD_CONF
36+
echo "option subnet $NETMASK" >> $UDHCPD_CONF
37+
38+
### /etc/network/interfaces ###
39+
echo -e "auto lo\n""iface lo inet loopback\n" > $IFAC
40+
echo -e "auto usb0\n""iface usb0 inet static" >> $IFAC
41+
echo -e "\taddress $IPADDR\n""\tnetmask $NETMASK\n" >> $IFAC
42+
43+
echo -e "auto eth0" >> $IFAC
44+
if [ -n "$ETH_IPADDR" ]
45+
then
46+
echo -e "iface eth0 inet static" >> $IFAC
47+
echo -e "\taddress $ETH_IPADDR\n""\tnetmask $ETH_NETMASK\n" >> $IFAC
48+
else
49+
echo -e "iface eth0 inet dhcp\n" >> $IFAC
50+
fi
51+
52+
### /etc/wpa.conf ###
53+
if [ -n "$WLAN_SSID" ]
54+
then
55+
if [ -n "$WLAN_PWD" ]
56+
then
57+
wpa_passphrase $WLAN_SSID $WLAN_PWD > /etc/wpa.conf
58+
else
59+
echo "network={" > /etc/wpa.conf
60+
echo " ssid=\"$WLAN_SSID\"" >> /etc/wpa.conf
61+
echo " key_mgmt=NONE" >> /etc/wpa.conf
62+
echo "}" >> /etc/wpa.conf
63+
fi
64+
65+
echo -e "auto wlan0" >> $IFAC
66+
67+
if [ -n "$WLAN_IPADDR" ]
68+
then
69+
echo -e "iface wlan0 inet static" >> $IFAC
70+
echo -e "\taddress $WLAN_IPADDR\n""\tnetmask 255.255.255.0" >> $IFAC
71+
else
72+
echo -e "iface wlan0 inet dhcp" >> $IFAC
73+
fi
74+
echo -e "\twpa-conf /etc/wpa.conf\n" >> $IFAC
75+
fi
76+
77+
### /opt/config.txt ###
78+
echo "# Device Configuration File"$'\r' > $CONF
79+
echo "# Edit, Save and then Eject the USB Drive"$'\r' >> $CONF
80+
echo ""$'\r'>> $CONF
81+
echo "[NETWORK]"$'\r' >> $CONF
82+
echo "hostname = $HOSTNAME"$'\r' >> $CONF
83+
echo "ipaddr = $IPADDR"$'\r' >> $CONF
84+
echo "ipaddr_host = $IPADDR_HOST"$'\r' >> $CONF
85+
echo "netmask = $NETMASK"$'\r' >> $CONF
86+
echo ""$'\r'>> $CONF
87+
echo "[WLAN]"$'\r' >> $CONF
88+
echo "ssid_wlan = $WLAN_SSID"$'\r' >> $CONF
89+
echo "pwd_wlan = $WLAN_PWD"$'\r' >> $CONF
90+
echo "ipaddr_wlan = $WLAN_IPADDR"$'\r' >> $CONF
91+
echo ""$'\r'>> $CONF
92+
echo "[USB_ETHERNET]"$'\r' >> $CONF
93+
echo "ipaddr_eth = $ETH_IPADDR"$'\r' >> $CONF
94+
echo "netmask_eth = $ETH_NETMASK"$'\r' >> $CONF
95+
echo ""$'\r'>> $CONF
96+
echo "[SYSTEM]"$'\r' >> $CONF
97+
echo "xo_correction = $XO_CORRECTION"$'\r' >> $CONF
98+
echo "udc_handle_suspend = $UDC_HANDLE_SUSPEND"$'\r' >> $CONF
99+
echo ""$'\r'>> $CONF
100+
echo "[ACTIONS]"$'\r' >> $CONF
101+
echo "diagnostic_report = 0"$'\r' >> $CONF
102+
echo "dfu = 0"$'\r' >> $CONF
103+
echo "reset = 0"$'\r' >> $CONF
104+
echo "calibrate = 0"$'\r' >> $CONF
105+
echo ""$'\r'>> $CONF
106+
107+
### /www/index.html ###
108+
109+
sed -i -e "s/#IP#/$IPADDR/g" -e "s/#HOSTIP#/$IPADDR_HOST/g" -e "s/#NETMASK#/$NETMASK/g" -e "s/#HOSTNAME#/$HOSTNAME/g" -e "s/#SSID_WLAN#/$WLAN_SSID/g" -e "s/#IPADDR_WLAN#/$WLAN_IPADDR/g" -e "s/#IPADDR_ETH#/$ETH_IPADDR/g" -e "s/#NETMASK_ETH#/$ETH_NETMASK/g" /www/index.html /www/img/index_*.html
110+
111+
}
112+
113+
mkdir -p /run/network
114+
115+
case "$1" in
116+
start)
117+
create_system_files
118+
printf "Starting network: "
119+
/bin/hostname -F /etc/hostname
120+
/sbin/ifup -a 2>&1 | logger
121+
[ $? = 0 ] && echo "OK" || echo "FAIL"
122+
;;
123+
stop)
124+
printf "Stopping network: "
125+
/sbin/ifdown -a
126+
[ $? = 0 ] && echo "OK" || echo "FAIL"
127+
;;
128+
restart|reload)
129+
"$0" stop
130+
"$0" start
131+
;;
132+
*)
133+
echo "Usage: $0 {start|stop|restart}"
134+
exit 1
135+
esac
136+
137+
exit $?
138+

‎board/pluto/post-build.sh

+8-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44

55
INSTALL=install
66

7+
####################
8+
# Create and insert the update.zip.md5sum
9+
/home/steve/Desktop/SDR/Pluto/PlutoSDR/plutoweb/buildzip.sh
10+
cp /home/steve/Desktop/SDR/Pluto/PlutoSDR/plutoweb/update.zip.md5sum ${TARGET_DIR}/root/.update.zip.md5sum
11+
712
# Add a console on tty1
813
grep -qE '^ttyGS0::' ${TARGET_DIR}/etc/inittab || \
914
sed -i '/GENERIC_SERIAL/a\
@@ -32,7 +37,7 @@ genimage \
3237
rm ${TARGET_DIR}/opt/boot.vfat
3338
rm ${TARGET_DIR}/etc/init.d/S99iiod
3439

35-
mkdir -p ${TARGET_DIR}/www/img
40+
#mkdir -p ${TARGET_DIR}/www/img
3641
mkdir -p ${TARGET_DIR}/etc/wpa_supplicant/
3742

3843
${INSTALL} -D -m 0755 ${BOARD_DIR}/update.sh ${TARGET_DIR}/sbin/
@@ -56,8 +61,8 @@ ${INSTALL} -D -m 0755 ${BOARD_DIR}/automounter.sh ${TARGET_DIR}/lib/mdev/automou
5661
${INSTALL} -D -m 0755 ${BOARD_DIR}/ifupdown.sh ${TARGET_DIR}/lib/mdev/ifupdown.sh
5762
${INSTALL} -D -m 0644 ${BOARD_DIR}/input-event-daemon.conf ${TARGET_DIR}/etc/
5863

59-
${INSTALL} -D -m 0644 ${BOARD_DIR}/msd/img/* ${TARGET_DIR}/www/img/
60-
${INSTALL} -D -m 0644 ${BOARD_DIR}/msd/index.html ${TARGET_DIR}/www/
64+
#${INSTALL} -D -m 0644 ${BOARD_DIR}/msd/img/* ${TARGET_DIR}/www/img/
65+
#${INSTALL} -D -m 0644 ${BOARD_DIR}/msd/index.html ${TARGET_DIR}/www/
6166

6267
${INSTALL} -D -m 0755 ${BOARD_DIR}/wpa_supplicant/* ${TARGET_DIR}/etc/wpa_supplicant/
6368

0 commit comments

Comments
 (0)