Author: gjb
Date: Fri Nov  3 19:32:10 2017
New Revision: 325369
URL: https://svnweb.freebsd.org/changeset/base/325369

Log:
  Fix an error in the PINE64.conf, where the ubldr is not needed
  and the u-boot needs to be written to the partition with dd(1).
  
  Reported by:  manu
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/arm64/PINE64.conf

Modified: head/release/arm64/PINE64.conf
==============================================================================
--- head/release/arm64/PINE64.conf      Fri Nov  3 19:21:36 2017        
(r325368)
+++ head/release/arm64/PINE64.conf      Fri Nov  3 19:32:10 2017        
(r325369)
@@ -9,7 +9,6 @@ EMBEDDED_TARGET="arm64"
 EMBEDDED_TARGET_ARCH="aarch64"
 EMBEDDEDPORTS="sysutils/u-boot-pine64"
 KERNEL="GENERIC"
-WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000"
 IMAGE_SIZE="2560M"
 PART_SCHEME="MBR"
 FAT_SIZE="54m -b 1m"
@@ -20,16 +19,14 @@ export BOARDNAME="PINE64"
 
 arm_install_uboot() {
        UBOOT_DIR="/usr/local/share/u-boot/u-boot-pine64"
-       UBOOT_FILES="u-boot-sunxi-with-spl.bin README"
+       UBOOT_FILES="u-boot-sunxi-with-spl.bin"
        FATMOUNT="${DESTDIR%${KERNEL}}fat"
        UFSMOUNT="${DESTDIR%${KERNEL}}ufs"
+       chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
+               of=/dev/${mddev} bs=1k seek=8 conv=sync
        chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
        chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
        chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
-       for _UF in ${UBOOT_FILES}; do
-               chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \
-                       ${FATMOUNT}/${_UF}
-       done
 
        BOOTFILES="$(chroot ${CHROOTDIR} \
            env TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to