Raspi2-3_GenImage Commit - r621:7319d292c44d · Collaboration Tremplin des Sciences

252

KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="Image"}

252

KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="Image"}

253

254

# Raspberry Pi model specific settings

254

# Raspberry Pi model specific settings

255

if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then

255

if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then

256

REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-arm64"

256

if [ "$RPI_MODEL" != 4 ] ; then

257

KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi3_defconfig}

257

KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi3_defconfig}

258

else

259

KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2711_defconfig}

260

fi

261

262

REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-arm64"

258

RELEASE_ARCH=${RELEASE_ARCH:=arm64}

263

RELEASE_ARCH=${RELEASE_ARCH:=arm64}

259

KERNEL_IMAGE=${KERNEL_IMAGE:=kernel8.img}

264

KERNEL_IMAGE=${KERNEL_IMAGE:=kernel8.img}

260

CROSS_COMPILE=${CROSS_COMPILE:=aarch64-linux-gnu-}

265

CROSS_COMPILE=${CROSS_COMPILE:=aarch64-linux-gnu-}

261

else

266

else

262

echo "error: Only Raspberry PI 3 ~~and 3B+~~ support 64-bit"

267

echo "error: Only Raspberry PI 3, 3B+ and 4 support 64-bit"

263

exit 1

268

exit 1

264

fi

269

fi

265

fi

270

fi

281

fi

286

fi

282

287

283

# Raspberry Pi model specific settings

288

# Raspberry Pi model specific settings

284

if [ "$RPI_MODEL" = 2 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then

289

if [ "$RPI_MODEL" = 2 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then

285

REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armhf"

290

if [ "$RPI_MODEL" != 4 ] ; then

286

KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2709_defconfig}

291

KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2709_defconfig}

292

else

293

KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2711_defconfig}

294

fi

295

296

REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armhf"

287

RELEASE_ARCH=${RELEASE_ARCH:=armhf}

297

RELEASE_ARCH=${RELEASE_ARCH:=armhf}

288

KERNEL_IMAGE=${KERNEL_IMAGE:=kernel7.img}

298

KERNEL_IMAGE=${KERNEL_IMAGE:=kernel7.img}

289

CROSS_COMPILE=${CROSS_COMPILE:=arm-linux-gnueabihf-}

299

CROSS_COMPILE=${CROSS_COMPILE:=arm-linux-gnueabihf-}

320

DTB_FILE=${DTB_FILE:=bcm2710-rpi-3-b.dtb}

330

DTB_FILE=${DTB_FILE:=bcm2710-rpi-3-b.dtb}

321

UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_3_defconfig}

331

UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_3_defconfig}

322

;;

332

;;

333

4)

334

DTB_FILE=${DTB_FILE:=bcm2711-rpi-4-b.dtb}

335

UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_4_defconfig}

336

;;

323

*)

337

*)

324

echo "error: Raspberry Pi model $RPI_MODEL is not supported!"

338

echo "error: Raspberry Pi model $RPI_MODEL is not supported!"

325

exit 1

339

exit 1

327

esac

341

esac

328

342

329

# Raspberry PI 0,3,3P with Bluetooth and Wifi onboard

343

# Raspberry PI 0,3,3P with Bluetooth and Wifi onboard

330

if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then

344

if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then

331

# Include bluetooth packages on supported boards

345

# Include bluetooth packages on supported boards

332

if [ "$ENABLE_BLUETOOTH" = true ] ; then

346

if [ "$ENABLE_BLUETOOTH" = true ] ; then

333

APT_INCLUDES="${APT_INCLUDES},bluetooth,bluez"

347

APT_INCLUDES="${APT_INCLUDES},bluetooth,bluez"

	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

                 KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="Image"}
                 # Raspberry Pi model specific settings
-                if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
+                if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then
-                  REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-arm64"
+                  if [ "$RPI_MODEL" != 4 ] ; then
                     KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi3_defconfig}
+                  else
+                    KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2711_defconfig}
+                  fi
+                  REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-arm64"
                   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 and 3B+ support 64-bit"
+                  echo "error: Only Raspberry PI 3, 3B+ and 4 support 64-bit"
                   exit 1
                 fi
               fi
                 fi
                 # Raspberry Pi model specific settings
-                if [ "$RPI_MODEL" = 2 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
+                if [ "$RPI_MODEL" = 2 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then
-                  REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armhf"
+                  if [ "$RPI_MODEL" != 4 ] ; then
                     KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2709_defconfig}
+                  else
+                    KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2711_defconfig}
+                  fi
+                  REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armhf"
                   RELEASE_ARCH=${RELEASE_ARCH:=armhf}
                   KERNEL_IMAGE=${KERNEL_IMAGE:=kernel7.img}
                   CROSS_COMPILE=${CROSS_COMPILE:=arm-linux-gnueabihf-}
                 DTB_FILE=${DTB_FILE:=bcm2710-rpi-3-b.dtb}
                 UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_3_defconfig}
                 ;;
+)
+                DTB_FILE=${DTB_FILE:=bcm2711-rpi-4-b.dtb}
+                UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_4_defconfig}
+                ;;
               *)
                 echo "error: Raspberry Pi model $RPI_MODEL is not supported!"
                 exit 1
             esac
             # Raspberry PI 0,3,3P with Bluetooth and Wifi onboard
-            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
               # Include bluetooth packages on supported boards
               if [ "$ENABLE_BLUETOOTH" = true ] ; then
                 APT_INCLUDES="${APT_INCLUDES},bluetooth,bluez"