##// END OF EJS Templates
fixes
burnbabyburn -
r321:8d65dbaf659e
parent child
Show More
@@ -25,7 +25,7 fi
25 25 #rm files/apt/sources.list
26 26 #netselect-apt does not know buster yet
27 27 if [ "$RELEASE" = "buster" ] ; then
28 RELEASE=${RELEASE:=testing}
28 RELEASE=testing
29 29 fi
30 30
31 31 if [ "$ENABLE_NONFREE" = true ] ; then
@@ -1,3 +1,4
1 #!/bin/bash
1 2 #
2 3 # Setup Logging
3 4 #
@@ -40,6 +40,14 if [ "$ENABLE_UBOOT" = true ] ; then
40 40 install_readonly "${R}/tmp/u-boot/u-boot.bin" "${BOOT_DIR}/u-boot.bin"
41 41 printf "\n# boot u-boot kernel\nkernel=u-boot.bin\n" >> "${BOOT_DIR}/config.txt"
42 42
43 if [ "$SET_ARCH" = 64 ] ; then
44 #add arm_64bit=1
45 #device_tree_address=0x100
46 #device_tree_end=0x8000
47 #to config.txt
48 echo "Setting up config.txt to boot 64bit uboot"
49 fi
50
43 51 # Install and setup U-Boot command file
44 52 install_readonly files/boot/uboot.mkimage "${BOOT_DIR}/uboot.mkimage"
45 53 printf "# Set the kernel boot command line\nsetenv bootargs \"earlyprintk ${CMDLINE}\"\n\n$(cat "${BOOT_DIR}"/uboot.mkimage)" > "${BOOT_DIR}/uboot.mkimage"
@@ -209,17 +209,13 if [ -n "$SET_ARCH" ] ; then
209 209 QEMU_BINARY=${QEMU_BINARY:=/usr/bin/qemu-aarch64-static}
210 210 KERNEL_ARCH=${KERNEL_ARCH:=arm64}
211 211 KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="Image"}
212 RELEASE_ARCH=${RELEASE_ARCH:=arm64}
213 CROSS_COMPILE=${CROSS_COMPILE:=aarch64-linux-gnu-}
214 REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-arm64"
215 212
216 213 if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
217 # RPI 3 serie specific settings
218 DTB_FILE=${DTB_FILE:=bcm2710-rpi-3-b.dtb}
219 UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_3_defconfig}
220
214 REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-arm64"
221 215 KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi3_defconfig}
216 RELEASE_ARCH=${RELEASE_ARCH:=arm64}
222 217 KERNEL_IMAGE=${KERNEL_IMAGE:=kernel8.img}
218 CROSS_COMPILE=${CROSS_COMPILE:=aarch64-linux-gnu-}
223 219 else
224 220 echo "error: At the moment Raspberry PI 3 and 3B+ are the only Models which support 64bit"
225 221 exit 1
@@ -241,7 +237,6 if [ -n "$SET_ARCH" ] ; then
241 237 echo "Setting settings for bcm2835 Raspberry PI boards"
242 238 REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armel"
243 239 KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi_defconfig}
244 UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_defconfig}
245 240 RELEASE_ARCH=${RELEASE_ARCH:=armel}
246 241 KERNEL_IMAGE=${KERNEL_IMAGE:=kernel.img}
247 242 CROSS_COMPILE=${CROSS_COMPILE:=arm-linux-gnueabi-}
@@ -254,19 +249,27 if [ -n "$SET_ARCH" ] ; then
254 249 KERNEL_IMAGE=${KERNEL_IMAGE:=kernel7.img}
255 250 CROSS_COMPILE=${CROSS_COMPILE:=arm-linux-gnueabihf-}
256 251 fi
257
258 echo "Setting Raspberry PI $RPI_MODEL specific configuration"
252 fi
253 #SET_ARCH not set
254 else
255 echo "error: Please set '32' or '64' as value for SET_ARCH"
256 exit 1
257 fi
259 258
260 259 #Device specific configuration
260 echo "Select DTB-File"
261 261 case "$RPI_MODEL" in
262 262 0)
263 263 DTB_FILE=${DTB_FILE:=bcm2708-rpi-0-w.dtb}
264 UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_defconfig}
264 265 ;;
265 266 1)
266 267 DTB_FILE=${DTB_FILE:=bcm2708-rpi-b.dtb}
268 UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_defconfig}
267 269 ;;
268 270 1P)
269 271 DTB_FILE=${DTB_FILE:=bcm2708-rpi-b-plus.dtb}
272 UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_defconfig}
270 273 ;;
271 274 2)
272 275 DTB_FILE=${DTB_FILE:=bcm2709-rpi-2-b.dtb}
@@ -274,25 +277,18 if [ -n "$SET_ARCH" ] ; then
274 277 ;;
275 278 3)
276 279 DTB_FILE=${DTB_FILE:=bcm2710-rpi-3-b.dtb}
277 UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_3_32b_defconfig}
280 UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_3_defconfig}
278 281 ;;
279 282 3P)
280 283 DTB_FILE=${DTB_FILE:=bcm2710-rpi-3-b.dtb}
281 UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_3_32b_defconfig}
284 UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_3_defconfig}
282 285 ;;
283 286 *)
284 echo "error: Raspberry Pi model ${RPI_MODEL} is not supported!"
287 echo "error: Raspberry Pi model $RPI_MODEL is not supported!"
285 288 exit 1
286 289 ;;
287 290 esac
288
289 #end 32 bit
290 fi
291 #SET_ARCH not set
292 else
293 echo "error: Please set '32' or '64' as value for SET_ARCH"
294 exit 1
295 fi
291 echo "$DTB_FILE selected"
296 292
297 293 #DEBUG off
298 294 set +x
@@ -303,7 +299,7 if [ "$ENABLE_WIRELESS" = true ] ; then
303 299 echo "error: The selected Raspberry Pi model has no internal wireless interface"
304 300 exit 1
305 301 else
306 echo "Raspberry Pi model"
302 echo "Raspberry Pi $RPI_MODEL has WIFI support"
307 303 fi
308 304 fi
309 305
General Comments 0
Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant