Raspi2-3_GenImage Commit - r764:ad54cb0d33c5 · Collaboration Tremplin des Sciences

Merge pull request #31 from g-vidal/contrib_20-11-19...

Gérard Vidal -

r764:ad54cb0d33c5

parent child

Context file:

r764:ad54cb0d33c5

Collapse all files

README.md +1 0

              |ENABLE_UBOOT|boolean|false|`true`\|`false`|Replace the default RPi 0/1/2/3 second stage bootloader (bootcode.bin) with [U-Boot bootloader](https://git.denx.de/?p=u-boot.git;a=summary). U-Boot can boot images via the network using the BOOTP/TFTP protocol. RPI4 needs tbd|
              |UBOOTSRC_DIR|string||`FullPathToUBootFolder`|Full path to a directory named `u-boot` of [U-Boot bootloader sources](https://git.denx.de/?p=u-boot.git;a=summary) that will be copied, configured, build and installed inside the chroot|
              |ENABLE_FBTURBO|boolean|false|`true`\|`false`|Install and enable the [hardware accelerated Xorg video driver](https://github.com/ssvb/xf86-video-fbturbo) `fbturbo`. Please note that this driver is currently limited to hardware accelerated window moving and scrolling|
+             |ENABLE_GR_ACCEL|boolean|false|`true`\|`false`|Install and enable [one of the 3D graphics accelerators for Raspi4](https://www.raspberrypi.org/documentation/configuration/config-txt/video.md) `vc4-fkms-v3d`.  Not compatible with `fbturbo` mutually excluded and installed for Raspberry4 only|
              |FBTURBOSRC_DIR|string||`FullPathToFbTurboFolder`|Full path to a directory named `xf86-video-fbturbo` of [hardware accelerated Xorg video driver sources](https://github.com/ssvb/xf86-video-fbturbo) that will be copied, configured, build and installed inside the chroot|
              |ENABLE_VIDEOCORE|boolean|false|`true`\|`false`|Install and enable the [ARM side libraries for interfacing to Raspberry Pi GPU](https://github.com/raspberrypi/userland) `vcgencmd`. Please note that this driver is currently limited to hardware accelerated window moving and scrolling|
              |VIDEOCORESRC_DIR|string||`FullPathToVideoSrcFolder`|Full path to a directory named `userland` of [ARM side libraries for interfacing to Raspberry Pi GPU](https://github.com/raspberrypi/userland) that will be copied, configured, build and installed inside the chroot|

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

                  # Create temporary directory for kernel sources
                  temp_dir=$(as_nobody mktemp -d)
-                 # Fetch current RPi2/3 kernel sources
+                 # Fetch current RPi2/3/4 kernel sources
                  if [ -z "${KERNEL_BRANCH}" ] ; then
                    as_nobody -H git -C "${temp_dir}" clone --depth=1 "${KERNEL_URL}" linux
                  else

bootstrap.d/15-rpi-config.sh +20 -2

                cp "${RPI_FIRMWARE_DIR}"/boot/fixup4x.dat "${BOOT_DIR}"/fixup4x.dat
                cp "${RPI_FIRMWARE_DIR}"/boot/start4cd.elf "${BOOT_DIR}"/start4cd.elf
                cp "${RPI_FIRMWARE_DIR}"/boot/start4db.elf "${BOOT_DIR}"/start4db.elf
-               cp "${RPI_FIRMWARE_DIR}"/boot/start4.elf "${BOOT_DIR}"/start4x.elf
+               cp "${RPI_FIRMWARE_DIR}"/boot/start4.elf "${BOOT_DIR}"/start4.elf
                cp "${RPI_FIRMWARE_DIR}"/boot/start4x.elf "${BOOT_DIR}"/start4x.elf
              else
                # Create temporary directory for boot binaries
                as_nobody wget -q -O "${temp_dir}/fixup4x.dat" "${FIRMWARE_URL}/fixup4x.dat"
                as_nobody wget -q -O "${temp_dir}/start4cd.elf" "${FIRMWARE_URL}/start4cd.elf"
                as_nobody wget -q -O "${temp_dir}/start4db.elf" "${FIRMWARE_URL}/start4db.elf"
-               as_nobody wget -q -O "${temp_dir}/start4x.elf" "${FIRMWARE_URL}/start4x.elf"
+               as_nobody wget -q -O "${temp_dir}/start4.elf" "${FIRMWARE_URL}/start4.elf"
                as_nobody wget -q -O "${temp_dir}/start4x.elf" "${FIRMWARE_URL}/start4x.elf"
                # Move downloaded boot binaries
              # Setup minimal GPU memory allocation size: 16MB (no X)
              if [ "$ENABLE_MINGPU" = true ] ; then
+               if [ "$ENABLE_GR_ACCEL" = false ]  ; then
                echo "gpu_mem=16" >> "${BOOT_DIR}/config.txt"
+               else
+                 ### Cannot reduce memory if graphics acceleration is requested
+                 echo "gpu_mem=128" >> "${BOOT_DIR}/config.txt"
+               fi
              fi
              # Setup boot with initramfs
                echo "avoid_warnings=${DISABLE_UNDERVOLT_WARNINGS}" >> "${BOOT_DIR}/config.txt"
              fi
+             #Enable graphics acceleration for Model 4
+             if [ "$RPI_MODEL" = 4 ] && [ "$ENABLE_GR_ACCEL" = true ] ; then
+               echo "max_framebuffers=2" >> "${BOOT_DIR}/config.txt"
+               echo "arm_64bit=1" >> "${BOOT_DIR}/config.txt"
+               echo "cmdline=cmdline.txt" >> "${BOOT_DIR}/config.txt"
+               echo "dtparam=audio=on" >> "${BOOT_DIR}/config.txt"
+               if [ "$ENABLE_MINGPU" = false ] ; then
+                 echo "gpu_mem=128" >> "${BOOT_DIR}/config.txt"
+               fi
+               echo "dtoverlay=vc4-fkms-v3d, cma-128" >> "${BOOT_DIR}/config.txt"
+             fi
              # Install kernel modules blacklist
              mkdir -p "${ETC_DIR}/modprobe.d/"
              install_readonly files/modules/raspi-blacklist.conf "${ETC_DIR}/modprobe.d/raspi-blacklist.conf"

bootstrap.d/42-fbturbo.sh +1 -1

              # Load utility functions
              . ./functions.sh
-             if [ "$ENABLE_FBTURBO" = true ] ; then
+             if [ "$ENABLE_FBTURBO" = true ] && [ "$ENABLE_GR_ACCEL" = false ] ; then
                # Install c/c++ build environment inside the chroot
                chroot_install_cc

rpi23-gen-image.sh +22 -18

              ENABLE_UBOOT=${ENABLE_UBOOT:=false}
              UBOOTSRC_DIR=${UBOOTSRC_DIR:=""}
              ENABLE_FBTURBO=${ENABLE_FBTURBO:=false}
+             ENABLE_GR_ACCEL=${ENABLE_GR_ACCEL:=true}
              FBTURBOSRC_DIR=${FBTURBOSRC_DIR:=""}
              ENABLE_VIDEOCORE=${ENABLE_VIDEOCORE:=false}
              VIDEOCORESRC_DIR=${VIDEOCORESRC_DIR:=""}
              # Setup architecture specific settings
              if [ -n "$SET_ARCH" ] ; then
-               # 64-bit configuration
+               ## 64-bit configuration
                if [ "$SET_ARCH" = 64 ] ; then
-                 # General 64-bit depended settings
+                 ### General 64-bit depended settings
                  QEMU_BINARY=${QEMU_BINARY:=/usr/bin/qemu-aarch64-static}
                  KERNEL_ARCH=${KERNEL_ARCH:=arm64}
                  KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="Image"}
-                 # Raspberry Pi model specific settings
+                 ### Raspberry Pi model specific settings
                  if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then
                    if [ "$RPI_MODEL" != 4 ] ; then
                      KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi3_defconfig}
                    RELEASE_ARCH=${RELEASE_ARCH:=arm64}
                    KERNEL_IMAGE=${KERNEL_IMAGE:=kernel8.img}
                    CROSS_COMPILE=${CROSS_COMPILE:=aarch64-linux-gnu-}
                  else
                    echo "error: Only Raspberry PI 3, 3B+ and 4 support 64-bit"
                    exit 1
                  fi
                fi
-               # 32-bit configuration
+               ## 32-bit configuration
                if [ "$SET_ARCH" = 32 ] ; then
-                 # General 32-bit dependend settings
+                 ### General 32-bit dependend settings
                  QEMU_BINARY=${QEMU_BINARY:=/usr/bin/qemu-arm-static}
                  KERNEL_ARCH=${KERNEL_ARCH:=arm}
                  KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="zImage"}
-                 # Raspberry Pi model specific settings
+                 ### Raspberry Pi (0-1P) model specific settings
                  if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 1 ] || [ "$RPI_MODEL" = 1P ] ; then
                    REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armel"
                    KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi_defconfig}
              	    fi
              	  fi
                  fi
-                 # Raspberry Pi model specific settings
+                 ### Raspberry Pi (2-4) model specific settings
                  if [ "$RPI_MODEL" = 2 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then
                    if [ "$RPI_MODEL" != 4 ] ; then
                      KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2709_defconfig}
                  ;;
              esac
-             # Raspberry PI 0,3,3P with Bluetooth and Wifi onboard
+             # Raspberry PI 0,3,3P,4 with Bluetooth and Wifi onboard
              if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then
-               # Include bluetooth packages on supported boards
+               ## Include bluetooth packages on supported boards
                if [ "$ENABLE_BLUETOOTH" = true ] ; then
                  APT_INCLUDES="${APT_INCLUDES},bluetooth,bluez"
                fi
                if [ "$ENABLE_WIRELESS" = true ] ; then
                  APT_INCLUDES="${APT_INCLUDES},wireless-tools,crda,wireless-regdb,wpasupplicant"
                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
+             # Raspberry PI 1,1P,2 without Wifi and bluetooth onboard
+             else
+               ## 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
                read -r confirm
                [ "$confirm" != "y" ] && exit 1
-               # Make sure all missing required packages are installed
+               ## Make sure all missing required packages are installed
                apt-get update && apt-get -qq -y install `echo "${MISSING_PACKAGES}" | sed "s/ //"`
              fi
              # Replace selected packages with smaller clones
              if [ "$ENABLE_REDUCE" = true ] ; then
-               # Add levee package instead of vim-tiny
+               ## Add levee package instead of vim-tiny
                if [ "$REDUCE_VIM" = true ] ; then
                  APT_INCLUDES="$(echo ${APT_INCLUDES} | sed "s/vim-tiny/levee/")"
                fi
-               # Add dropbear package instead of openssh-server
+               ## Add dropbear package instead of openssh-server
                if [ "$REDUCE_SSHD" = true ] ; then
                  APT_INCLUDES="$(echo "${APT_INCLUDES}" | sed "s/openssh-server/dropbear/")"
                fi
                dd if=/dev/zero of="$IMAGE_NAME-root.img" bs=512 count="${TABLE_SECTORS}"
                dd if=/dev/zero of="$IMAGE_NAME-root.img" bs=512 count=0 seek="${ROOT_SECTORS}"
-               # Write firmware/boot partition tables
+               ## Write firmware/boot partition tables
                sfdisk -q -L -uS -f "$IMAGE_NAME-frmw.img" 2> /dev/null <<EOM
              ${TABLE_SECTORS},${FRMW_SECTORS},c,*
              EOM
-               # Write root partition table
+               ## Write root partition table
                sfdisk -q -L -uS -f "$IMAGE_NAME-root.img" 2> /dev/null <<EOM
              ${TABLE_SECTORS},${ROOT_SECTORS},83
              EOM
-               # Setup temporary loop devices
+               ## Setup temporary loop devices
                FRMW_LOOP="$(losetup -o 1M --sizelimit 64M -f --show "$IMAGE_NAME"-frmw.img)"
                ROOT_LOOP="$(losetup -o 1M -f --show "$IMAGE_NAME"-root.img)"
-             else # ENABLE_SPLITFS=false
+             # ENABLE_SPLITFS=false
+             else
-               dd if=/dev/zero of="$IMAGE_NAME.img" bs=512 count="${TABLE_SECTORS}"
                dd if=/dev/zero of="$IMAGE_NAME.img" bs=512 count=0 seek="${IMAGE_SECTORS}"

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