Raspi2-3_GenImage Commit - r443:c6c99c428cd2 · Collaboration Tremplin des Sciences

Better Bluetooth and serial...

Unknown -

r443:c6c99c428cd2

parent child

Context file:

r443:c6c99c428cd2

Collapse all files

files/sysctl.d/83-rpi-printk.conf created 644 +1 0

	@@ -0,0 +1,1
				1	kernel.printk = 3 4 1 3 No newline at end of file

files/udev/99-com.rules created 644 +33 0

@@ -0,0 +1,33
	1	SUBSYSTEM=="input", GROUP="input", MODE="0660"
	2	SUBSYSTEM=="i2c-dev", GROUP="i2c", MODE="0660"
	3	SUBSYSTEM=="spidev", GROUP="spi", MODE="0660"
	4	SUBSYSTEM=="bcm2835-gpiomem", GROUP="gpio", MODE="0660"
	5
	6	SUBSYSTEM=="gpio", GROUP="gpio", MODE="0660"
	7	SUBSYSTEM=="gpio*", PROGRAM="/bin/sh -c '\
	8	chown -R root:gpio /sys/class/gpio && chmod -R 770 /sys/class/gpio;\
	9	chown -R root:gpio /sys/devices/virtual/gpio && chmod -R 770 /sys/devices/virtual/gpio;\
	10	chown -R root:gpio /sys$devpath && chmod -R 770 /sys$devpath\
	11	'"
	12
	13	KERNEL=="ttyAMA[01]", PROGRAM="/bin/sh -c '\
	14	ALIASES=/proc/device-tree/aliases; \
	15	if cmp -s $ALIASES/uart0 $ALIASES/serial0; then \
	16	echo 0;\
	17	elif cmp -s $ALIASES/uart0 $ALIASES/serial1; then \
	18	echo 1; \
	19	else \
	20	exit 1; \
	21	fi\
	22	'", SYMLINK+="serial%c"
	23
	24	KERNEL=="ttyS0", PROGRAM="/bin/sh -c '\
	25	ALIASES=/proc/device-tree/aliases; \
	26	if cmp -s $ALIASES/uart1 $ALIASES/serial0; then \
	27	echo 0; \
	28	elif cmp -s $ALIASES/uart1 $ALIASES/serial1; then \
	29	echo 1; \
	30	else \
	31	exit 1; \
	32	fi \
	33	'", SYMLINK+="serial%c"

README.md +13 -4

             #### Basic system features:
             ##### `ENABLE_CONSOLE`=true
-            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.
+            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 RPi2/3. Please check the [RPi2/3 pinout diagrams](https://elinux.org/RPi_Low-level_peripherals) to connect the right GPIO pins.
             ##### `ENABLE_WIRELESS`=false
             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_BLUETOOTH`=false
-            Enable Bluetooth interface on the RPi0/3/3P.
             ##### `ENABLE_RSYSLOG`=true
             If set to false, disable and uninstall rsyslog (so logs will be available only in journal files)

bootstrap.d/13-kernel.sh +5 -13

                   #Switch to KERNELSRC_DIR
                   cd "${KERNEL_DIR}"
-                  # GPL v2.0
+            	  # enable ZSWAP see https://askubuntu.com/a/472227 or https://wiki.archlinux.org/index.php/zswap
-                  #https://github.com/sakaki-/bcmrpi3-kernel-bis/blob/master/conform_config.sh
                   if [ "$KERNEL_ZSWAP" = true ] && { [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; } ; then
-                    # enable ZSWAP support for better performance during large builds etc.
-                    # requires activation via kernel parameter or sysfs
-                    # see e.g. https://askubuntu.com/a/472227 for a summary of ZSWAP (vs ZRAM etc.)
-                    # and e.g. https://wiki.archlinux.org/index.php/zswap for parameters etc.
                     set_kernel_config ZPOOL y
                     set_kernel_config ZSWAP y
                     set_kernel_config ZBUD y
                     set_kernel_config PGTABLE_MAPPING y
             	  fi
+                  # enable basic KVM support; see https://www.raspberrypi.org/forums/viewtopic.php?f=63&t=210546&start=25#p1300453
             	  if [ "$KERNEL_VIRT" = true ] && { [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; } ; then
-                   # enable basic KVM support; see e.g.
-                    # https://www.raspberrypi.org/forums/viewtopic.php?f=63&t=210546&start=25#p1300453
                     set_kernel_config VIRTUALIZATION y
                     set_kernel_config KVM y
                     set_kernel_config VHOST_NET m
                     set_kernel_config VHOST_CROSS_ENDIAN_LEGACY y
             	  fi
-            	  #See https://github.com/raspberrypi/linux/issues/2177#issuecomment-354647406
-                  # Netfilter kernel support
+                  # Netfilter kernel support See https://github.com/raspberrypi/linux/issues/2177#issuecomment-354647406
             	  if [ "$KERNEL_NF" = true ] && { [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; } ; then
                     set_kernel_config CONFIG_NETFILTER_XTABLES m
                     set_kernel_config CONFIG_NF_DUP_NETDEV m
                     set_kernel_config NETFILTER_XTABLES m
                   fi
-            	  #https://groups.google.com/forum/#!topic/linux.gentoo.user/_2aSc_ztGpA
+            	  # Enables BPF syscall for systemd-journald see https://github.com/torvalds/linux/blob/master/init/Kconfig#L848 or https://groups.google.com/forum/#!topic/linux.gentoo.user/_2aSc_ztGpA
-            	  #https://github.com/torvalds/linux/blob/master/init/Kconfig#L848
-            	  # Enables BPF syscall for systemd-journald
             	  if [ "$KERNEL_BPF" = true ] && { [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; } ; then
                     set_kernel_config CONFIG_BPF_SYSCALL y
             	    set_kernel_config CONFIG_CGROUP_BPF y

bootstrap.d/15-rpi-config.sh +78 -40

@@ -51,8 +51,6 else
51	fi	51	fi
52	fi	52	fi
53		53
54
55
56	# Add encrypted root partition to cmdline.txt	54	# Add encrypted root partition to cmdline.txt
57	if [ "$ENABLE_CRYPTFS" = true ] ; then	55	if [ "$ENABLE_CRYPTFS" = true ] ; then
58	if [ "$ENABLE_SPLITFS" = true ] ; then	56	if [ "$ENABLE_SPLITFS" = true ] ; then
@@ -66,47 +64,24 if [ "$ENABLE_CRYPTFS" = true ] ; then
66	fi	64	fi
67	fi	65	fi
68		66
69	# Add serial console support	67	#locks cpu at max frequency
70	#if [ "$ENABLE_~~CONSOLE~~" = true ] ; then	68	if [ "$ENABLE_TURBO" = true ] ; then
71	# CMDLINE="${CMDLINE} console=ttyAMA0,115200 kgdboc=ttyAMA0,115200"	69	echo "force_turbo=1" >> "${BOOT_DIR}/config.txt"
72	#fi
73
74	# Remove IPv6 networking support
75	if [ "$ENABLE_IPV6" = false ] ; then
76	CMDLINE="${CMDLINE} ipv6.disable=1"
77	fi	70	fi
78		71
79	# Automatically assign predictable network interface names	72	if [ "$ENABLE_PRINTK" = true ] ; then
80	if [ "$ENABLE_IFNAMES" = false ] ; then	73	install_readonly files/sysctl.d/83-rpi-printk.conf "${ETC_DIR}/sysctl.d/83-rpi-printk.conf"
81	CMDLINE="${CMDLINE} net.ifnames=0"
82	else
83	CMDLINE="${CMDLINE} net.ifnames=1"
84	fi	74	fi
85		75
86	# Install firmware boot cmdline	76	# Install udev rule for serial alias
87	echo "${CMDLINE}" > "${BOOT_DIR}/cmdline.txt"	77	install_readonly files/etc/99-com.rules "${ETC_DIR}/udev/rules.d/99-com.rules"
88		78
89	# Install firmware config	79	if [ "$RPI_MODEL" = 0 ] \|\| [ "$RPI_MODEL" = 3 ] \|\| [ "$RPI_MODEL" = 3P ] ; then
90	install_readonly files/boot/config.txt "${BOOT_DIR}/config.txt"
91		80
92	# Setup minimal GPU memory allocation size: 16MB (no X)	81	# RPI0,3,3P Use default ttyS0 (mini-UART)as serial interface
93	if [ "$ENABLE_MINGPU" = true ] ; then	82	SET_SERIAL="ttyS0"
94	echo "gpu_mem=16" >> "${BOOT_DIR}/config.txt"
95	fi
96
97	# Setup boot with initramfs
98	if [ "$ENABLE_INITRAMFS" = true ] ; then
99	echo "initramfs initramfs-${KERNEL_VERSION} followkernel" >> "${BOOT_DIR}/config.txt"
100	fi
101
102	# Disable RPi3 Bluetooth and restore ttyAMA0 serial device
103	if [ "$RPI_MODEL" = 3 ] \|\| [ "$RPI_MODEL" = 3P ] ; then
104	if [ "$ENABLE_CONSOLE" = true ] && [ "$ENABLE_UBOOT" = false ] ; then
105	echo "dtoverlay=pi3-disable-bt" >> "${BOOT_DIR}/config.txt"
106	echo "enable_uart=1" >> "${BOOT_DIR}/config.txt"
107	fi
108	fi
109		83
		84	# Bluetooth enabled
110	if [ "$ENABLE_BLUETOOTH" = true ] ; then	85	if [ "$ENABLE_BLUETOOTH" = true ] ; then
111	# Create temporary directory for Bluetooth sources	86	# Create temporary directory for Bluetooth sources
112	temp_dir=$(as_nobody mktemp -d)	87	temp_dir=$(as_nobody mktemp -d)
@@ -117,8 +92,6 if [ "$ENABLE_BLUETOOTH" = true ] ; then
117	# Copy downloaded sources	92	# Copy downloaded sources
118	mv "${temp_dir}/pi-bluetooth" "${R}/tmp/"	93	mv "${temp_dir}/pi-bluetooth" "${R}/tmp/"
119		94
120	# Raspberry-sys-mod package for /dev/serial device needed by bluetooth service
121	as_nobody wget -q -O "${R}/tmp/pi-bluetooth/99-com.rules" https://raw.githubusercontent.com/RPi-Distro/raspberrypi-sys-mods/master/etc.armhf/udev/rules.d/99-com.rules
122	# Bluetooth firmware from arch aur https://aur.archlinux.org/packages/pi-bluetooth/	95	# Bluetooth firmware from arch aur https://aur.archlinux.org/packages/pi-bluetooth/
123	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	96	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
124	as_nobody wget -q -O "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" https://aur.archlinux.org/cgit/aur.git/plain/BCM43430A1.hcd?h=pi-bluetooth	97	as_nobody wget -q -O "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" https://aur.archlinux.org/cgit/aur.git/plain/BCM43430A1.hcd?h=pi-bluetooth
@@ -139,11 +112,76 if [ "$ENABLE_BLUETOOTH" = true ] ; then
139	install_readonly "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" "${ETC_DIR}/firmware/LICENCE.broadcom_bcm43xx"	112	install_readonly "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" "${ETC_DIR}/firmware/LICENCE.broadcom_bcm43xx"
140	install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.bthelper@.service" "${ETC_DIR}/systemd/system/pi-bluetooth.bthelper@.service"	113	install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.bthelper@.service" "${ETC_DIR}/systemd/system/pi-bluetooth.bthelper@.service"
141	install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.hciuart.service" "${ETC_DIR}/systemd/system/pi-bluetooth.hciuart.service"	114	install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.hciuart.service" "${ETC_DIR}/systemd/system/pi-bluetooth.hciuart.service"
142	# Install udev rule for bluetooth device
143	install_readonly "${R}/tmp/pi-bluetooth/99-com.rules" "${ETC_DIR}/udev/rules.d/99-com.rules"
144		115
145	# Remove temporary directory	116	# Remove temporary directory
146	rm -fr "${temp_dir}"	117	rm -fr "${temp_dir}"
		118
		119	# 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
		120	if [ "$ENABLE_MINIUART_OVERLAY" = true ] ; then
		121
		122	# set overlay to swap ttyAMA0 and ttyS0
		123	echo "dtoverlay=pi3-miniuart-bt" >> "${BOOT_DIR}/config.txt"
		124
		125	# if force_turbo didn't lock cpu at high speed, lock it at low speed (XOR logic) or miniuart will be broken
		126	if [ "$ENABLE_TURBO" = false ] ; then
		127	echo "core_freq=250" >> "${BOOT_DIR}/config.txt"
		128	fi
		129	fi
		130
		131	else # if ENABLE_BLUETOOTH = false
		132	# set overlay to disable bluetooth
		133	echo "dtoverlay=pi3-disable-bt" >> "${BOOT_DIR}/config.txt"
		134	fi # ENABLE_BLUETOOTH end
		135
		136	else
		137	# RPI1,1P,2 Use default ttyAMA0 (full UART) as serial interface
		138	SET_SERIAL="ttyAMA0"
		139	fi
		140
		141	# may need sudo systemctl disable hciuart
		142	if [ "$ENABLE_CONSOLE" = true ] ; then
		143	echo "enable_uart=1" >> "${BOOT_DIR}/config.txt"
		144
		145	# add string to cmdline
		146	CMDLINE="${CMDLINE} console=serial0,115200"
		147
		148	# Enable serial console systemd style
		149	chroot_exec systemctl start serial-getty@"$SET_SERIAL".service
		150	chroot_exec systemctl enable serial-getty@"$SET_SERIAL".service
		151	else
		152	echo "enable_uart=0" >> "${BOOT_DIR}/config.txt"
		153
		154	# Enable serial console systemd style
		155	chroot_exec systemctl stop serial-getty@"$SET_SERIAL".service
		156	chroot_exec systemctl disable serial-getty@"$SET_SERIAL".service
		157	fi
		158
		159	# Remove IPv6 networking support
		160	if [ "$ENABLE_IPV6" = false ] ; then
		161	CMDLINE="${CMDLINE} ipv6.disable=1"
		162	fi
		163
		164	# Automatically assign predictable network interface names
		165	if [ "$ENABLE_IFNAMES" = false ] ; then
		166	CMDLINE="${CMDLINE} net.ifnames=0"
		167	else
		168	CMDLINE="${CMDLINE} net.ifnames=1"
		169	fi
		170
		171	# Install firmware boot cmdline
		172	echo "${CMDLINE}" > "${BOOT_DIR}/cmdline.txt"
		173
		174	# Install firmware config
		175	install_readonly files/boot/config.txt "${BOOT_DIR}/config.txt"
		176
		177	# Setup minimal GPU memory allocation size: 16MB (no X)
		178	if [ "$ENABLE_MINGPU" = true ] ; then
		179	echo "gpu_mem=16" >> "${BOOT_DIR}/config.txt"
		180	fi
		181
		182	# Setup boot with initramfs
		183	if [ "$ENABLE_INITRAMFS" = true ] ; then
		184	echo "initramfs initramfs-${KERNEL_VERSION} followkernel" >> "${BOOT_DIR}/config.txt"
147	fi	185	fi
148		186
149	# Create firmware configuration and cmdline symlinks	187	# Create firmware configuration and cmdline symlinks

bootstrap.d/30-security.sh 0 -5

@@ -22,8 +22,3 else
22	# Set no root password to disable root login	22	# Set no root password to disable root login
23	chroot_exec usermod -p \'!\' root	23	chroot_exec usermod -p \'!\' root
24	fi	24	fi
25
26	# Enable serial console systemd style
27	if [ "$ENABLE_CONSOLE" = true ] ; then
28	chroot_exec systemctl enable serial-getty\@ttyAMA0.service
29	fi

rpi23-gen-image.sh +15 -17

             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}
             #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
+            if [ -n "${APT_CACHER_RUNNING}" ] ; then
               APT_PROXY=http://127.0.0.1:3142/
             fi
                 ;;
             esac
-            # Prepare date string for default image file name
+            # Raspberry PI 0,3,3P with Bluetooth and Wifi onboard
-            DATE="$(date +%Y-%m-%d)"
-            if [ -z "$KERNEL_BRANCH" ] ; then
-              IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-CURRENT-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}}
-            else
-              IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-${KERNEL_BRANCH}-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}}
-            fi
             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
-              # Check if console or bluetooth configuration is invalid on RPI 0,3,3P
+            else # Raspberry PI 1,1P,2 without Wifi and bluetooth onboard
-              if [ "$ENABLE_BLUETOOTH" = true ] && [ "$ENABLE_CONSOLE" = true ]; then
-                echo "error: ENABLE_BLUETOOTH and ENABLE_CONSOLE can't be active on the same time."
-                exit 1
-              fi
-              else # if [ "$RPI_MODEL" = 1 ] || [ "$RPI_MODEL" = 1P ] || [ "$RPI_MODEL" = 2 ] ; then
               # Check if the internal wireless interface is not supported by the RPi model
-                if [ "$ENABLE_WIRELESS" = true ] ; then
+              if [ "$ENABLE_WIRELESS" = true ] || [ "$ENABLE_BLUETOOTH" = true ]; then
-                  echo "error: The selected Raspberry Pi model has no internal wireless interface"
+                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)"
+            if [ -z "$KERNEL_BRANCH" ] ; then
+              IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-CURRENT-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}}
+            else
+              IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-${KERNEL_BRANCH}-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}}
+            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

General Comments 0

Écrire
Preview

Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Dépôts
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages