| @@ -87,7 +87,7 if [ "$ENABLE_TURBO" = true ] ; then | |||
|
|
87 | 87 | fi |
|
|
88 | 88 | |
|
|
89 | 89 | if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then |
|
|
90 | ||
|
|
90 | ||
|
|
91 | 91 | # Bluetooth enabled |
|
|
92 | 92 | if [ "$ENABLE_BLUETOOTH" = true ] ; then |
|
|
93 | 93 | # Create temporary directory for Bluetooth sources |
| @@ -109,7 +109,7 if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then | |||
|
|
109 | 109 | # Install tools |
|
|
110 | 110 | install_readonly "${R}/tmp/pi-bluetooth/usr/bin/btuart" "${R}/usr/bin/btuart" |
|
|
111 | 111 | install_readonly "${R}/tmp/pi-bluetooth/usr/bin/bthelper" "${R}/usr/bin/bthelper" |
|
|
112 | ||
|
|
112 | ||
|
|
113 | 113 | # make scripts executable |
|
|
114 | 114 | chmod +x "${R}/usr/bin/bthelper" |
|
|
115 | 115 | chmod +x "${R}/usr/bin/btuart" |
| @@ -123,11 +123,11 if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then | |||
|
|
123 | 123 | install_readonly "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" "${BLUETOOTH_FIRMWARE_DIR}/LICENCE.broadcom_bcm43xx" |
|
|
124 | 124 | install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.bthelper@.service" "${ETC_DIR}/systemd/system/pi-bluetooth.bthelper@.service" |
|
|
125 | 125 | install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.hciuart.service" "${ETC_DIR}/systemd/system/pi-bluetooth.hciuart.service" |
|
|
126 | ||
|
|
126 | ||
|
|
127 | 127 | # Remove temporary directories |
|
|
128 | 128 | rm -fr "${temp_dir}" |
|
|
129 | 129 | rm -fr "${R}"/tmp/pi-bluetooth |
|
|
130 | ||
|
|
130 | ||
|
|
131 | 131 | # 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 |
|
|
132 | 132 | if [ "$ENABLE_MINIUART_OVERLAY" = true ] ; then |
|
|
133 | 133 | |
| @@ -139,10 +139,10 if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then | |||
|
|
139 | 139 | echo "core_freq=250" >> "${BOOT_DIR}/config.txt" |
|
|
140 | 140 | fi |
|
|
141 | 141 | fi |
|
|
142 | ||
|
|
142 | ||
|
|
143 | 143 | # Activate services |
|
|
144 | 144 | chroot_exec systemctl enable pi-bluetooth.hciuart.service |
|
|
145 | ||
|
|
145 | ||
|
|
146 | 146 | else # if ENABLE_BLUETOOTH = false |
|
|
147 | 147 | # set overlay to disable bluetooth |
|
|
148 | 148 | echo "dtoverlay=pi3-disable-bt" >> "${BOOT_DIR}/config.txt" |
| @@ -154,7 +154,7 if [ "$ENABLE_CONSOLE" = true ] ; then | |||
|
|
154 | 154 | echo "enable_uart=1" >> "${BOOT_DIR}/config.txt" |
|
|
155 | 155 | # add string to cmdline |
|
|
156 | 156 | CMDLINE="${CMDLINE} console=serial0,115200" |
|
|
157 | ||
|
|
157 | ||
|
|
158 | 158 | # Enable serial console systemd style |
|
|
159 | 159 | chroot_exec systemctl enable serial-getty\@serial0.service |
|
|
160 | 160 | else |
| @@ -8,6 +8,7 INITRAMFS_UBOOT="${INITRAMFS}.uboot" | |||
|
|
8 | 8 | # Extract kernel arch |
|
|
9 | 9 | case "${KERNEL_ARCH}" in |
|
|
10 | 10 | arm*) KERNEL_ARCH=arm ;; |
|
|
11 | aarch64) KERNEL_ARCH=arm64 ;; | |
|
|
11 | 12 | esac |
|
|
12 | 13 | |
|
|
13 | 14 | # Regenerate initramfs |
| @@ -63,15 +63,15 chroot_install_cc() { | |||
|
|
63 | 63 | # Install c/c++ build environment inside the chroot |
|
|
64 | 64 | if [ -z "${COMPILER_PACKAGES}" ] ; then |
|
|
65 | 65 | COMPILER_PACKAGES=$(chroot_exec apt-get -s install g++ make bc | grep "^Inst " | awk -v ORS=" " '{ print $2 }') |
|
|
66 | # Install COMPILER_PACKAGES in chroot | |
|
|
67 |
chroot_exec apt-get -q -y --allow-unauthenticated --no-install-recommends install |
|
|
|
66 | # Install COMPILER_PACKAGES in chroot - NEVER do "${COMPILER_PACKAGES}" -> breaks uboot | |
|
|
67 | chroot_exec apt-get -q -y --allow-unauthenticated --no-install-recommends install ${COMPILER_PACKAGES} | |
|
|
68 | 68 | fi |
|
|
69 | 69 | } |
|
|
70 | 70 | |
|
|
71 | 71 | chroot_remove_cc() { |
|
|
72 | 72 | # Remove c/c++ build environment from the chroot |
|
|
73 | 73 | if [ -n "${COMPILER_PACKAGES}" ] ; then |
|
|
74 |
chroot_exec apt-get -qq -y --auto-remove purge |
|
|
|
74 | chroot_exec apt-get -qq -y --auto-remove purge ${COMPILER_PACKAGES} | |
|
|
75 | 75 | COMPILER_PACKAGES="" |
|
|
76 | 76 | fi |
|
|
77 | 77 | } |
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant
