Raspi2-3_GenImage Commit - r776:3332c4bc4391 · Collaboration Tremplin des Sciences

Merge branch 'contribGV' of http://depot.tremplin.ens-lyon.fr/Raspi2-3_GenImage into contribGV

vidal -

r776:3332c4bc4391 contribGV

parent child

Context file:

r776:3332c4bc4391

README.md +5 -1

             |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|
+            <<<<<<< HEAD
             |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|
+            =======
+            |ENABLE_GR_ACCEL|boolean|true|`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` and installed for Raspberry4 only.
+            >>>>>>> 7588b4f62cfa955de0822acf49908044e0504249
             |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|
             * [Official Raspberry Pi Firmware on github](https://github.com/raspberrypi/firmware)
             * [Official Raspberry Pi Kernel on github](https://github.com/raspberrypi/linux)
             * [U-BOOT git repository](https://git.denx.de/?p=u-boot.git;a=summary)
-            * [Xorg DDX driver fbturbo](https://github.com/ssvb/xf86-video-fbturbo)
+            * [Xorg DDX driver #FFFFFF#FFFFFF#FFFFFF](https://github.com/ssvb/xf86-video-fbturbo)
             * [RPi3 Wireless interface firmware](https://github.com/RPi-Distro/firmware-nonfree/tree/master/brcm)
             * [Collabora RPi2 Kernel precompiled](https://repositories.collabora.co.uk/debian/)

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

             	    #set_kernel_config CONFIG_MMC_SDHCI_IPROC n
             	    #set_kernel_config CONFIG_USB_DWC2 n
             	    #sed -i "s|depends on MMC_BCM2835_MMC && MMC_BCM2835_DMA|depends on MMC_BCM2835_MMC|" "${KERNEL_DIR}"/drivers/mmc/host/Kconfig
             	    #VLAN got disabled without reason in arm64bit
             	    set_kernel_config CONFIG_IPVLAN m
             	  fi

bootstrap.d/15-rpi-config.sh +16 0

             echo "${CMDLINE}" > "${BOOT_DIR}/cmdline.txt"
             # Setup minimal GPU memory allocation size: 16MB (no X)
+            <<<<<<< HEAD
             if [ "$ENABLE_MINGPU" = true ] ; then
               if [ "$ENABLE_GR_ACCEL" = false ]  ; then
                 echo "gpu_mem=16" >> "${BOOT_DIR}/config.txt"
                 ### Cannot reduce memory if graphics acceleration is requested
                 echo "gpu_mem=128" >> "${BOOT_DIR}/config.txt"
               fi
+            =======
+            if [ "$ENABLE_MINGPU" = true ] && [ "$ENABLE_GR_ACCEL" = false ]  ; then
+              echo "gpu_mem=16" >> "${BOOT_DIR}/config.txt"
+            >>>>>>> 7588b4f62cfa955de0822acf49908044e0504249
             fi
             # Setup boot with initramfs
               fi
             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"
+              echo "gpu_mem=128" >> "${BOOT_DIR}/config.txt"
+              echo "dtoverlay=vc4-fkms-v3d, cma-128" >> "${BOOT_DIR}/config.txt"
+            fi
             # Disable RPi2/3 under-voltage warnings
             if [ -n "$DISABLE_UNDERVOLT_WARNINGS" ] ; then
               echo "avoid_warnings=${DISABLE_UNDERVOLT_WARNINGS}" >> "${BOOT_DIR}/config.txt"

rpi23-gen-image.sh +46 -2

             # Raspberry Pi model configuration defaults to 3P
             RPI_MODEL=${RPI_MODEL:=3P}
+            <<<<<<< HEAD
             # Debian release defaults to bullseye
             RELEASE=${RELEASE:=bullseye}
             if [ "$RELEASE" = "bookworm" ] ; then
+            =======
+            # Debian release
+            RELEASE=${RELEASE:=buster}
+            if [ $RELEASE = "bullseye" ] ; then
+            >>>>>>> 7588b4f62cfa955de0822acf49908044e0504249
               RELEASE=testing
             fi
             echo "Debian release value used : " $RELEASE
                 KERNEL_ARCH=${KERNEL_ARCH:=arm64}
                 KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="Image"}
+            <<<<<<< HEAD
                 ### Raspberry Pi model specific settings
+            =======
+                ### Raspberry Pi 64-bit model specific settings
+            >>>>>>> 7588b4f62cfa955de0822acf49908044e0504249
                 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-}
+            <<<<<<< HEAD
+            =======
+            >>>>>>> 7588b4f62cfa955de0822acf49908044e0504249
                 else
                   echo "error: Only Raspberry PI 3, 3B+ and 4 support 64-bit"
                   exit 1
                   RELEASE_ARCH=${RELEASE_ARCH:=armel}
                   KERNEL_IMAGE=${KERNEL_IMAGE:=kernel.img}
                   CROSS_COMPILE=${CROSS_COMPILE:=arm-linux-gnueabi-}
+            <<<<<<< HEAD
             	  if [ $ENABLE_XORG = true ] ; then
             	    if [$RELEASE = "stretch" ] || [$RELEASE = "oldstable" ] ; then
             	      printf "\nBest support for armel architecture is provided under Debian stretch/oldstable. Choose yes to change release to Debian stretch[y/n] "
             	      read -r confirm
+            =======
+                  if [ $ENABLE_XORG = true ] ; then
+                    if [$RELEASE = "stretch" ] || [$RELEASE = "oldstable" ] ; then
+                      printf "\nBest support for armel architecture is provided under Debian stretch/oldstable. Choose yes to change release to Debian stretch[y/n] "
+                      read -r confirm
+            >>>>>>> 7588b4f62cfa955de0822acf49908044e0504249
                       if [ "$confirm" = "y" ] ; then
                         $RELEASE = "stretch"
                       fi
                   CROSS_COMPILE=${CROSS_COMPILE:=arm-linux-gnueabihf-}
                 fi
               fi
               # SET_ARCH not set
             else
               echo "error: Please set '32' or '64' as value for SET_ARCH"
               if [ "$ENABLE_WIRELESS" = true ] ; then
                 APT_INCLUDES="${APT_INCLUDES},wireless-tools,crda,wireless-regdb,wpasupplicant"
               fi
+            <<<<<<< HEAD
+            # Raspberry PI 1,1P,2 without Wifi and bluetooth onboard
+            else
+            =======
               # Raspberry PI 1,1P,2 without Wifi and bluetooth onboard
             else
+            >>>>>>> 7588b4f62cfa955de0822acf49908044e0504249
               ## 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"
               REQUIRED_PACKAGES="${REQUIRED_PACKAGES} cryptsetup"
               APT_INCLUDES="${APT_INCLUDES},cryptsetup,busybox,console-setup,cryptsetup-initramfs"
-              # If cryptfs,dropbear and initramfs are enabled include dropbear-initramfs package
+              ## If cryptfs,dropbear and initramfs are enabled include dropbear-initramfs package
               if [ "$CRYPTFS_DROPBEAR" = true ] && [ "$ENABLE_INITRAMFS" = true ]; then
                 APT_INCLUDES="${APT_INCLUDES},dropbear-initramfs"
               fi
             fi
             if [ "$ENABLE_USBBOOT" = true ] ; then
+            <<<<<<< HEAD
               if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 1P ] || [ "$RPI_MODEL" = 1 ] || [ "$RPI_MODEL" = 2 ]; then
                 echo "error: Booting from USB alone is only supported by Raspberry Pi 3 and 3P"
                 exit 1
               fi
+            =======
+            if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 1P ] || [ "$RPI_MODEL" = 1 ] || [ "$RPI_MODEL" = 2 ]; then
+              echo "error: Booting from USB alone is only supported by Raspberry Pi 3 and 3P"
+              exit 1
+            fi
+            >>>>>>> 7588b4f62cfa955de0822acf49908044e0504249
             fi
             # Check if root SSH (v2) public key file exists
             # Execute custom scripts inside the chroot
             if [ -n "$CHROOT_SCRIPTS" ] && [ -d "$CHROOT_SCRIPTS" ] ; then
               cp -r "${CHROOT_SCRIPTS}" "${R}/chroot_scripts"
-              chroot_exec /bin/bash -x <<'EOF'
+              chroot_exec /bin/bash -x << EOF
             for SCRIPT in /chroot_scripts/* ; do
               if [ -f $SCRIPT -a -x $SCRIPT ] ; then
                 $SCRIPT
               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}"
+            <<<<<<< HEAD
               ## Write firmware/boot partition tables
               sfdisk -q -L -uS -f "$IMAGE_NAME-frmw.img" 2> /dev/null <<EOM
             ${TABLE_SECTORS},${FRMW_SECTORS},c,*
               ## Write root partition table
               sfdisk -q -L -uS -f "$IMAGE_NAME-root.img" 2> /dev/null <<EOM
+            =======
+              # 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
+              sfdisk -q -L -uS -f "$IMAGE_NAME-root.img" 2> /dev/null << EOM
+            >>>>>>> 7588b4f62cfa955de0822acf49908044e0504249
             ${TABLE_SECTORS},${ROOT_SECTORS},83
             EOM

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