| @@ -52,6 +52,7 else | |||
|
|
52 | 52 | fi |
|
|
53 | 53 | |
|
|
54 | 54 | |
|
|
55 | ||
|
|
55 | 56 | # Add encrypted root partition to cmdline.txt |
|
|
56 | 57 | if [ "$ENABLE_CRYPTFS" = true ] ; then |
|
|
57 | 58 | if [ "$ENABLE_SPLITFS" = true ] ; then |
| @@ -104,10 +105,28 if [ "$ENABLE_INITRAMFS" = true ] ; then | |||
|
|
104 | 105 | fi |
|
|
105 | 106 | |
|
|
106 | 107 | # Disable RPi3 Bluetooth and restore ttyAMA0 serial device |
|
|
107 | if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then | |
|
|
108 | if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 3P ]; then | |
|
|
108 | 109 | if [ "$ENABLE_CONSOLE" = true ] && [ "$ENABLE_UBOOT" = false ] ; then |
|
|
109 | 110 | echo "dtoverlay=pi3-disable-bt" >> "${BOOT_DIR}/config.txt" |
|
|
110 | 111 | echo "enable_uart=1" >> "${BOOT_DIR}/config.txt" |
|
|
112 | #else | |
|
|
113 | # Create temporary directory for U-Boot sources | |
|
|
114 | #temp_dir=$(as_nobody mktemp -d) | |
|
|
115 | ||
|
|
116 | # Fetch U-Boot sources | |
|
|
117 | #as_nobody git -C "${temp_dir}" clone "${BLUETOOTH_URL}" | |
|
|
118 | ||
|
|
119 | # Copy downloaded U-Boot sources | |
|
|
120 | #mv "${temp_dir}/pi-bluetooth" "${R}/tmp/" | |
|
|
121 | ||
|
|
122 | # Set permissions of the U-Boot sources | |
|
|
123 | #chown -R root:root "${R}/tmp/pi-bluetooth" | |
|
|
124 | ||
|
|
125 | # Remove temporary directory for U-Boot sources | |
|
|
126 | #rm -fr "${temp_dir}" | |
|
|
127 | ||
|
|
128 | ||
|
|
129 | #"${R}/tmp/userland" | |
|
|
111 | 130 | fi |
|
|
112 | 131 | fi |
|
|
113 | 132 | |
| @@ -42,5 +42,5 if [ "$ENABLE_VIDEOCORE" = true ] ; then | |||
|
|
42 | 42 | #build userland |
|
|
43 | 43 | make -j "$(nproc)" |
|
|
44 | 44 | #include default_installdir in path |
|
|
45 | chroot_exec PATH="${PATH}":/opt/vc/bin | |
|
|
45 | # chroot_exec export PATH="${PATH}":/opt/vc/bin | |
|
|
46 | 46 | fi |
| @@ -72,6 +72,7 if [ "$ENABLE_UBOOT" = true ] ; then | |||
|
|
72 | 72 | printf "\n# 64bit-mode" >> "${BOOT_DIR}/config.txt" |
|
|
73 | 73 | printf "\n# arm_control=0x200 is deprecated https://www.raspberrypi.org/documentation/configuration/config-txt/misc.md" >> "${BOOT_DIR}/config.txt" |
|
|
74 | 74 | printf "\narm_64bit=1" >> "${BOOT_DIR}/config.txt" |
|
|
75 | #in 64bit uboot booti is used instead of bootz [like in KERNEL_BIN_IMAGE=zImage (armv7)|| Image(armv8)] | |
|
|
75 | 76 | sed -i "s|bootz|booti|g" "${BOOT_DIR}/uboot.mkimage" |
|
|
76 | 77 | fi |
|
|
77 | 78 | |
| @@ -56,6 +56,8 COLLABORA_URL=${COLLABORA_URL:=https://repositories.collabora.co.uk/debian} | |||
|
|
56 | 56 | FBTURBO_URL=${FBTURBO_URL:=https://github.com/ssvb/xf86-video-fbturbo.git} |
|
|
57 | 57 | UBOOT_URL=${UBOOT_URL:=https://git.denx.de/u-boot.git} |
|
|
58 | 58 | VIDEOCORE_URL=${VIDEOCORE_URL=https://github.com/raspberrypi/userland} |
|
|
59 | #https://aur.archlinux.org/packages/pi-bluetooth/ | |
|
|
60 | BLUETOOTH_URL=${BLUETOOTH_URL:=https://aur.archlinux.org/pi-bluetooth.git} | |
|
|
59 | 61 | |
|
|
60 | 62 | # Build directories |
|
|
61 | 63 | BASEDIR=${BASEDIR:=$(pwd)/images/${RELEASE}} |
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant
