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
This commit is contained in:
Bob Mottram 2018-02-18 20:08:07 +00:00
parent 873f5378e8
commit 95ce59bfa8
5 changed files with 0 additions and 82 deletions

View File

@ -483,10 +483,6 @@ if [ ! $PASSWORD ]; then
PASSWORD=$(openssl rand -base64 32 | tr -dc A-Za-z0-9 | head -c ${MINIMUM_PASSWORD_LENGTH}) PASSWORD=$(openssl rand -base64 32 | tr -dc A-Za-z0-9 | head -c ${MINIMUM_PASSWORD_LENGTH})
fi fi
if [[ $IMAGE_TYPE == 'beaglebonewireless' ]]; then
IMAGE_TYPE='beaglebonewifi'
fi
# Move any existing images into a build subdirectory # Move any existing images into a build subdirectory
image_types=( xz img sig vdi qcow2 ) image_types=( xz img sig vdi qcow2 )
for im in "${image_types[@]}" for im in "${image_types[@]}"
@ -560,18 +556,6 @@ if [[ $VARIANT == 'usb' ]]; then
IMAGE_NAME=$'usb' IMAGE_NAME=$'usb'
fi fi
if [[ $VARIANT == 'beaglebonewifi' || $VARIANT == 'beaglebonewireless' ]]; then
VARIANT='beaglebonewifi'
if [ ! $WIFI_SSID ]; then
WIFI_SSID=${PROJECT_NAME}
fi
if [ ! "$WIFI_PASSPHRASE" ]; then
WIFI_PASSPHRASE=${PROJECT_NAME}
fi
WIFI_TYPE='wpa2-psk'
WIFI_HOTSPOT='yes'
fi
# append amnesic to the image name if needed # append amnesic to the image name if needed
if [[ $AMNESIC != 'no' ]]; then if [[ $AMNESIC != 'no' ]]; then
IMAGE_NAME="${IMAGE_NAME}-amnesic" IMAGE_NAME="${IMAGE_NAME}-amnesic"

View File

@ -195,22 +195,6 @@ EOF
configure_networking() { configure_networking() {
chroot "$rootdir" apt-get -yq install resolvconf chroot "$rootdir" apt-get -yq install resolvconf
if [[ "$MACHINE" == "beaglebonewifi" ]]; then
# Allow networking over USB in order to configure the
# wifi login settings
echo '# This file describes the network interfaces available on your system' > $rootdir/etc/network/interfaces
echo '# and how to activate them. For more information, see interfaces(5).' >> $rootdir/etc/network/interfaces
echo 'source /etc/network/interfaces.d/*' >> $rootdir/etc/network/interfaces
echo 'iface usb0 inet static' >> $rootdir/etc/network/interfaces.d/usb
echo ' address 192.168.7.2' >> $rootdir/etc/network/interfaces.d/usb
echo ' netmask 255.255.255.252' >> $rootdir/etc/network/interfaces.d/usb
echo ' network 192.168.7.0' >> $rootdir/etc/network/interfaces.d/usb
echo ' gateway 192.168.7.1' >> $rootdir/etc/network/interfaces.d/usb
return
fi
if [[ $DEBIAN_INSTALL_ONLY != "no" ]]; then if [[ $DEBIAN_INSTALL_ONLY != "no" ]]; then
return return
fi fi
@ -492,10 +476,6 @@ continue_installation() {
} }
atheros_wifi() { atheros_wifi() {
if [[ "$MACHINE" == "beaglebonewifi" ]]; then
return
fi
chroot "$rootdir" dpkg -i /root/freedombone/drivers/firmware-ath9k-htc.deb chroot "$rootdir" dpkg -i /root/freedombone/drivers/firmware-ath9k-htc.deb
chroot "$rootdir" apt-get -yq install firmware-linux-free chroot "$rootdir" apt-get -yq install firmware-linux-free
} }
@ -2106,13 +2086,6 @@ case "$MACHINE" in
dd if=$rootdir/usr/lib/u-boot/am335x_boneblack/u-boot.img of="$image" \ dd if=$rootdir/usr/lib/u-boot/am335x_boneblack/u-boot.img of="$image" \
count=2 seek=1 conv=notrunc bs=384k count=2 seek=1 conv=notrunc bs=384k
;; ;;
beaglebonewifi)
touch $rootdir/root/.wifi-only
dd if=$rootdir/usr/lib/u-boot/am335x_boneblack/MLO of="$image" \
count=1 seek=1 conv=notrunc bs=128k
dd if=$rootdir/usr/lib/u-boot/am335x_boneblack/u-boot.img of="$image" \
count=2 seek=1 conv=notrunc bs=384k
;;
cubieboard2) cubieboard2)
dd if=$rootdir/usr/lib/u-boot/Cubieboard2/u-boot-sunxi-with-spl.bin of="$image" \ dd if=$rootdir/usr/lib/u-boot/Cubieboard2/u-boot-sunxi-with-spl.bin of="$image" \
seek=8 conv=notrunc bs=1k seek=8 conv=notrunc bs=1k

View File

@ -102,15 +102,6 @@ beaglebone_flash() {
apt-get install -y flash-kernel apt-get install -y flash-kernel
} }
beaglebone_flash_wireless() {
# allow flash-kernel to work without valid /proc contents
# ** this doesn't *really* work, since there are too many checks
# that fail in an emulated environment! We'll have to do it by
# hand below anyway...
export FK_MACHINE="TI AM335x BeagleBone Black Wireless"
apt-get install -y flash-kernel
}
beaglebone_repack_kernel() { beaglebone_repack_kernel() {
bbb_version=$1 bbb_version=$1
# process installed kernel to create uImage, uInitrd, dtb # process installed kernel to create uImage, uInitrd, dtb
@ -254,12 +245,6 @@ case "$MACHINE" in
beaglebone_repack_kernel beaglebone_repack_kernel
enable_serial_console ttyO0 enable_serial_console ttyO0
;; ;;
beaglebonewifi)
beaglebone_setup_boot wireless
beaglebone_flash_wireless
beaglebone_repack_kernel wireless
enable_serial_console ttyO0
;;
cubietruck) cubietruck)
a20_setup_boot sun7i-a20-cubietruck.dtb a20_setup_boot sun7i-a20-cubietruck.dtb
enable_serial_console ttyS0 enable_serial_console ttyS0

View File

@ -117,19 +117,6 @@ case "$MACHINE" in
--no-extlinux \ --no-extlinux \
--foreign /usr/bin/qemu-arm-static \ --foreign /usr/bin/qemu-arm-static \
--roottype btrfs \ --roottype btrfs \
"
;;
beaglebonewifi)
extra_pkgs="$beaglebone_pkgs"
extra_opts="\
--variant minbase \
--bootoffset=2mib \
--bootsize 128M \
--boottype ext2 \
--no-kernel \
--no-extlinux \
--foreign /usr/bin/qemu-arm-static \
--roottype btrfs \
" "
;; ;;
cubietruck | a20-olinuxino-lime | a20-olinuxino-lime2 | a20-olinuxino-micro | cubieboard2 | pcduino3) cubietruck | a20-olinuxino-lime | a20-olinuxino-lime2 | a20-olinuxino-micro | cubieboard2 | pcduino3)

View File

@ -97,17 +97,6 @@ beaglebone: prep
$(SIGN) $(SIGN)
@echo "Build complete." @echo "Build complete."
# build Beaglebone Black Wireless SD card image
beaglebonewifi: prep
$(eval ARCHITECTURE = armhf)
$(eval MACHINE = beaglebonewifi)
$(MAKE_IMAGE)
@rm -f $(ARCHIVE)
$(XZ) $(IMAGE)
@echo ""
$(SIGN)
@echo "Build complete."
# build Cubieboard2 SD card image # build Cubieboard2 SD card image
cubieboard2: prep cubieboard2: prep
$(eval ARCHITECTURE = armhf) $(eval ARCHITECTURE = armhf)