FreeBSD Mail Archives

Date:      Fri, 3 Nov 2017 23:02:57 +0000 (UTC)
From:      Emmanuel Vadot <manu@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r325373 - head/release/arm
Message-ID:  <201711032302.vA3N2viC004209@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help

Author: manu
Date: Fri Nov  3 23:02:57 2017
New Revision: 325373
URL: https://svnweb.freebsd.org/changeset/base/325373

Log:
  release/arm: Do not install ubldr
  
  ubldr is the non-pie version of ubldr.bin, do not install two
  copies of the same binary. This will allow us to remove ubldr
  in the future.
  All the u-boot ports know how to load ubldr.bin
  
  Reviewed by:	gjb (earlier version)

Modified:
  head/release/arm/BANANAPI.conf
  head/release/arm/BEAGLEBONE.conf
  head/release/arm/CUBIEBOARD.conf
  head/release/arm/CUBIEBOARD2.conf
  head/release/arm/CUBOX-HUMMINGBOARD.conf
  head/release/arm/GUMSTIX.conf
  head/release/arm/PANDABOARD.conf
  head/release/arm/RPI-B.conf
  head/release/arm/RPI2.conf
  head/release/arm/WANDBOARD.conf

Modified: head/release/arm/BANANAPI.conf
==============================================================================
--- head/release/arm/BANANAPI.conf	Fri Nov  3 22:41:31 2017	(r325372)
+++ head/release/arm/BANANAPI.conf	Fri Nov  3 23:02:57 2017	(r325373)
@@ -8,7 +8,6 @@ EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv7"
 EMBEDDEDPORTS="sysutils/u-boot-bananapi"
 KERNEL="GENERIC"
-WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000"
 IMAGE_SIZE="3072M"
 PART_SCHEME="MBR"
 FAT_SIZE="32m -b 1m"
@@ -27,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: head/release/arm/BEAGLEBONE.conf
==============================================================================
--- head/release/arm/BEAGLEBONE.conf	Fri Nov  3 22:41:31 2017	(r325372)
+++ head/release/arm/BEAGLEBONE.conf	Fri Nov  3 23:02:57 2017	(r325373)
@@ -8,7 +8,6 @@ EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv7"
 EMBEDDEDPORTS="sysutils/u-boot-beaglebone"
 KERNEL="GENERIC"
-WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000"
 IMAGE_SIZE="3072M"
 PART_SCHEME="MBR"
 FAT_SIZE="2m"
@@ -26,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: head/release/arm/CUBIEBOARD.conf
==============================================================================
--- head/release/arm/CUBIEBOARD.conf	Fri Nov  3 22:41:31 2017	(r325372)
+++ head/release/arm/CUBIEBOARD.conf	Fri Nov  3 23:02:57 2017	(r325373)
@@ -8,7 +8,6 @@ EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv7"
 EMBEDDEDPORTS="sysutils/u-boot-cubieboard"
 KERNEL="GENERIC"
-WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000"
 IMAGE_SIZE="3072M"
 PART_SCHEME="MBR"
 FAT_SIZE="32m -b 1m"
@@ -27,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: head/release/arm/CUBIEBOARD2.conf
==============================================================================
--- head/release/arm/CUBIEBOARD2.conf	Fri Nov  3 22:41:31 2017	(r325372)
+++ head/release/arm/CUBIEBOARD2.conf	Fri Nov  3 23:02:57 2017	(r325373)
@@ -8,7 +8,6 @@ EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv7"
 EMBEDDEDPORTS="sysutils/u-boot-cubieboard2"
 KERNEL="GENERIC"
-WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000"
 IMAGE_SIZE="3072M"
 PART_SCHEME="MBR"
 FAT_SIZE="32m -b 1m"
@@ -27,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: head/release/arm/CUBOX-HUMMINGBOARD.conf
==============================================================================
--- head/release/arm/CUBOX-HUMMINGBOARD.conf	Fri Nov  3 22:41:31 2017	(r325372)
+++ head/release/arm/CUBOX-HUMMINGBOARD.conf	Fri Nov  3 23:02:57 2017	(r325373)
@@ -8,7 +8,6 @@ EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv7"
 EMBEDDEDPORTS="sysutils/u-boot-cubox-hummingboard"
 KERNEL="IMX6"
-WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000"
 IMAGE_SIZE="3072M"
 PART_SCHEME="MBR"
 FAT_SIZE="50m -b 16384"
@@ -27,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: head/release/arm/GUMSTIX.conf
==============================================================================
--- head/release/arm/GUMSTIX.conf	Fri Nov  3 22:41:31 2017	(r325372)
+++ head/release/arm/GUMSTIX.conf	Fri Nov  3 23:02:57 2017	(r325373)
@@ -8,7 +8,6 @@ EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-duovero"
 KERNEL="GUMSTIX"
-WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000"
 IMAGE_SIZE="3072M"
 PART_SCHEME="MBR"
 FAT_SIZE="2m"
@@ -25,7 +24,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: head/release/arm/PANDABOARD.conf
==============================================================================
--- head/release/arm/PANDABOARD.conf	Fri Nov  3 22:41:31 2017	(r325372)
+++ head/release/arm/PANDABOARD.conf	Fri Nov  3 23:02:57 2017	(r325373)
@@ -8,7 +8,6 @@ EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv7"
 EMBEDDEDPORTS="sysutils/u-boot-pandaboard"
 KERNEL="GENERIC"
-WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000"
 IMAGE_SIZE="3072M"
 PART_SCHEME="MBR"
 FAT_SIZE="2m"
@@ -26,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: head/release/arm/RPI-B.conf
==============================================================================
--- head/release/arm/RPI-B.conf	Fri Nov  3 22:41:31 2017	(r325372)
+++ head/release/arm/RPI-B.conf	Fri Nov  3 23:02:57 2017	(r325373)
@@ -8,7 +8,6 @@ EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-rpi"
 KERNEL="RPI-B"
-WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000"
 IMAGE_SIZE="3072M"
 PART_SCHEME="MBR"
 FAT_SIZE="17m"
@@ -29,7 +28,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/rpi.dtb \

Modified: head/release/arm/RPI2.conf
==============================================================================
--- head/release/arm/RPI2.conf	Fri Nov  3 22:41:31 2017	(r325372)
+++ head/release/arm/RPI2.conf	Fri Nov  3 23:02:57 2017	(r325373)
@@ -8,7 +8,6 @@ EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv7"
 EMBEDDEDPORTS="sysutils/u-boot-rpi2"
 KERNEL="GENERIC"
-WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000"
 IMAGE_SIZE="3072M"
 PART_SCHEME="MBR"
 FAT_SIZE="50m"
@@ -30,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: head/release/arm/WANDBOARD.conf
==============================================================================
--- head/release/arm/WANDBOARD.conf	Fri Nov  3 22:41:31 2017	(r325372)
+++ head/release/arm/WANDBOARD.conf	Fri Nov  3 23:02:57 2017	(r325373)
@@ -8,7 +8,6 @@ EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv7"
 EMBEDDEDPORTS="sysutils/u-boot-wandboard"
 KERNEL="IMX6"
-WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000"
 IMAGE_SIZE="3072M"
 PART_SCHEME="MBR"
 FAT_SIZE="50m -b 16384"
@@ -27,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

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711032302.vA3N2viC004209>

Header And Logo

Peripheral Links

Site Navigation

Header And Logo

Peripheral Links

Search

Site Navigation