From d3336fac57fadc0287e1750cb173e06ae8a4f6f8 2018-11-26 09:32:57
From: drtyhlpr <its_sead4@gmx.de>
Date: 2018-11-26 09:32:57
Subject: [PATCH] Merge pull request #166 from burnbabyburn/0

Fixes
---

diff --git a/README.md b/README.md
index 9f45638..6dd392f 100644
--- a/README.md
+++ b/README.md
@@ -61,19 +61,14 @@ A comma separated list of additional packages to be installed by apt after boots
 Set Architecture to default 32bit. If you want to to compile 64bit (RPI3 or RPI3+) set it to `64`. This option will set every needed crosscompiler or boeard specific option for a successful build.
 
 ##### `RPI_MODEL`=2
-Specifiy the target Raspberry Pi hardware model. The script at this time supports the following Raspberry Pi models (`BUILD_KERNEL`=true will automatically be set if the Raspberry Pi model `3` or `3P` is used) :
-
-`0`  = Used for Raspberry Pi 0 and Raspberry Pi 0 W
-
-`1`  = Used for Raspberry Pi 1 model A and B
-
-`1P` = Used for Raspberry Pi 1 model B+ and A+
-
-`2`  = Used for Raspberry Pi 2 model B
-
-`3`  = Used for Raspberry Pi 3 model B
-
-`3P` = Used for Raspberry Pi 3 model B+
+Specifiy the target Raspberry Pi hardware model. The script at this time supports the following Raspberry Pi models:
+- `0`  = Used for Raspberry Pi 0 and Raspberry Pi 0 W
+- `1`  = Used for Pi 1 model A and B
+- `1P` = Used for Pi 1 model B+ and A+
+- `2`  = Used for Pi 2 model B
+- `3`  = Used for Pi 3 model B
+- `3P` = Used for Pi 3 model B+
+- `BUILD_KERNEL`=true will automatically be set if the Raspberry Pi model `3` or `3P` is used.
 
 ##### `RELEASE`="buster"
 Set the desired Debian release name. The script at this time supports the bootstrapping of the Debian releases `stretch` and `buster`.
@@ -157,7 +152,19 @@ Set the IP address for the second NTP server.
 
 #### Basic system features:
 ##### `ENABLE_CONSOLE`=true
-Enable serial console interface. Recommended if no monitor or keyboard is connected to the RPi 0/1/2/3. In case of problems fe. if the network (auto) configuration failed - the serial console can be used to access the system.
+Enable serial console interface. Recommended if no monitor or keyboard is connected to the RPi2/3. In case of problems fe. if the network (auto) configuration failed - the serial console can be used to access the system. On RPI `0` `3` `3P` the CPU speed is locked at lowest speed.
+
+##### `ENABLE_PRINTK`=false
+Enables printing kernel messages to konsole. printk is `3 4 1 3` as in raspbian.
+
+##### `ENABLE_BLUETOOTH`=false
+Enable onboard Bluetooth interface on the RPi0/3/3P. See: https://spellfoundry.com/2016/05/29/configuring-gpio-serial-port-raspbian-jessie-including-pi-3/
+
+##### `ENABLE_MINIUART_OVERLAY`=false
+Enable Bluetooth to use this. Adds overlay to swap UART0 with UART1. Enabling (slower) Bluetooth and full speed serial console. - RPI `0` `3` `3P` have a fast `hardware UART0` (ttyAMA0) and a `mini UART1` (ttyS0)! RPI `1` `1P` `2` only have a `hardware UART0`. `UART0` is considered better, because is faster and more stable than `mini UART1`. By default the Bluetooth modem is mapped to the `hardware UART0` and `mini UART` is used for console. The `mini UART` is a problem for the serial console, because its baudrate depends on the cpu frequency, which is changing on runtime. Resulting in a volatile baudrate and thus in an unusable serial console.
+ 
+##### `ENABLE_TURBO`=false
+Enable Turbo mode. This setting locks cpu at highest frequency. As setting ENABLE_CONSOLE=true locks RPI to lowest CPU speed, this is can be used additionally to lock cpu hat max speed. Need a good power supply and probably cooling for the Raspberry PI.
 
 ##### `ENABLE_I2C`=false
 Enable I2C interface on the RPi 0/1/2/3. Please check the [RPi 0/1/2/3 pinout diagrams](https://elinux.org/RPi_Low-level_peripherals) to connect the right GPIO pins.
@@ -178,8 +185,7 @@ Allow the installation of non-free Debian packages that do not comply with the D
 Download and install the [closed-source firmware binary blob](https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm) that is required to run the internal wireless interface of the Raspberry Pi model `3`. This parameter is ignored if the specified `RPI_MODEL` is not `3`.
 
 ##### `ENABLE_RSYSLOG`=true
-If set to false, disable and uninstall rsyslog (so logs will be available only
-in journal files)
+If set to false, disable and uninstall rsyslog (so logs will be available only in journal files)
 
 ##### `ENABLE_SOUND`=true
 Enable sound hardware and install Advanced Linux Sound Architecture.
diff --git a/bootstrap.d/12-locale.sh b/bootstrap.d/12-locale.sh
index c469ec3..9817d7a 100644
--- a/bootstrap.d/12-locale.sh
+++ b/bootstrap.d/12-locale.sh
@@ -28,10 +28,10 @@ if [ "$(echo "$APT_INCLUDES" | grep ",locales")" ] ; then
   chroot_exec update-locale LANG="${DEFLOCAL}"
 
   # Install and setup default keyboard configuration
-  if [ "$XKB_MODEL" != "pc105" ] ; then
+  if [ "$XKB_MODEL" != "" ] ; then
     sed -i "s/^XKBMODEL.*/XKBMODEL=\"${XKB_MODEL}\"/" "${ETC_DIR}/default/keyboard"
   fi
-  if [ "$XKB_LAYOUT" != "us" ] ; then
+  if [ "$XKB_LAYOUT" != "" ] ; then
     sed -i "s/^XKBLAYOUT.*/XKBLAYOUT=\"${XKB_LAYOUT}\"/" "${ETC_DIR}/default/keyboard"
   fi
   if [ "$XKB_VARIANT" != "" ] ; then
diff --git a/bootstrap.d/13-kernel.sh b/bootstrap.d/13-kernel.sh
index e86ae33..a662049 100644
--- a/bootstrap.d/13-kernel.sh
+++ b/bootstrap.d/13-kernel.sh
@@ -108,7 +108,7 @@ if [ "$BUILD_KERNEL" = true ] ; then
             echo "CONFIG_CRYPTO_XTS=y"
             echo "CONFIG_CRYPTO_SHA512=y"
             echo "CONFIG_CRYPTO_MANAGER=y"
-          } >> ${KERNEL_DIR}/.config
+          } >> "${KERNEL_DIR}"/.config
         fi
       fi
 
@@ -139,7 +139,7 @@ if [ "$BUILD_KERNEL" = true ] ; then
     make -C "${KERNEL_DIR}" -j"${KERNEL_THREADS}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" CC="${cc}" "${KERNEL_BIN_IMAGE}" dtbs
 
     # Cross compile kernel modules
-    if [ "$(grep "CONFIG_MODULES=y" "${KERNEL_DIR}/.config")" ] ; then
+    if grep -q "CONFIG_MODULES=y" "${KERNEL_DIR}/.config" ; then
       make -C "${KERNEL_DIR}" -j"${KERNEL_THREADS}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" CC="${cc}" modules
     fi
   fi
@@ -153,16 +153,16 @@ if [ "$BUILD_KERNEL" = true ] ; then
 
   # Install kernel modules
   if [ "$ENABLE_REDUCE" = true ] ; then
-    if [ "$(grep "CONFIG_MODULES=y" "${KERNEL_DIR}/.config")" ] ; then
+    if grep -q "CONFIG_MODULES=y" "${KERNEL_DIR}/.config" ; then
       make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" INSTALL_MOD_STRIP=1 INSTALL_MOD_PATH=../../.. modules_install
     fi
   else
-    if [ "$(grep "CONFIG_MODULES=y" "${KERNEL_DIR}/.config")" ] ; then
+    if grep -q "CONFIG_MODULES=y" "${KERNEL_DIR}/.config" ; then
       make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" INSTALL_MOD_PATH=../../.. modules_install
     fi
 
     # Install kernel firmware
-    if [ "$(grep "^firmware_install:" "${KERNEL_DIR}/Makefile")" ] ; then
+    if grep -q "^firmware_install:" "${KERNEL_DIR}/Makefile" ; then
       make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" INSTALL_FW_PATH=../../../lib firmware_install
     fi
   fi
@@ -225,8 +225,8 @@ if [ "$BUILD_KERNEL" = true ] ; then
     rm -fr "${KERNEL_DIR}"
   else
     # Prepare compiled kernel modules
-    if [ "$(grep "CONFIG_MODULES=y" "${KERNEL_DIR}/.config")" ] ; then
-      if [ "$(grep "^modules_prepare:" "${KERNEL_DIR}/Makefile")" ] ; then
+    if grep -q "CONFIG_MODULES=y" "${KERNEL_DIR}/.config" ; then
+      if grep -q "^modules_prepare:" "${KERNEL_DIR}/Makefile" ; then
         make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" modules_prepare
       fi
 
diff --git a/bootstrap.d/15-rpi-config.sh b/bootstrap.d/15-rpi-config.sh
index de86adf..eda69bd 100644
--- a/bootstrap.d/15-rpi-config.sh
+++ b/bootstrap.d/15-rpi-config.sh
@@ -56,9 +56,100 @@ if [ "$ENABLE_CRYPTFS" = true ] ; then
   fi
 fi
 
-# Add serial console support
+#locks cpu at max frequency
+if [ "$ENABLE_TURBO" = true ] ; then
+  echo "force_turbo=1" >> "${BOOT_DIR}/config.txt"
+fi
+
+if [ "$ENABLE_PRINTK" = true ] ; then
+  install_readonly files/sysctl.d/83-rpi-printk.conf "${ETC_DIR}/sysctl.d/83-rpi-printk.conf"
+fi
+
+# Install udev rule for serial alias
+install_readonly files/etc/99-com.rules "${LIB_DIR}/udev/rules.d/99-com.rules"
+
+if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
+  
+  # RPI0,3,3P Use default ttyS0 (mini-UART)as serial interface
+  SET_SERIAL="ttyS0"
+  
+  # Bluetooth enabled
+  if [ "$ENABLE_BLUETOOTH" = true ] ; then
+    # Create temporary directory for Bluetooth sources
+    temp_dir=$(as_nobody mktemp -d)
+
+    # Fetch Bluetooth sources
+    as_nobody git -C "${temp_dir}" clone "${BLUETOOTH_URL}"
+
+    # Copy downloaded sources
+    mv "${temp_dir}/pi-bluetooth" "${R}/tmp/"
+
+    # Bluetooth firmware from arch aur https://aur.archlinux.org/packages/pi-bluetooth/
+    as_nobody wget -q -O "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" https://aur.archlinux.org/cgit/aur.git/plain/LICENCE.broadcom_bcm43xx?h=pi-bluetooth
+    as_nobody wget -q -O "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" https://aur.archlinux.org/cgit/aur.git/plain/BCM43430A1.hcd?h=pi-bluetooth
+
+    # Set permissions
+    chown -R root:root "${R}/tmp/pi-bluetooth"
+
+    # Install tools
+    install_readonly "${R}/tmp/pi-bluetooth/usr/bin/btuart" "${R}/usr/bin/btuart"
+    install_readonly "${R}/tmp/pi-bluetooth/usr/bin/bthelper" "${R}/usr/bin/bthelper"
+
+    # Install bluetooth udev rule
+    install_readonly "${R}/tmp/pi-bluetooth/lib/udev/rules.d/90-pi-bluetooth.rules" "${LIB_DIR}/udev/rules.d/90-pi-bluetooth.rules"
+
+    # Install Firmware Flash file and apropiate licence
+    mkdir -p "$BLUETOOTH_FIRMWARE_DIR"
+    install_readonly "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" "${BLUETOOTH_FIRMWARE_DIR}/LICENCE.broadcom_bcm43xx"
+    install_readonly "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" "${BLUETOOTH_FIRMWARE_DIR}/LICENCE.broadcom_bcm43xx"
+    install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.bthelper@.service" "${ETC_DIR}/systemd/system/pi-bluetooth.bthelper@.service"
+    install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.hciuart.service" "${ETC_DIR}/systemd/system/pi-bluetooth.hciuart.service"
+	
+    # Remove temporary directory
+    rm -fr "${temp_dir}"
+	
+    # Switch Pi3 Bluetooth function to use the mini-UART (ttyS0) and restore UART0/ttyAMA0 over GPIOs 14 & 15. Slow Bluetooth and slow cpu. Use /dev/ttyS0 instead of /dev/ttyAMA0
+    if [ "$ENABLE_MINIUART_OVERLAY" = true ] ; then
+	  SET_SERIAL="ttyAMA0"
+
+	  # set overlay to swap ttyAMA0 and ttyS0
+      echo "dtoverlay=pi3-miniuart-bt" >> "${BOOT_DIR}/config.txt"
+
+	  # if force_turbo didn't lock cpu at high speed, lock it at low speed (XOR logic) or miniuart will be broken
+	  if [ "$ENABLE_TURBO" = false ] ; then 
+	    echo "core_freq=250" >> "${BOOT_DIR}/config.txt"
+	  fi
+	  
+	  # Activate services
+	  chroot_exec systemctl enable pi-bluetooth.hciuart.service
+	  #chroot_exec systemctl enable pi-bluetooth.bthelper@.service
+	else
+	  chroot_exec systemctl enable pi-bluetooth.hciuart.service
+	  #chroot_exec systemctl enable pi-bluetooth.bthelper@.service
+	fi
+	
+  else # if ENABLE_BLUETOOTH = false
+  	# set overlay to disable bluetooth
+    echo "dtoverlay=pi3-disable-bt" >> "${BOOT_DIR}/config.txt"
+  fi # ENABLE_BLUETOOTH end
+
+else
+  # RPI1,1P,2 Use default ttyAMA0 (full UART) as serial interface
+  SET_SERIAL="ttyAMA0"
+fi
+
+# may need sudo systemctl disable hciuart
 if [ "$ENABLE_CONSOLE" = true ] ; then
-  CMDLINE="${CMDLINE} console=ttyAMA0,115200 kgdboc=ttyAMA0,115200"
+  echo "enable_uart=1"  >> "${BOOT_DIR}/config.txt" 
+  # add string to cmdline
+  CMDLINE="${CMDLINE} console=serial0,115200"
+	  
+  # Enable serial console systemd style
+  chroot_exec systemctl enable serial-getty\@"$SET_SERIAL".service
+else
+  echo "enable_uart=0"  >> "${BOOT_DIR}/config.txt"
+  # disable serial console systemd style
+  chroot_exec systemctl disable serial-getty\@"$SET_SERIAL".service
 fi
 
 # Remove IPv6 networking support
@@ -89,42 +180,6 @@ if [ "$ENABLE_INITRAMFS" = true ] ; then
   echo "initramfs initramfs-${KERNEL_VERSION} followkernel" >> "${BOOT_DIR}/config.txt"
 fi
 
-# Disable RPi3 Bluetooth and restore ttyAMA0 serial device
-if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
-  if [ "$ENABLE_CONSOLE" = true ] && [ "$ENABLE_UBOOT" = false ] ; then
-    echo "dtoverlay=pi3-disable-bt" >> "${BOOT_DIR}/config.txt"
-    echo "enable_uart=1" >> "${BOOT_DIR}/config.txt"
-  else
-    # Create temporary directory for Bluetooth sources
-    temp_dir=$(as_nobody mktemp -d)
-
-    # Fetch Bluetooth sources
-    as_nobody git -C "${temp_dir}" clone "${BLUETOOTH_URL}"
-
-    # Copy downloaded sources
-    mv "${temp_dir}/pi-bluetooth" "${R}/tmp/"
-
-    # Set permissions
-    chown -R root:root "${R}/tmp/pi-bluetooth"
-
-    # Install tools
-    install_readonly "${R}/tmp/pi-bluetooth/usr/bin/btuart" "${R}/usr/bin/btuart"
-    install_readonly "${R}/tmp/pi-bluetooth/usr/bin/bthelper" "${R}/usr/bin/bthelper"
-
-    # Install bluetooth udev rule
-    install_readonly "${R}/tmp/pi-bluetooth/lib/udev/rules.d/90-pi-bluetooth.rules" "${LIB_DIR}/udev/rules.d/90-pi-bluetooth.rules"
-
-    # Install Firmware Flash file and apropiate licence
-    mkdir "${ETC_DIR}/firmware/"
-
-    wget -O "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" https://aur.archlinux.org/cgit/aur.git/plain/LICENCE.broadcom_bcm43xx?h=pi-bluetooth
-    wget -O "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" https://aur.archlinux.org/cgit/aur.git/plain/BCM43430A1.hcd?h=pi-bluetooth
-    
-    # Get /dev/serial back for compability
-    wget -O "${ETC_DIR}/udev/rules.d/99-com.rules" https://raw.githubusercontent.com/RPi-Distro/raspberrypi-sys-mods/master/etc.armhf/udev/rules.d/99-com.rules
-  fi
-fi
-
 # Create firmware configuration and cmdline symlinks
 ln -sf firmware/config.txt "${R}/boot/config.txt"
 ln -sf firmware/cmdline.txt "${R}/boot/cmdline.txt"
diff --git a/bootstrap.d/20-networking.sh b/bootstrap.d/20-networking.sh
index 3ca9f60..3aca05f 100644
--- a/bootstrap.d/20-networking.sh
+++ b/bootstrap.d/20-networking.sh
@@ -107,28 +107,26 @@ if [ "$ENABLE_WIRELESS" = true ] ; then
     as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.bin" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.bin"
     as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.txt" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.txt"
     as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.clm_blob" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.clm_blob"
+	
+	# Move downloaded firmware binary blob
+	mv "${temp_dir}/brcmfmac43455-sdio."* "${WLAN_FIRMWARE_DIR}/"
+	
+	# Set permissions of the firmware binary blob
+	chown root:root "${WLAN_FIRMWARE_DIR}/brcmfmac43455-sdio."*
+    chmod 600 "${WLAN_FIRMWARE_DIR}/brcmfmac43455-sdio."*
   elif [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 0 ] ; then
     # Fetch firmware binary blob for RPi3
     as_nobody wget -q -O "${temp_dir}/brcmfmac43430-sdio.bin" "${WLAN_FIRMWARE_URL}/brcmfmac43430-sdio.bin"
     as_nobody wget -q -O "${temp_dir}/brcmfmac43430-sdio.txt" "${WLAN_FIRMWARE_URL}/brcmfmac43430-sdio.txt"
-  fi
-  
-  # Move downloaded firmware binary blob
-  if [ "$RPI_MODEL" = 3P ] ; then
-    mv "${temp_dir}/brcmfmac43455-sdio."* "${WLAN_FIRMWARE_DIR}/"
-  elif [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 0 ] ; then
-    mv "${temp_dir}/brcmfmac43430-sdio."* "${WLAN_FIRMWARE_DIR}/"
+	
+	# Move downloaded firmware binary blob
+	mv "${temp_dir}/brcmfmac43430-sdio."* "${WLAN_FIRMWARE_DIR}/"
+	
+	# Set permissions of the firmware binary blob
+	chown root:root "${WLAN_FIRMWARE_DIR}/brcmfmac43430-sdio."*
+    chmod 600 "${WLAN_FIRMWARE_DIR}/brcmfmac43430-sdio."*
   fi
   
   # Remove temporary directory for firmware binary blob
   rm -fr "${temp_dir}"
-
-  # Set permissions of the firmware binary blob
-  if [ "$RPI_MODEL" = 3P ] ; then
-    chown root:root "${WLAN_FIRMWARE_DIR}/brcmfmac43455-sdio."*
-    chmod 600 "${WLAN_FIRMWARE_DIR}/brcmfmac43455-sdio."*
-  elif [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 0 ] ; then
-    chown root:root "${WLAN_FIRMWARE_DIR}/brcmfmac43430-sdio."*
-    chmod 600 "${WLAN_FIRMWARE_DIR}/brcmfmac43430-sdio."*
-  fi
 fi
diff --git a/bootstrap.d/30-security.sh b/bootstrap.d/30-security.sh
index 5fbfc7a..8ad8275 100644
--- a/bootstrap.d/30-security.sh
+++ b/bootstrap.d/30-security.sh
@@ -11,8 +11,8 @@ ENCRYPTED_USER_PASSWORD=$(mkpasswd -m sha-512 "${USER_PASSWORD}")
 
 # Setup default user
 if [ "$ENABLE_USER" = true ] ; then
-  chroot_exec adduser --gecos $USER_NAME --add_extra_groups --disabled-password $USER_NAME
-  chroot_exec usermod -a -G sudo -p "${ENCRYPTED_USER_PASSWORD}" $USER_NAME
+  chroot_exec adduser --gecos "$USER_NAME" --add_extra_groups --disabled-password "$USER_NAME"
+  chroot_exec usermod -a -G sudo -p "${ENCRYPTED_USER_PASSWORD}" "$USER_NAME"
 fi
 
 # Setup root password or not
diff --git a/bootstrap.d/41-uboot.sh b/bootstrap.d/41-uboot.sh
index 6d42bde..dded27d 100644
--- a/bootstrap.d/41-uboot.sh
+++ b/bootstrap.d/41-uboot.sh
@@ -41,7 +41,7 @@ if [ "$ENABLE_UBOOT" = true ] ; then
 
   # Install and setup U-Boot command file
   install_readonly files/boot/uboot.mkimage "${BOOT_DIR}/uboot.mkimage"
-  printf "# Set the kernel boot command line\nsetenv bootargs \"earlyprintk ${CMDLINE}\"\n\n$(cat ${BOOT_DIR}/uboot.mkimage)" > "${BOOT_DIR}/uboot.mkimage"
+  printf "# Set the kernel boot command line\nsetenv bootargs \"earlyprintk ${CMDLINE}\"\n\n$(cat "${BOOT_DIR}"/uboot.mkimage)" > "${BOOT_DIR}/uboot.mkimage"
 
   if [ "$ENABLE_INITRAMFS" = true ] ; then
     # Convert generated initramfs for U-Boot using mkimage
@@ -51,7 +51,7 @@ if [ "$ENABLE_UBOOT" = true ] ; then
     rm -f "${BOOT_DIR}/initramfs-${KERNEL_VERSION}"
 
     # Configure U-Boot to load generated initramfs
-    printf "# Set initramfs file\nsetenv initramfs initramfs-${KERNEL_VERSION}.uboot\n\n$(cat ${BOOT_DIR}/uboot.mkimage)" > "${BOOT_DIR}/uboot.mkimage"
+    printf "# Set initramfs file\nsetenv initramfs initramfs-${KERNEL_VERSION}.uboot\n\n$(cat "${BOOT_DIR}"/uboot.mkimage)" > "${BOOT_DIR}/uboot.mkimage"
     printf "\nbootz \${kernel_addr_r} \${ramdisk_addr_r} \${fdt_addr_r}" >> "${BOOT_DIR}/uboot.mkimage"
   else # ENABLE_INITRAMFS=false
     # Remove initramfs from U-Boot mkfile
@@ -65,19 +65,21 @@ if [ "$ENABLE_UBOOT" = true ] ; then
       printf "\nbootz \${kernel_addr_r} - \${fdt_addr_r}" >> "${BOOT_DIR}/uboot.mkimage"
     fi
   fi
-  
-  if [ "$KERNEL_ARCH" = "arm64" ] ; then
-    echo "Setting up config.txt to boot 64bit uboot"
-
-    printf "\n# 64bit-mode" >> "${BOOT_DIR}/config.txt"
-    printf "\n# arm_control=0x200 is deprecated https://www.raspberrypi.org/documentation/configuration/config-txt/misc.md" >> "${BOOT_DIR}/config.txt"
-    printf "\narm_64bit=1" >> "${BOOT_DIR}/config.txt"
 
+  if [ "$SET_ARCH" = 64 ] ; then
+    echo "Setting up config.txt to boot 64bit uboot"
+    {
+      printf "\n# 64bit-mode"
+      printf "\n# arm_control=0x200 is deprecated https://www.raspberrypi.org/documentation/configuration/config-txt/misc.md"
+      printf "\narm_64bit=1"
+    } >> "${BOOT_DIR}/config.txt"
+    
+    #in 64bit uboot booti is used instead of bootz [like in KERNEL_BIN_IMAGE=zImage (armv7)|| Image(armv8)]
     sed -i "s|bootz|booti|g" "${BOOT_DIR}/uboot.mkimage"
   fi
 
   # Set mkfile to use the correct dtb file
-  sed -i "s/^\(setenv dtbfile \).*/\1${DTB_FILE}/" "${BOOT_DIR}/uboot.mkimage"
+  sed -i "s|bcm2709-rpi-2-b.dtb|${DTB_FILE}|" "${BOOT_DIR}/uboot.mkimage"
 
   # Set mkfile to use the correct mach id
   if [ "$ENABLE_QEMU" = true ] ; then
@@ -85,7 +87,7 @@ if [ "$ENABLE_UBOOT" = true ] ; then
   fi
 
   # Set mkfile to use kernel image
-  sed -i "s/^\(fatload mmc 0:1 \${kernel_addr_r} \).*/\1${KERNEL_IMAGE}/" "${BOOT_DIR}/uboot.mkimage"
+  sed -i "s|kernel7.img|${KERNEL_IMAGE}|" "${BOOT_DIR}/uboot.mkimage"
 
   # Remove all leading blank lines
   sed -i "/./,\$!d" "${BOOT_DIR}/uboot.mkimage"
diff --git a/bootstrap.d/43-videocore.sh b/bootstrap.d/43-videocore.sh
index d42590c..b8ff518 100644
--- a/bootstrap.d/43-videocore.sh
+++ b/bootstrap.d/43-videocore.sh
@@ -8,16 +8,16 @@
 if [ "$ENABLE_VIDEOCORE" = true ] ; then
   # Copy existing videocore sources into chroot directory
   if [ -n "$VIDEOCORESRC_DIR" ] && [ -d "$VIDEOCORESRC_DIR" ] ; then
-    # Copy local U-Boot sources
+    # Copy local videocore sources
     cp -r "${VIDEOCORESRC_DIR}" "${R}/tmp/userland"
   else
-    # Create temporary directory for U-Boot sources
+    # Create temporary directory for videocore sources
     temp_dir=$(as_nobody mktemp -d)
 
-    # Fetch U-Boot sources
+    # Fetch videocore sources
     as_nobody git -C "${temp_dir}" clone "${VIDEOCORE_URL}"
 
-    # Copy downloaded U-Boot sources
+    # Copy downloaded videocore sources
     mv "${temp_dir}/userland" "${R}/tmp/"
 
     # Set permissions of the U-Boot sources
@@ -31,7 +31,7 @@ if [ "$ENABLE_VIDEOCORE" = true ] ; then
   mkdir "${R}"/tmp/userland/build
 
   # push us to build directory
-  pushd "${R}"/tmp/userland/build
+  cd "${R}"/tmp/userland/build
 
   if [ "$RELEASE_ARCH" = "arm64" ] ; then
   cmake -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_BUILD_TYPE=release -DARM64=ON -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ -DCMAKE_ASM_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE" -DCMAKE_ASM_FLAGS="${CMAKE_ASM_FLAGS} -c" -DVIDEOCORE_BUILD_DIR="${R}" "${R}/tmp/userland"
@@ -48,6 +48,6 @@ if [ "$ENABLE_VIDEOCORE" = true ] ; then
   #build userland
   make -j "$(nproc)"
 
-  #pop us out of build dir
-  popd
+  #back to root of scriptdir
+  cd "${WORKDIR}"
 fi
diff --git a/files/etc/99-com.rules b/files/etc/99-com.rules
new file mode 100644
index 0000000..fd6621d
--- /dev/null
+++ b/files/etc/99-com.rules
@@ -0,0 +1,33 @@
+SUBSYSTEM=="input", GROUP="input", MODE="0660"
+SUBSYSTEM=="i2c-dev", GROUP="i2c", MODE="0660"
+SUBSYSTEM=="spidev", GROUP="spi", MODE="0660"
+SUBSYSTEM=="bcm2835-gpiomem", GROUP="gpio", MODE="0660"
+
+SUBSYSTEM=="gpio", GROUP="gpio", MODE="0660"
+SUBSYSTEM=="gpio*", PROGRAM="/bin/sh -c '\
+	chown -R root:gpio /sys/class/gpio && chmod -R 770 /sys/class/gpio;\
+	chown -R root:gpio /sys/devices/virtual/gpio && chmod -R 770 /sys/devices/virtual/gpio;\
+	chown -R root:gpio /sys$devpath && chmod -R 770 /sys$devpath\
+'"
+
+KERNEL=="ttyAMA[01]", PROGRAM="/bin/sh -c '\
+	ALIASES=/proc/device-tree/aliases; \
+	if cmp -s $ALIASES/uart0 $ALIASES/serial0; then \
+		echo 0;\
+	elif cmp -s $ALIASES/uart0 $ALIASES/serial1; then \
+		echo 1; \
+	else \
+		exit 1; \
+	fi\
+'", SYMLINK+="serial%c"
+
+KERNEL=="ttyS0", PROGRAM="/bin/sh -c '\
+	ALIASES=/proc/device-tree/aliases; \
+	if cmp -s $ALIASES/uart1 $ALIASES/serial0; then \
+		echo 0; \
+	elif cmp -s $ALIASES/uart1 $ALIASES/serial1; then \
+		echo 1; \
+	else \
+		exit 1; \
+	fi \
+'", SYMLINK+="serial%c"
diff --git a/files/sysctl.d/83-rpi-printk.conf b/files/sysctl.d/83-rpi-printk.conf
new file mode 100644
index 0000000..f8948fb
--- /dev/null
+++ b/files/sysctl.d/83-rpi-printk.conf
@@ -0,0 +1 @@
+kernel.printk = 3 4 1 3
\ No newline at end of file
diff --git a/functions.sh b/functions.sh
index 6ee31da..74ca846 100644
--- a/functions.sh
+++ b/functions.sh
@@ -30,22 +30,22 @@ cleanup (){
 
 chroot_exec() {
   # Exec command in chroot
-  LANG=C LC_ALL=C DEBIAN_FRONTEND=noninteractive chroot ${R} $*
+  LANG=C LC_ALL=C DEBIAN_FRONTEND=noninteractive chroot "${R}" "$@"
 }
 
 as_nobody() {
   # Exec command as user nobody
-  sudo -E -u nobody LANG=C LC_ALL=C $*
+  sudo -E -u nobody LANG=C LC_ALL=C "$@"
 }
 
 install_readonly() {
   # Install file with user read-only permissions
-  install -o root -g root -m 644 $*
+  install -o root -g root -m 644 "$@"
 }
 
 install_exec() {
   # Install file with root exec permissions
-  install -o root -g root -m 744 $*
+  install -o root -g root -m 744 "$@"
 }
 
 use_template () {
@@ -64,14 +64,14 @@ chroot_install_cc() {
   if [ -z "${COMPILER_PACKAGES}" ] ; then
     COMPILER_PACKAGES=$(chroot_exec apt-get -s install g++ make bc | grep "^Inst " | awk -v ORS=" " '{ print $2 }')
 	# Install COMPILER_PACKAGES in chroot
-    chroot_exec apt-get -q -y --allow-unauthenticated --no-install-recommends install ${COMPILER_PACKAGES}
+    chroot_exec apt-get -q -y --allow-unauthenticated --no-install-recommends install "${COMPILER_PACKAGES}"
   fi
 }
 
 chroot_remove_cc() {
   # Remove c/c++ build environment from the chroot
-  if [ ! -z "${COMPILER_PACKAGES}" ] ; then
-    chroot_exec apt-get -qq -y --auto-remove purge ${COMPILER_PACKAGES}
+  if [ -n "${COMPILER_PACKAGES}" ] ; then
+    chroot_exec apt-get -qq -y --auto-remove purge "${COMPILER_PACKAGES}"
     COMPILER_PACKAGES=""
   fi
 }
diff --git a/rpi23-gen-image.sh b/rpi23-gen-image.sh
index 55ba2e5..575252a 100755
--- a/rpi23-gen-image.sh
+++ b/rpi23-gen-image.sh
@@ -59,7 +59,8 @@ VIDEOCORE_URL=${VIDEOCORE_URL:=https://github.com/raspberrypi/userland}
 BLUETOOTH_URL=${BLUETOOTH_URL:=https://github.com/RPi-Distro/pi-bluetooth.git}
 
 # Build directories
-BASEDIR=${BASEDIR:=$(pwd)/images/${RELEASE}}
+WORKDIR=$(pwd)
+BASEDIR=${BASEDIR:=${WORKDIR}/images/${RELEASE}}
 BUILDDIR="${BASEDIR}/build"
 
 # Chroot directories
@@ -69,6 +70,7 @@ LIB_DIR="${R}/lib"
 BOOT_DIR="${R}/boot/firmware"
 KERNEL_DIR="${R}/usr/src/linux"
 WLAN_FIRMWARE_DIR="${LIB_DIR}/firmware/brcm"
+BLUETOOTH_FIRMWARE_DIR="${ETC_DIR}/firmware/bt"
 
 # Firmware directory: Blank if download from github
 RPI_FIRMWARE_DIR=${RPI_FIRMWARE_DIR:=""}
@@ -105,6 +107,9 @@ APT_PROXY=${APT_PROXY:=""}
 APT_SERVER=${APT_SERVER:="ftp.debian.org"}
 
 # Feature settings
+ENABLE_PRINTK=${ENABLE_PRINTK:=false}
+ENABLE_BLUETOOTH=${ENABLE_BLUETOOTH:=false}
+ENABLE_MINIUART_OVERLAY=${ENABLE_MINIUART_OVERLAY:=false}
 ENABLE_CONSOLE=${ENABLE_CONSOLE:=true}
 ENABLE_I2C=${ENABLE_I2C:=false}
 ENABLE_SPI=${ENABLE_SPI:=false}
@@ -186,7 +191,7 @@ CHROOT_SCRIPTS=${CHROOT_SCRIPTS:=""}
 
 # Packages required in the chroot build environment
 APT_INCLUDES=${APT_INCLUDES:=""}
-APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils,locales,keyboard-configuration,console-setup"
+APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils,locales,keyboard-configuration,console-setup,libnss-systemd"
 
 # Packages to exclude from chroot build environment
 APT_EXCLUDES=${APT_EXCLUDES:=""}
@@ -200,6 +205,12 @@ COMPILER_PACKAGES=""
 
 set +x
 
+#Check if apt-cacher-ng has port 3142 open and set APT_PROXY
+APT_CACHER_RUNNING=$(lsof -i :3142 | grep apt-cacher-ng |  cut -d ' ' -f3 | uniq)
+if [ -n "${APT_CACHER_RUNNING}" ] ; then
+  APT_PROXY=http://127.0.0.1:3142/
+fi
+
 # Setup architecture specific settings
 if [ -n "$SET_ARCH" ] ; then
   # 64-bit configuration
@@ -252,37 +263,51 @@ else
   echo "error: Please set '32' or '64' as value for SET_ARCH"
   exit 1
 fi
-    # Device specific configuration and U-Boot configuration
-    case "$RPI_MODEL" in
-    0)
-      DTB_FILE=${DTB_FILE:=bcm2708-rpi-0-w.dtb}
-      UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_defconfig}
-      ;;
-    1)
-      DTB_FILE=${DTB_FILE:=bcm2708-rpi-b.dtb}
-      UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_defconfig}
-      ;;
-    1P)
-      DTB_FILE=${DTB_FILE:=bcm2708-rpi-b-plus.dtb}
-      UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_defconfig}
-      ;;
-    2)
-      DTB_FILE=${DTB_FILE:=bcm2709-rpi-2-b.dtb}
-      UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_2_defconfig}
-      ;;
-    3)
-      DTB_FILE=${DTB_FILE:=bcm2710-rpi-3-b.dtb}
-      UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_3_defconfig}
-      ;;
-    3P)
-      DTB_FILE=${DTB_FILE:=bcm2710-rpi-3-b.dtb}
-      UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_3_defconfig}
-      ;;
-    *)
-      echo "error: Raspberry Pi model $RPI_MODEL is not supported!"
-      exit 1
-      ;;
-    esac
+# Device specific configuration and U-Boot configuration
+case "$RPI_MODEL" in
+  0)
+    DTB_FILE=${DTB_FILE:=bcm2708-rpi-0-w.dtb}
+    UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_defconfig}
+    ;;
+  1)
+    DTB_FILE=${DTB_FILE:=bcm2708-rpi-b.dtb}
+    UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_defconfig}
+    ;;
+  1P)
+    DTB_FILE=${DTB_FILE:=bcm2708-rpi-b-plus.dtb}
+    UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_defconfig}
+    ;;
+  2)
+    DTB_FILE=${DTB_FILE:=bcm2709-rpi-2-b.dtb}
+    UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_2_defconfig}
+    ;;
+  3)
+    DTB_FILE=${DTB_FILE:=bcm2710-rpi-3-b.dtb}
+    UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_3_defconfig}
+    ;;
+  3P)
+    DTB_FILE=${DTB_FILE:=bcm2710-rpi-3-b.dtb}
+    UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_3_defconfig}
+    ;;
+  *)
+    echo "error: Raspberry Pi model $RPI_MODEL is not supported!"
+    exit 1
+    ;;
+esac
+
+# Raspberry PI 0,3,3P with Bluetooth and Wifi onboard
+if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
+  # Include bluetooth packages on supported boards
+  if [ "$ENABLE_BLUETOOTH" = true ] && [ "$ENABLE_CONSOLE" = false ]; then
+    APT_INCLUDES="${APT_INCLUDES},bluetooth,bluez"
+  fi
+else # Raspberry PI 1,1P,2 without Wifi and bluetooth onboard
+  # Check if the internal wireless interface is not supported by the RPi model
+  if [ "$ENABLE_WIRELESS" = true ] || [ "$ENABLE_BLUETOOTH" = true ]; then
+    echo "error: The selected Raspberry Pi model has no integrated interface for wireless or bluetooth"
+    exit 1
+  fi
+fi
 
 # Prepare date string for default image file name
 DATE="$(date +%Y-%m-%d)"
@@ -292,16 +317,6 @@ else
   IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-${KERNEL_BRANCH}-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}}
 fi
 
-# Check if the internal wireless interface is supported by the RPi model
-if [ "$ENABLE_WIRELESS" = true ] ; then
-  if [ "$RPI_MODEL" = 1 ] || [ "$RPI_MODEL" = 1P ] || [ "$RPI_MODEL" = 2 ] ; then
-    echo "error: The selected Raspberry Pi model has no internal wireless interface"
-    exit 1
-  else
-    echo "Raspberry Pi $RPI_MODEL has WIFI support"
-  fi
-fi
-
 # Check if DISABLE_UNDERVOLT_WARNINGS parameter value is supported
 if [ -n "$DISABLE_UNDERVOLT_WARNINGS" ] ; then
   if [ "$DISABLE_UNDERVOLT_WARNINGS" != 1 ] && [ "$DISABLE_UNDERVOLT_WARNINGS" != 2 ] ; then
@@ -347,6 +362,14 @@ if [ "$ENABLE_UBOOT" = true ] ; then
   APT_INCLUDES="${APT_INCLUDES},device-tree-compiler,bison,flex,bc"
 fi
 
+if [ "$ENABLE_BLUETOOTH" = true ] ; then
+  if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
+    if [ "$ENABLE_CONSOLE" = false ] ; then
+	  APT_INCLUDES="${APT_INCLUDES},bluetooth,bluez"
+	fi
+  fi
+fi
+
 # Check if root SSH (v2) public key file exists
 if [ -n "$SSH_ROOT_PUB_KEY" ] ; then
   if [ ! -f "$SSH_ROOT_PUB_KEY" ] ; then
@@ -365,7 +388,7 @@ fi
 
 # Check if all required packages are installed on the build system
 for package in $REQUIRED_PACKAGES ; do
-  if [ "$(dpkg-query -W -f='${Status}' $package)" != "install ok installed" ] ; then
+  if [ "$(dpkg-query -W -f='${Status}' "$package")" != "install ok installed" ] ; then
     MISSING_PACKAGES="${MISSING_PACKAGES} $package"
   fi
 done