Browse Source

Deprecate support for building images for beaglebone black wireless

It looks like the TI wifi drivers really are non-free since they require extracting stuff from binary files in order to compile the firmware
Bob Mottram 7 years ago
parent
commit
95ce59bfa8

+ 0
- 16
src/freedombone-image View File

@@ -483,10 +483,6 @@ if [ ! $PASSWORD ]; then
483 483
     PASSWORD=$(openssl rand -base64 32 | tr -dc A-Za-z0-9 | head -c ${MINIMUM_PASSWORD_LENGTH})
484 484
 fi
485 485
 
486
-if [[ $IMAGE_TYPE == 'beaglebonewireless' ]]; then
487
-    IMAGE_TYPE='beaglebonewifi'
488
-fi
489
-
490 486
 # Move any existing images into a build subdirectory
491 487
 image_types=( xz img sig vdi qcow2 )
492 488
 for im in "${image_types[@]}"
@@ -560,18 +556,6 @@ if [[ $VARIANT == 'usb' ]]; then
560 556
     IMAGE_NAME=$'usb'
561 557
 fi
562 558
 
563
-if [[ $VARIANT == 'beaglebonewifi' || $VARIANT == 'beaglebonewireless' ]]; then
564
-    VARIANT='beaglebonewifi'
565
-    if [ ! $WIFI_SSID ]; then
566
-        WIFI_SSID=${PROJECT_NAME}
567
-    fi
568
-    if [ ! "$WIFI_PASSPHRASE" ]; then
569
-        WIFI_PASSPHRASE=${PROJECT_NAME}
570
-    fi
571
-    WIFI_TYPE='wpa2-psk'
572
-    WIFI_HOTSPOT='yes'
573
-fi
574
-
575 559
 # append amnesic to the image name if needed
576 560
 if [[ $AMNESIC != 'no' ]]; then
577 561
     IMAGE_NAME="${IMAGE_NAME}-amnesic"

+ 0
- 27
src/freedombone-image-customise View File

@@ -195,22 +195,6 @@ EOF
195 195
 configure_networking() {
196 196
     chroot "$rootdir" apt-get -yq install resolvconf
197 197
 
198
-    if [[ "$MACHINE" == "beaglebonewifi" ]]; then
199
-        # Allow networking over USB in order to configure the
200
-        # wifi login settings
201
-
202
-        echo '# This file describes the network interfaces available on your system' > $rootdir/etc/network/interfaces
203
-        echo '# and how to activate them. For more information, see interfaces(5).' >> $rootdir/etc/network/interfaces
204
-        echo 'source /etc/network/interfaces.d/*' >> $rootdir/etc/network/interfaces
205
-
206
-        echo 'iface usb0 inet static' >> $rootdir/etc/network/interfaces.d/usb
207
-        echo '    address 192.168.7.2' >> $rootdir/etc/network/interfaces.d/usb
208
-        echo '    netmask 255.255.255.252' >> $rootdir/etc/network/interfaces.d/usb
209
-        echo '    network 192.168.7.0' >> $rootdir/etc/network/interfaces.d/usb
210
-        echo '    gateway 192.168.7.1' >> $rootdir/etc/network/interfaces.d/usb
211
-        return
212
-    fi
213
-
214 198
     if [[ $DEBIAN_INSTALL_ONLY != "no" ]]; then
215 199
         return
216 200
     fi
@@ -492,10 +476,6 @@ continue_installation() {
492 476
 }
493 477
 
494 478
 atheros_wifi() {
495
-    if [[ "$MACHINE" == "beaglebonewifi" ]]; then
496
-        return
497
-    fi
498
-
499 479
     chroot "$rootdir" dpkg -i /root/freedombone/drivers/firmware-ath9k-htc.deb
500 480
     chroot "$rootdir" apt-get -yq install firmware-linux-free
501 481
 }
@@ -2106,13 +2086,6 @@ case "$MACHINE" in
2106 2086
         dd if=$rootdir/usr/lib/u-boot/am335x_boneblack/u-boot.img of="$image" \
2107 2087
            count=2 seek=1 conv=notrunc bs=384k
2108 2088
         ;;
2109
-    beaglebonewifi)
2110
-        touch $rootdir/root/.wifi-only
2111
-        dd if=$rootdir/usr/lib/u-boot/am335x_boneblack/MLO of="$image" \
2112
-           count=1 seek=1 conv=notrunc bs=128k
2113
-        dd if=$rootdir/usr/lib/u-boot/am335x_boneblack/u-boot.img of="$image" \
2114
-           count=2 seek=1 conv=notrunc bs=384k
2115
-        ;;
2116 2089
     cubieboard2)
2117 2090
         dd if=$rootdir/usr/lib/u-boot/Cubieboard2/u-boot-sunxi-with-spl.bin of="$image" \
2118 2091
            seek=8 conv=notrunc bs=1k

+ 0
- 15
src/freedombone-image-hardware-setup View File

@@ -102,15 +102,6 @@ beaglebone_flash() {
102 102
     apt-get install -y flash-kernel
103 103
 }
104 104
 
105
-beaglebone_flash_wireless() {
106
-    # allow flash-kernel to work without valid /proc contents
107
-    # ** this doesn't *really* work, since there are too many checks
108
-    #    that fail in an emulated environment!  We'll have to do it by
109
-    #    hand below anyway...
110
-    export FK_MACHINE="TI AM335x BeagleBone Black Wireless"
111
-    apt-get install -y flash-kernel
112
-}
113
-
114 105
 beaglebone_repack_kernel() {
115 106
     bbb_version=$1
116 107
     # process installed kernel to create uImage, uInitrd, dtb
@@ -254,12 +245,6 @@ case "$MACHINE" in
254 245
         beaglebone_repack_kernel
255 246
         enable_serial_console ttyO0
256 247
         ;;
257
-    beaglebonewifi)
258
-        beaglebone_setup_boot wireless
259
-        beaglebone_flash_wireless
260
-        beaglebone_repack_kernel wireless
261
-        enable_serial_console ttyO0
262
-        ;;
263 248
     cubietruck)
264 249
         a20_setup_boot sun7i-a20-cubietruck.dtb
265 250
         enable_serial_console ttyS0

+ 0
- 13
src/freedombone-image-make View File

@@ -119,19 +119,6 @@ case "$MACHINE" in
119 119
  --roottype btrfs \
120 120
 "
121 121
         ;;
122
-    beaglebonewifi)
123
-        extra_pkgs="$beaglebone_pkgs"
124
-        extra_opts="\
125
- --variant minbase \
126
- --bootoffset=2mib \
127
- --bootsize 128M \
128
- --boottype ext2 \
129
- --no-kernel \
130
- --no-extlinux \
131
- --foreign /usr/bin/qemu-arm-static \
132
- --roottype btrfs \
133
-"
134
-        ;;
135 122
     cubietruck | a20-olinuxino-lime | a20-olinuxino-lime2 | a20-olinuxino-micro | cubieboard2 | pcduino3)
136 123
         extra_pkgs="$a20_pkgs"
137 124
         extra_opts="\

+ 0
- 11
src/freedombone-image-makefile View File

@@ -97,17 +97,6 @@ beaglebone: prep
97 97
 	$(SIGN)
98 98
 	@echo "Build complete."
99 99
 
100
-# build Beaglebone Black Wireless SD card image
101
-beaglebonewifi: prep
102
-	$(eval ARCHITECTURE = armhf)
103
-	$(eval MACHINE = beaglebonewifi)
104
-	$(MAKE_IMAGE)
105
-	@rm -f $(ARCHIVE)
106
-	$(XZ) $(IMAGE)
107
-	@echo ""
108
-	$(SIGN)
109
-	@echo "Build complete."
110
-
111 100
 # build Cubieboard2 SD card image
112 101
 cubieboard2: prep
113 102
 	$(eval ARCHITECTURE = armhf)