svn commit: r326017 - stable/11/release/arm

Glen Barber gjb at FreeBSD.org
Mon Nov 20 19:05:10 UTC 2017 

Author: gjb
Date: Mon Nov 20 19:05:08 2017
New Revision: 326017
URL: https://svnweb.freebsd.org/changeset/base/326017

Log:
  MFC r325373, r325861:
   r325373 (manu):
    release/arm: Do not install ubldr
  
   r325861 (manu):
    release: Update u-boot and firmware file for RPI-B target.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/release/arm/BANANAPI.conf
  stable/11/release/arm/BEAGLEBONE.conf
  stable/11/release/arm/CUBIEBOARD.conf
  stable/11/release/arm/CUBIEBOARD2.conf
  stable/11/release/arm/CUBOX-HUMMINGBOARD.conf
  stable/11/release/arm/GUMSTIX.conf
  stable/11/release/arm/PANDABOARD.conf
  stable/11/release/arm/RPI-B.conf
  stable/11/release/arm/RPI2.conf
  stable/11/release/arm/WANDBOARD.conf
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/release/arm/BANANAPI.conf
==============================================================================
--- stable/11/release/arm/BANANAPI.conf	Mon Nov 20 15:57:56 2017	(r326016)
+++ stable/11/release/arm/BANANAPI.conf	Mon Nov 20 19:05:08 2017	(r326017)
@@ -27,7 +27,6 @@ arm_install_uboot() {
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
-	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
 		${FATMOUNT}/ubldr.bin
 	chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot

Modified: stable/11/release/arm/BEAGLEBONE.conf
==============================================================================
--- stable/11/release/arm/BEAGLEBONE.conf	Mon Nov 20 15:57:56 2017	(r326016)
+++ stable/11/release/arm/BEAGLEBONE.conf	Mon Nov 20 19:05:08 2017	(r326017)
@@ -25,7 +25,6 @@ arm_install_uboot() {
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
 	chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO
 	chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img
-	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
 		${FATMOUNT}/ubldr.bin
 	chroot ${CHROOTDIR} ln ${UFSMOUNT}/boot/dtb/beaglebone.dtb \

Modified: stable/11/release/arm/CUBIEBOARD.conf
==============================================================================
--- stable/11/release/arm/CUBIEBOARD.conf	Mon Nov 20 15:57:56 2017	(r326016)
+++ stable/11/release/arm/CUBIEBOARD.conf	Mon Nov 20 19:05:08 2017	(r326017)
@@ -26,7 +26,6 @@ arm_install_uboot() {
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
-	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
 		${FATMOUNT}/ubldr.bin
 	chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot

Modified: stable/11/release/arm/CUBIEBOARD2.conf
==============================================================================
--- stable/11/release/arm/CUBIEBOARD2.conf	Mon Nov 20 15:57:56 2017	(r326016)
+++ stable/11/release/arm/CUBIEBOARD2.conf	Mon Nov 20 19:05:08 2017	(r326017)
@@ -27,7 +27,6 @@ arm_install_uboot() {
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
-	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
 		${FATMOUNT}/ubldr.bin
 	chroot ${CHROOTDIR} ln ${UFSMOUNT}/boot/dtb/cubieboard2.dtb \

Modified: stable/11/release/arm/CUBOX-HUMMINGBOARD.conf
==============================================================================
--- stable/11/release/arm/CUBOX-HUMMINGBOARD.conf	Mon Nov 20 15:57:56 2017	(r326016)
+++ stable/11/release/arm/CUBOX-HUMMINGBOARD.conf	Mon Nov 20 19:05:08 2017	(r326017)
@@ -27,7 +27,6 @@ arm_install_uboot() {
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
-	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
 		${FATMOUNT}/ubldr.bin
 	chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot

Modified: stable/11/release/arm/GUMSTIX.conf
==============================================================================
--- stable/11/release/arm/GUMSTIX.conf	Mon Nov 20 15:57:56 2017	(r326016)
+++ stable/11/release/arm/GUMSTIX.conf	Mon Nov 20 19:05:08 2017	(r326017)
@@ -25,7 +25,6 @@ arm_install_uboot() {
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
 	chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO
 	chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img
-	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
 		${FATMOUNT}/ubldr.bin
 	chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot

Modified: stable/11/release/arm/PANDABOARD.conf
==============================================================================
--- stable/11/release/arm/PANDABOARD.conf	Mon Nov 20 15:57:56 2017	(r326016)
+++ stable/11/release/arm/PANDABOARD.conf	Mon Nov 20 19:05:08 2017	(r326017)
@@ -25,7 +25,6 @@ arm_install_uboot() {
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
 	chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO
 	chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img
-	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
 		${FATMOUNT}/ubldr.bin
 	chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot

Modified: stable/11/release/arm/RPI-B.conf
==============================================================================
--- stable/11/release/arm/RPI-B.conf	Mon Nov 20 15:57:56 2017	(r326016)
+++ stable/11/release/arm/RPI-B.conf	Mon Nov 20 19:05:08 2017	(r326017)
@@ -6,7 +6,7 @@
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDED_TARGET="arm"
 EMBEDDEDBUILD=1
-EMBEDDEDPORTS="sysutils/u-boot-rpi"
+EMBEDDEDPORTS="sysutils/u-boot-rpi sysutils/rpi-firmware"
 FAT_SIZE="17m"
 FAT_TYPE="16"
 IMAGE_SIZE="1G"
@@ -18,8 +18,11 @@ WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000"
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi"
-	UBOOT_FILES="bootcode.bin config.txt fixup.dat fixup_cd.dat \
-		start.elf start_cd.elf u-boot.img"
+	RPI_FIRMWARE_DIR="/usr/local/share/rpi-firmware"
+	UBOOT_FILES="u-boot.bin"
+	RPI_FIRMWARE_FILES="bootcode.bin config.txt \
+		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}"
@@ -29,7 +32,10 @@ arm_install_uboot() {
 		chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \
 			${FATMOUNT}/${_UF}
 	done
-	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
+	for _UF in ${RPI_FIRMWARE_FILES}; do
+		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/rpi.dtb \

Modified: stable/11/release/arm/RPI2.conf
==============================================================================
--- stable/11/release/arm/RPI2.conf	Mon Nov 20 15:57:56 2017	(r326016)
+++ stable/11/release/arm/RPI2.conf	Mon Nov 20 19:05:08 2017	(r326017)
@@ -29,7 +29,6 @@ arm_install_uboot() {
 		chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \
 			${FATMOUNT}/${_UF}
 	done
-	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
 		${FATMOUNT}/ubldr.bin
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/dtb/rpi2.dtb \

Modified: stable/11/release/arm/WANDBOARD.conf
==============================================================================
--- stable/11/release/arm/WANDBOARD.conf	Mon Nov 20 15:57:56 2017	(r326016)
+++ stable/11/release/arm/WANDBOARD.conf	Mon Nov 20 19:05:08 2017	(r326017)
@@ -27,7 +27,6 @@ arm_install_uboot() {
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
-	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
 		${FATMOUNT}/ubldr.bin
 	chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot

More information about the svn-src-all mailing list