Raspi2-3_GenImage Commit - r622:39e8902f3a23 · Collaboration Tremplin des Sciences

RPI4

a <a> -

r622:39e8902f3a23

parent child

Context file:

r622:39e8902f3a23

Collapse all files

bootstrap.d/13-kernel.sh +23 -15

             	  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" = 2 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; } ; then
+            	  if [ "$KERNEL_VIRT" = true ] && { [ "$RPI_MODEL" = 2 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ]; } ; then
             		set_kernel_config CONFIG_HAVE_KVM_IRQCHIP y
                     set_kernel_config CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL y
                     set_kernel_config CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT y
               fi
             else # BUILD_KERNEL=false
-              if [ "$SET_ARCH" = 64 ] && { [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; } ; then
+              if [ "$SET_ARCH" = 64 ]
+                if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
+            	  # Use Sakakis modified kernel if ZSWAP is active
+                  if [ "$KERNEL_ZSWAP" = true ] || [ "$KERNEL_VIRT" = true ] || [ "$KERNEL_NF" = true ] || [ "$KERNEL_BPF" = true ] ; then
+            	    RPI3_64_KERNEL_URL="${RPI3_64_BIS_KERNEL_URL}"
+            	  fi
-            	# Use Sakakis modified kernel if ZSWAP is active
+                  # Create temporary directory for dl
-                if [ "$KERNEL_ZSWAP" = true ] || [ "$KERNEL_VIRT" = true ] || [ "$KERNEL_NF" = true ] || [ "$KERNEL_BPF" = true ] ; then
+                  temp_dir=$(as_nobody mktemp -d)
-            	  RPI3_64_KERNEL_URL="${RPI3_64_BIS_KERNEL_URL}"
-            	fi
-                # Create temporary directory for dl
+                  # Fetch kernel dl
-                temp_dir=$(as_nobody mktemp -d)
+                  as_nobody wget -O "${temp_dir}"/kernel.tar.xz -c "$RPI3_64_KERNEL_URL"
+                fi
-                # Fetch kernel dl
+                if [ "$SET_ARCH" = 64 ] && [ "$RPI_MODEL" = 4 ] ; then
-                as_nobody wget -O "${temp_dir}"/kernel.tar.xz -c "$RPI3_64_KERNEL_URL"
+                  # Create temporary directory for dl
+                  temp_dir=$(as_nobody mktemp -d)
-                #extract download
+                  # Fetch kernel dl
+                  as_nobody wget -O "${temp_dir}"/kernel.tar.xz -c "$RPI4_64_KERNEL_URL"
+                fi
+            	#extract download
                 tar -xJf "${temp_dir}"/kernel.tar.xz -C "${temp_dir}"
                 #move extracted kernel to /boot/firmware
                 chown -R root:root "${R}/lib/modules"
               fi
-              # Install Kernel from hypriot comptabile with all Raspberry PI
+              # Install Kernel from hypriot comptabile with all Raspberry PI (dunno if its compatible with RPI4 - better compile your own kernel)
-              if [ "$SET_ARCH" = 32 ] ; then
+              if [ "$SET_ARCH" = 32 ] && [ "$RPI_MODEL" != 4 ] ; then
                 # Create temporary directory for dl
                 temp_dir=$(as_nobody mktemp -d)
                 # Fetch kernel
                 as_nobody wget -O "${temp_dir}"/kernel.deb -c "$RPI_32_KERNEL_URL"
-                # Copy downloaded U-Boot sources
+                # Copy downloaded kernel package
                 mv "${temp_dir}"/kernel.deb "${R}"/tmp/kernel.deb
                 # Set permissions

bootstrap.d/15-rpi-config.sh +1 -1

               echo "boot_delay=1" >> "${BOOT_DIR}/config.txt"
             fi
-            if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
+            if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ]; then
               # Bluetooth enabled
               if [ "$ENABLE_BLUETOOTH" = true ] ; then

bootstrap.d/20-networking.sh +1 -1

               temp_dir=$(as_nobody mktemp -d)
               # Fetch firmware binary blob for RPI3B+
-              if [ "$RPI_MODEL" = 3P ] ; then
+              if [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then
                 # Fetch firmware binary blob for RPi3P
                 as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.bin" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.bin"
                 as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.txt" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.txt"

bootstrap.d/44-nexmon_monitor_patch.sh +1 -1

                 cp -f "${NEXMON_ROOT}"/patches/bcm43430a1/7_45_41_46/nexmon/brcmfmac43430-sdio.bin "${WLAN_FIRMWARE_DIR}"/brcmfmac43430-sdio.bin
               fi
-              if [ "$RPI_MODEL" = 3P ] ; then
+              if [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then
                 cd "${NEXMON_ROOT}"/patches/bcm43455c0/7_45_154/nexmon || exit
             	sed -i -e 's/all:.*/all: $(RAM_FILE)/g' ${NEXMON_ROOT}/patches/bcm43455c0/7_45_154/nexmon/Makefile
                 make clean

rpi23-gen-image.sh +3 0

             RPI3_64_BIS_KERNEL_URL=${RPI3_64_BIS_KERNEL_URL:=https://github.com/sakaki-/bcmrpi3-kernel-bis/releases/download/4.14.80.20181113/bcmrpi3-kernel-bis-4.14.80.20181113.tar.xz}
             # Default precompiled 64bit kernel
             RPI3_64_DEF_KERNEL_URL=${RPI3_64_DEF_KERNEL_URL:=https://github.com/sakaki-/bcmrpi3-kernel/releases/download/4.14.80.20181113/bcmrpi3-kernel-4.14.80.20181113.tar.xz}
+            # Sakaki BIS Kernel RPI4
+            RPI4_64_DEF_KERNEL_URL=https://github.com/sakaki-/bcm2711-kernel-bis/releases/download/4.19.59.20190724/bcm2711-kernel-bis-4.19.59.20190724.tar.xz
             # Generic
             RPI3_64_KERNEL_URL=${RPI3_64_KERNEL_URL:=$RPI3_64_DEF_KERNEL_URL}
+            RPI4_64_KERNEL_URL=${RPI3_64_KERNEL_URL:=$RPI4_64_DEF_KERNEL_URL}
             # Kali kernel src - used if ENABLE_NEXMON=true (they patch the wlan kernel modul)
             KALI_KERNEL_URL=${KALI_KERNEL_URL:=https://github.com/Re4son/re4son-raspberrypi-linux.git}

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