diff options
| author | Emmanuel Vadot <manu@FreeBSD.org> | 2018-07-22 12:03:17 +0000 |
|---|---|---|
| committer | Emmanuel Vadot <manu@FreeBSD.org> | 2018-07-22 12:03:17 +0000 |
| commit | 43e289df5a2c4330de932f490cd4246878c51247 (patch) | |
| tree | 3061c92b508e8f7416fc7aedf7937ed3dddce1b2 /release/arm/RPI2.conf | |
| parent | 1f8b431d185416f70e96f03b8fd69b98442b1913 (diff) | |
| download | src-43e289df5a2c4330de932f490cd4246878c51247.tar.gz src-43e289df5a2c4330de932f490cd4246878c51247.zip | |
release: Add arm_install_boot to install the commit boot bits
This reduce the per-board arm_install_uboot to just install u-boot.
While here remove the installation of rpi.dtb and rpi2.dtb as we load
them from the UFS partition via ubldr.
Reviewed by: gjb, imp (older version)
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D16239
Notes
Notes:
svn path=/head/; revision=336599
Diffstat (limited to 'release/arm/RPI2.conf')
| -rw-r--r-- | release/arm/RPI2.conf | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/release/arm/RPI2.conf b/release/arm/RPI2.conf index d2b47edc929f..c9e8db077ccf 100644 --- a/release/arm/RPI2.conf +++ b/release/arm/RPI2.conf @@ -24,10 +24,8 @@ arm_install_uboot() { fixup.dat fixup_cd.dat fixup_db.dat fixup_x.dat \ start.elf start_cd.elf start_db.elf start_x.elf" FATMOUNT="${DESTDIR%${KERNEL}}/fat" - UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" - chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" + chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" 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} @@ -36,17 +34,10 @@ arm_install_uboot() { chroot ${CHROOTDIR} cp -p ${RPI_FIRMWARE_DIR}/${_UF} \ ${FATMOUNT}/${_UF} done - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ - ${FATMOUNT}/ubldr.bin - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/dtb/rpi2.dtb \ - ${FATMOUNT}/rpi2.dtb chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr - chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot sync umount_loop ${CHROOTDIR}/${FATMOUNT} - umount_loop ${CHROOTDIR}/${UFSMOUNT} chroot ${CHROOTDIR} rmdir ${FATMOUNT} - chroot ${CHROOTDIR} rmdir ${UFSMOUNT} return 0 } |