From 257d05a07069c1eafa4874dc8fafb298cfb50ff3 Mon Sep 17 00:00:00 2001
From: Charles Cross <charles@openrov.com>
Date: Thu, 5 May 2016 17:05:35 -0700
Subject: [PATCH] Removed openrov bluetooth disabling stuff to make it
 mergeable with upstream

---
 stage2/03-boot-tweaks/00-run.sh             |  5 --
 stage2/03-boot-tweaks/files/cmdline.txt     |  1 -
 stage2/03-boot-tweaks/files/config.txt      | 59 ---------------------
 stage2/03-boot-tweaks/files/interfaces      | 11 ----
 stage2/{04-cleanup => 03-cleanup}/00-run.sh |  0
 5 files changed, 76 deletions(-)
 delete mode 100755 stage2/03-boot-tweaks/00-run.sh
 delete mode 100644 stage2/03-boot-tweaks/files/cmdline.txt
 delete mode 100644 stage2/03-boot-tweaks/files/config.txt
 delete mode 100644 stage2/03-boot-tweaks/files/interfaces
 rename stage2/{04-cleanup => 03-cleanup}/00-run.sh (100%)

diff --git a/stage2/03-boot-tweaks/00-run.sh b/stage2/03-boot-tweaks/00-run.sh
deleted file mode 100755
index 6dfe897..0000000
--- a/stage2/03-boot-tweaks/00-run.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -ex
-
-install -m 644 files/cmdline.txt ${ROOTFS_DIR}/boot/
-install -m 644 files/config.txt ${ROOTFS_DIR}/boot/
-install -m 644 files/interfaces ${ROOTFS_DIR}/etc/network/
\ No newline at end of file
diff --git a/stage2/03-boot-tweaks/files/cmdline.txt b/stage2/03-boot-tweaks/files/cmdline.txt
deleted file mode 100644
index 5a9f603..0000000
--- a/stage2/03-boot-tweaks/files/cmdline.txt
+++ /dev/null
@@ -1 +0,0 @@
-dwc_otg.lpm_enable=0 console=ttyAMA0,115200 console=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait
\ No newline at end of file
diff --git a/stage2/03-boot-tweaks/files/config.txt b/stage2/03-boot-tweaks/files/config.txt
deleted file mode 100644
index bf60b1e..0000000
--- a/stage2/03-boot-tweaks/files/config.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-# For more options and information see
-# http://www.raspberrypi.org/documentation/configuration/config-txt.md
-# Some settings may impact device functionality. See link above for details
-
-# uncomment if you get no picture on HDMI for a default "safe" mode
-#hdmi_safe=1
-
-# uncomment this if your display has a black border of unused pixels visible
-# and your display can output without overscan
-#disable_overscan=1
-
-# uncomment the following to adjust overscan. Use positive numbers if console
-# goes off screen, and negative if there is too much border
-#overscan_left=16
-#overscan_right=16
-#overscan_top=16
-#overscan_bottom=16
-
-# uncomment to force a console size. By default it will be display's size minus
-# overscan.
-#framebuffer_width=1280
-#framebuffer_height=720
-
-# uncomment if hdmi display is not detected and composite is being output
-#hdmi_force_hotplug=1
-
-# uncomment to force a specific HDMI mode (this will force VGA)
-#hdmi_group=1
-#hdmi_mode=1
-
-# uncomment to force a HDMI mode rather than DVI. This can make audio work in
-# DMT (computer monitor) modes
-#hdmi_drive=2
-
-# uncomment to increase signal to HDMI, if you have interference, blanking, or
-# no display
-#config_hdmi_boost=4
-
-# uncomment for composite PAL
-#sdtv_mode=2
-
-#uncomment to overclock the arm. 700 MHz is the default.
-#arm_freq=800
-
-# Uncomment some or all of these to enable the optional hardware interfaces
-#dtparam=i2c_arm=on
-#dtparam=i2s=on
-#dtparam=spi=on
-
-# Uncomment this to enable the lirc-rpi module
-#dtoverlay=lirc-rpi
-
-# Additional overlays and parameters are documented /boot/overlays/README
-
-# Enable audio (loads snd_bcm2835)
-dtparam=audio=on
-
-# Disable bluetooth and move UART back to the original pllc
-dtoverlay=pi3-disable-bt
\ No newline at end of file
diff --git a/stage2/03-boot-tweaks/files/interfaces b/stage2/03-boot-tweaks/files/interfaces
deleted file mode 100644
index c4e2c97..0000000
--- a/stage2/03-boot-tweaks/files/interfaces
+++ /dev/null
@@ -1,11 +0,0 @@
-auto lo
-
-iface lo inet loopback
-iface eth0 inet dhcp
-
-allow-hotplug eth0
-iface eth0 inet dhcp
-metric 0
-address 192.168.0.100
-netmask 255.255.255.0
-gateway 192.168.0.1
\ No newline at end of file
diff --git a/stage2/04-cleanup/00-run.sh b/stage2/03-cleanup/00-run.sh
similarity index 100%
rename from stage2/04-cleanup/00-run.sh
rename to stage2/03-cleanup/00-run.sh