Raspi2-3_GenImage Commit - r139:3f5e1cfcfee6 · Collaboration Tremplin des Sciences

Fixed: RPi3 stretch support, uboot updated compiler and src dir

drtyhlpr -

r139:3f5e1cfcfee6

parent child

Context file:

r139:3f5e1cfcfee6

README.md +3 0

             ##### `ENABLE_UBOOT`=false
             Replace the default RPi2/3 second stage bootloader (bootcode.bin) with [U-Boot bootloader](http://git.denx.de/?p=u-boot.git;a=summary). U-Boot can boot images via the network using the BOOTP/TFTP protocol.
+            ##### `UBOOTSRC_DIR`=""
+            Path to a directory of [U-Boot bootloader sources](http://git.denx.de/?p=u-boot.git;a=summary) that will be copied, configured, build and installed inside the chroot.
             ##### `ENABLE_FBTURBO`=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.

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

             # Fetch and build U-Boot bootloader
             if [ "$ENABLE_UBOOT" = true ] ; then
-              # Fetch U-Boot bootloader sources
+              # Copy existing U-Boot sources into chroot directory
-              git -C "${R}/tmp" clone "${UBOOT_URL}"
+              if [ -n "$UBOOTSRC_DIR" ] && [ -d "$UBOOTSRC_DIR" ] ; then
+                # Copy local U-Boot sources
+                cp -r "${UBOOTSRC_DIR}" "${R}/tmp"
+              else
+                # Fetch U-Boot sources
+                git -C "${R}/tmp" clone "${UBOOT_URL}"
+              fi
               # Build and install U-Boot inside chroot
               chroot_exec make -j${KERNEL_THREADS} -C /tmp/u-boot/ ${UBOOT_CONFIG} all

rpi23-gen-image.sh +8 -1

             ENABLE_MINBASE=${ENABLE_MINBASE:=false}
             ENABLE_REDUCE=${ENABLE_REDUCE:=false}
             ENABLE_UBOOT=${ENABLE_UBOOT:=false}
+            UBOOTSRC_DIR=${UBOOTSRC_DIR:=""}
             ENABLE_FBTURBO=${ENABLE_FBTURBO:=false}
             ENABLE_HARDNET=${ENABLE_HARDNET:=false}
             ENABLE_IPTABLES=${ENABLE_IPTABLES:=false}
             if [ "$RELEASE" = "jessie" ] ; then
               COMPILER_PACKAGES="linux-compiler-gcc-4.8-arm g++ make bc"
             elif [ "$RELEASE" = "stretch" ] ; then
-              COMPILER_PACKAGES="linux-compiler-gcc-5-arm g++ make bc"
+              COMPILER_PACKAGES="g++ make bc"
               BUILD_KERNEL=true
             else
               echo "error: Debian release ${RELEASE} is not supported!"
               exit 1
             fi
+            # Check if specified UBOOTSRC_DIR directory exists
+            if [ -n "$UBOOTSRC_DIR" ] && [ ! -d "$UBOOTSRC_DIR" ] ; then
+              echo "error: '${UBOOTSRC_DIR}' specified directory not found (UBOOTSRC_DIR)!"
+              exit 1
+            fi
             # Check if specified CHROOT_SCRIPTS directory exists
             if [ -n "$CHROOT_SCRIPTS" ] && [ ! -d "$CHROOT_SCRIPTS" ] ; then
                echo "error: ${CHROOT_SCRIPTS} specified directory not found (CHROOT_SCRIPTS)!"

General Comments 0

Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant

No TODOs yet

	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