Raspi2-3_GenImage Commit - r321:8d65dbaf659e · Collaboration Tremplin des Sciences

fixes

burnbabyburn -

r321:8d65dbaf659e

parent child

Context file:

r321:8d65dbaf659e

Collapse all files

bootstrap.d/11-apt.sh +2 -2

             #rm files/apt/sources.list
             #netselect-apt does not know buster yet
             if  [ "$RELEASE" = "buster" ] ; then
-              RELEASE=${RELEASE:=testing}
+              RELEASE=testing
             fi
             if [ "$ENABLE_NONFREE" = true ] ; then
             fi
             chroot_exec apt-get -qq -y -f install
-            chroot_exec apt-get -qq -y check
  No newline at end of file
+            chroot_exec apt-get -qq -y check

bootstrap.d/31-logging.sh +1 0

+            #!/bin/bash
             #
             # Setup Logging
             #

bootstrap.d/41-uboot.sh +8 0

               install_readonly "${R}/tmp/u-boot/u-boot.bin" "${BOOT_DIR}/u-boot.bin"
               printf "\n# boot u-boot kernel\nkernel=u-boot.bin\n" >> "${BOOT_DIR}/config.txt"
+              if [ "$SET_ARCH" = 64 ] ; then
+                #add arm_64bit=1
+                #device_tree_address=0x100
+                #device_tree_end=0x8000
+                #to config.txt
+              echo "Setting up config.txt to boot 64bit uboot"
+              fi
               # Install and setup U-Boot command file
               install_readonly files/boot/uboot.mkimage "${BOOT_DIR}/uboot.mkimage"
               printf "# Set the kernel boot command line\nsetenv bootargs \"earlyprintk ${CMDLINE}\"\n\n$(cat "${BOOT_DIR}"/uboot.mkimage)" > "${BOOT_DIR}/uboot.mkimage"

rpi23-gen-image.sh +19 -23

                 QEMU_BINARY=${QEMU_BINARY:=/usr/bin/qemu-aarch64-static}
                 KERNEL_ARCH=${KERNEL_ARCH:=arm64}
                 KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="Image"}
-                RELEASE_ARCH=${RELEASE_ARCH:=arm64}
-                CROSS_COMPILE=${CROSS_COMPILE:=aarch64-linux-gnu-}
-                REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-arm64"
                 if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
-                  # RPI 3 serie specific settings
+                  REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-arm64"
-                  DTB_FILE=${DTB_FILE:=bcm2710-rpi-3-b.dtb}
-                  UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_3_defconfig}
                   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: At the moment Raspberry PI 3 and 3B+ are the only Models which support 64bit"
                   exit 1
                 fi
               fi
               ##################################
               # 32 bit config
               ##################################
                   echo "Setting settings for bcm2835 Raspberry PI boards"
                   REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armel"
                   KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi_defconfig}
-                  UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_defconfig}
                   RELEASE_ARCH=${RELEASE_ARCH:=armel}
                   KERNEL_IMAGE=${KERNEL_IMAGE:=kernel.img}
                   CROSS_COMPILE=${CROSS_COMPILE:=arm-linux-gnueabi-}
                   KERNEL_IMAGE=${KERNEL_IMAGE:=kernel7.img}
                   CROSS_COMPILE=${CROSS_COMPILE:=arm-linux-gnueabihf-}
                 fi
+              fi
-                echo "Setting Raspberry PI $RPI_MODEL specific configuration"
+            #SET_ARCH not set
+            else
+              echo "error: Please set '32' or '64' as value for SET_ARCH"
+              exit 1
+            fi
                 #Device specific configuration
+                echo "Select DTB-File"
                 case "$RPI_MODEL" in
 )
                   DTB_FILE=${DTB_FILE:=bcm2708-rpi-0-w.dtb}
+                  UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_defconfig}
                   ;;
 )
                   DTB_FILE=${DTB_FILE:=bcm2708-rpi-b.dtb}
+                  UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_defconfig}
                   ;;
 P)
                   DTB_FILE=${DTB_FILE:=bcm2708-rpi-b-plus.dtb}
+                  UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_defconfig}
                   ;;
 )
                   DTB_FILE=${DTB_FILE:=bcm2709-rpi-2-b.dtb}
                   ;;
 )
                   DTB_FILE=${DTB_FILE:=bcm2710-rpi-3-b.dtb}
-                  UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_3_32b_defconfig}
+                  UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_3_defconfig}
                   ;;
 P)
                   DTB_FILE=${DTB_FILE:=bcm2710-rpi-3-b.dtb}
-                  UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_3_32b_defconfig}
+                  UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_3_defconfig}
                   ;;
                 *)
-                  echo "error: Raspberry Pi model ${RPI_MODEL} is not supported!"
+                  echo "error: Raspberry Pi model $RPI_MODEL is not supported!"
                   exit 1
                   ;;
                 esac
+                echo "$DTB_FILE selected"
-              #end 32 bit
-              fi
-            #SET_ARCH not set
-            else
-              echo "error: Please set '32' or '64' as value for SET_ARCH"
-              exit 1
-            fi
             #DEBUG off
             set +x
                 echo "error: The selected Raspberry Pi model has no internal wireless interface"
                 exit 1
               else
-                echo "Raspberry Pi model"
+                echo "Raspberry Pi $RPI_MODEL has WIFI support"
               fi
             fi

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