aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2017-11-03 19:32:10 +0000
committerGlen Barber <gjb@FreeBSD.org>2017-11-03 19:32:10 +0000
commit91fcd6f57c09a3ce87c0d12be35bb57cd27c2921 (patch)
tree1ac3cdeae63dd6700d14cebd22af0b9b209c9b87
parenta2c36a24b6c86cc389e6cff5301b1730c394bed2 (diff)
downloadsrc-91fcd6f57c09a3ce87c0d12be35bb57cd27c2921.tar.gz
src-91fcd6f57c09a3ce87c0d12be35bb57cd27c2921.zip
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
Notes
Notes: svn path=/head/; revision=325369
-rw-r--r--release/arm64/PINE64.conf9
1 files changed, 3 insertions, 6 deletions
diff --git a/release/arm64/PINE64.conf b/release/arm64/PINE64.conf
index cf35fd0dc192..cca7e0d000a2 100644
--- a/release/arm64/PINE64.conf
+++ b/release/arm64/PINE64.conf
@@ -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} \