svn commit: r335328 - user/gjb/thermite
Glen Barber
gjb at FreeBSD.org
Mon Jun 18 18:46:37 UTC 2018
Author: gjb
Date: Mon Jun 18 18:46:32 2018
New Revision: 335328
URL: https://svnweb.freebsd.org/changeset/base/335328
Log:
Update additional files missed in r335326.
Sponsored by: The FreeBSD Foundation
Modified:
user/gjb/thermite/10-arm-GUMSTIX-snap.conf
user/gjb/thermite/10-armv6-BEAGLEBONE-snap.conf
user/gjb/thermite/10-armv6-CUBOX-HUMMINGBOARD-snap.conf
user/gjb/thermite/10-armv6-PANDABOARD-snap.conf
user/gjb/thermite/10-armv6-RPI-B-snap.conf
user/gjb/thermite/10-armv6-WANDBOARD-snap.conf
user/gjb/thermite/11-arm-GUMSTIX-snap.conf
user/gjb/thermite/11-armv6-BANANAPI-snap.conf
user/gjb/thermite/11-armv6-BEAGLEBONE-snap.conf
user/gjb/thermite/11-armv6-CUBIEBOARD-snap.conf
user/gjb/thermite/11-armv6-CUBIEBOARD2-snap.conf
user/gjb/thermite/11-armv6-CUBOX-HUMMINGBOARD-snap.conf
user/gjb/thermite/11-armv6-PANDABOARD-snap.conf
user/gjb/thermite/11-armv6-RPI-B-snap.conf
user/gjb/thermite/11-armv6-RPI2-snap.conf
user/gjb/thermite/11-armv6-WANDBOARD-snap.conf
Modified: user/gjb/thermite/10-arm-GUMSTIX-snap.conf
==============================================================================
--- user/gjb/thermite/10-arm-GUMSTIX-snap.conf Mon Jun 18 18:43:45 2018 (r335327)
+++ user/gjb/thermite/10-arm-GUMSTIX-snap.conf Mon Jun 18 18:46:32 2018 (r335328)
@@ -7,27 +7,18 @@ BUILDBRANCH="10"
. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
-export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release"
+export KERNEL="GUMSTIX"
+export EMBEDDED_TARGET_ARCH="arm"
+export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)"
+export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
+export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-EMBEDDED_TARGET_ARCH="armv6"
-EMBEDDED_TARGET="arm"
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="sysutils/u-boot-duovero"
-FAT_SIZE="2m"
-FAT_TYPE="12"
-IMAGE_SIZE="480M"
+. ${srcdir}/arm/${KERNEL}.conf
+
KERNEL_FLAGS="-j6"
-KERNEL="GUMSTIX"
-MD_ARGS="-x 63 -y 255"
-NODOC=1
-NOPORTS=
-PART_SCHEME="MBR"
WORLD_FLAGS="-j10"
WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000"
-export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
-export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-
load_stage_env() {
TARGET=${EMBEDDED_TARGET}
TARGET_ARCH=${EMBEDDED_TARGET_ARCH}
@@ -37,24 +28,3 @@ if [ ! -z ${FTP_STAGING} ]; then
load_stage_env
fi
-arm_install_uboot() {
- UBOOT_DIR="/usr/local/share/u-boot/u-boot-duovero"
- FATMOUNT="${DESTDIR%${KERNEL}}/fat"
- UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
- 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 ${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
- sync
- umount_loop ${CHROOTDIR}/${FATMOUNT}
- umount_loop ${CHROOTDIR}/${UFSMOUNT}
- chroot ${CHROOTDIR} rmdir ${FATMOUNT}
- chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
-
- return 0
-}
Modified: user/gjb/thermite/10-armv6-BEAGLEBONE-snap.conf
==============================================================================
--- user/gjb/thermite/10-armv6-BEAGLEBONE-snap.conf Mon Jun 18 18:43:45 2018 (r335327)
+++ user/gjb/thermite/10-armv6-BEAGLEBONE-snap.conf Mon Jun 18 18:46:32 2018 (r335328)
@@ -7,27 +7,18 @@ BUILDBRANCH="10"
. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
-export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release"
+export KERNEL="BEAGLEBONE"
+export EMBEDDED_TARGET_ARCH="armv6"
+export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)"
+export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
+export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-EMBEDDED_TARGET_ARCH="armv6"
-EMBEDDED_TARGET="arm"
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="sysutils/u-boot-beaglebone"
-FAT_SIZE="2m"
-FAT_TYPE="12"
-IMAGE_SIZE="480M"
+. ${srcdir}/arm/${KERNEL}.conf
+
KERNEL_FLAGS="-j6"
-KERNEL="BEAGLEBONE"
-MD_ARGS="-x 63 -y 255"
-NODOC=1
-NOPORTS=
-PART_SCHEME="MBR"
WORLD_FLAGS="-j10"
WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000"
-export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
-export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-
load_stage_env() {
TARGET=${EMBEDDED_TARGET}
TARGET_ARCH=${EMBEDDED_TARGET_ARCH}
@@ -37,24 +28,3 @@ if [ ! -z ${FTP_STAGING} ]; then
load_stage_env
fi
-arm_install_uboot() {
- UBOOT_DIR="/usr/local/share/u-boot/u-boot-beaglebone"
- FATMOUNT="${DESTDIR%${KERNEL}}/fat"
- UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
- 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 ${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
- sync
- umount_loop ${CHROOTDIR}/${FATMOUNT}
- umount_loop ${CHROOTDIR}/${UFSMOUNT}
- chroot ${CHROOTDIR} rmdir ${FATMOUNT}
- chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
-
- return 0
-}
Modified: user/gjb/thermite/10-armv6-CUBOX-HUMMINGBOARD-snap.conf
==============================================================================
--- user/gjb/thermite/10-armv6-CUBOX-HUMMINGBOARD-snap.conf Mon Jun 18 18:43:45 2018 (r335327)
+++ user/gjb/thermite/10-armv6-CUBOX-HUMMINGBOARD-snap.conf Mon Jun 18 18:46:32 2018 (r335328)
@@ -7,28 +7,18 @@ BUILDBRANCH="10"
. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
-export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release"
+export BOARDNAME="CUBOX-HUMMINGBOARD"
+export EMBEDDED_TARGET_ARCH="armv6"
+export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)"
+export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}"
+export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-EMBEDDED_TARGET_ARCH="armv6"
-EMBEDDED_TARGET="arm"
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="sysutils/u-boot-cubox-hummingboard"
-FAT_SIZE="50m -b 16384"
-FAT_TYPE="16"
-IMAGE_SIZE="495M"
+. ${srcdir}/arm/${BOARDNAME}.conf
+
KERNEL_FLAGS="-j6"
-KERNEL="IMX6"
-MD_ARGS="-x 63 -y 255"
-NODOC=1
-NOPORTS=
-PART_SCHEME="MBR"
WORLD_FLAGS="-j10"
WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000"
-export BOARDNAME="CUBOX-HUMMINGBOARD"
-export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}"
-export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-
load_stage_env() {
TARGET=${EMBEDDED_TARGET}
TARGET_ARCH=${EMBEDDED_TARGET_ARCH}
@@ -38,25 +28,3 @@ if [ ! -z ${FTP_STAGING} ]; then
load_stage_env
fi
-arm_install_uboot() {
- UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubox-hummingboard"
- UBOOT_FILES="u-boot.imx"
- FATMOUNT="${DESTDIR%${KERNEL}}/fat"
- UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
- chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
- of=/dev/${mddev} bs=512 seek=2 conv=sync
- 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
- sync
- umount_loop ${CHROOTDIR}/${FATMOUNT}
- umount_loop ${CHROOTDIR}/${UFSMOUNT}
- chroot ${CHROOTDIR} rmdir ${FATMOUNT}
- chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
-
- return 0
-}
Modified: user/gjb/thermite/10-armv6-PANDABOARD-snap.conf
==============================================================================
--- user/gjb/thermite/10-armv6-PANDABOARD-snap.conf Mon Jun 18 18:43:45 2018 (r335327)
+++ user/gjb/thermite/10-armv6-PANDABOARD-snap.conf Mon Jun 18 18:46:32 2018 (r335328)
@@ -7,27 +7,18 @@ BUILDBRANCH="10"
. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
-export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release"
+export KERNEL="PANDABOARD"
+export EMBEDDED_TARGET_ARCH="armv6"
+export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)"
+export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
+export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-EMBEDDED_TARGET_ARCH="armv6"
-EMBEDDED_TARGET="arm"
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="sysutils/u-boot-pandaboard"
-FAT_SIZE="2m"
-FAT_TYPE="12"
-IMAGE_SIZE="480M"
+. ${srcdir}/arm/${KERNEL}.conf
+
KERNEL_FLAGS="-j6"
-KERNEL="PANDABOARD"
-MD_ARGS="-x 63 -y 255"
-NODOC=1
-NOPORTS=
-PART_SCHEME="MBR"
WORLD_FLAGS="-j10"
WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000"
-export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
-export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-
load_stage_env() {
TARGET=${EMBEDDED_TARGET}
TARGET_ARCH=${EMBEDDED_TARGET_ARCH}
@@ -37,24 +28,3 @@ if [ ! -z ${FTP_STAGING} ]; then
load_stage_env
fi
-arm_install_uboot() {
- UBOOT_DIR="/usr/local/share/u-boot/u-boot-pandaboard"
- FATMOUNT="${DESTDIR%${KERNEL}}/fat"
- UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
- 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 ${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
- sync
- umount_loop ${CHROOTDIR}/${FATMOUNT}
- umount_loop ${CHROOTDIR}/${UFSMOUNT}
- chroot ${CHROOTDIR} rmdir ${FATMOUNT}
- chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
-
- return 0
-}
Modified: user/gjb/thermite/10-armv6-RPI-B-snap.conf
==============================================================================
--- user/gjb/thermite/10-armv6-RPI-B-snap.conf Mon Jun 18 18:43:45 2018 (r335327)
+++ user/gjb/thermite/10-armv6-RPI-B-snap.conf Mon Jun 18 18:46:32 2018 (r335328)
@@ -7,27 +7,18 @@ BUILDBRANCH="10"
. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
-export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release"
+export KERNEL="RPI-B"
+export EMBEDDED_TARGET_ARCH="armv6"
+export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)"
+export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
+export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-EMBEDDED_TARGET_ARCH="armv6"
-EMBEDDED_TARGET="arm"
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="sysutils/u-boot-rpi"
-FAT_SIZE="17m"
-FAT_TYPE="16"
-IMAGE_SIZE="480M"
+. ${srcdir}/arm/${KERNEL}.conf
+
KERNEL_FLAGS="-j6"
-KERNEL="RPI-B"
-MD_ARGS="-x 63 -y 255"
-NODOC=1
-NOPORTS=
-PART_SCHEME="MBR"
WORLD_FLAGS="-j10"
WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000"
-export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
-export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-
load_stage_env() {
TARGET=${EMBEDDED_TARGET}
TARGET_ARCH=${EMBEDDED_TARGET_ARCH}
@@ -37,30 +28,3 @@ if [ ! -z ${FTP_STAGING} ]; then
load_stage_env
fi
-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"
- FATMOUNT="${DESTDIR%${KERNEL}}/fat"
- UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
- 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
- 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 \
- ${FATMOUNT}/rpi.dtb
- chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
- sync
- umount_loop ${CHROOTDIR}/${FATMOUNT}
- umount_loop ${CHROOTDIR}/${UFSMOUNT}
- chroot ${CHROOTDIR} rmdir ${FATMOUNT}
- chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
-
- return 0
-}
Modified: user/gjb/thermite/10-armv6-WANDBOARD-snap.conf
==============================================================================
--- user/gjb/thermite/10-armv6-WANDBOARD-snap.conf Mon Jun 18 18:43:45 2018 (r335327)
+++ user/gjb/thermite/10-armv6-WANDBOARD-snap.conf Mon Jun 18 18:46:32 2018 (r335328)
@@ -7,28 +7,18 @@ BUILDBRANCH="10"
. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
-export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release"
+export BOARDNAME="WANDBOARD"
+export EMBEDDED_TARGET_ARCH="armv6"
+export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)"
+export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}"
+export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-EMBEDDED_TARGET_ARCH="armv6"
-EMBEDDED_TARGET="arm"
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="sysutils/u-boot-wandboard"
-FAT_SIZE="50m -b 16384"
-FAT_TYPE="16"
-IMAGE_SIZE="495M"
+. ${srcdir}/arm/${BOARDNAME}.conf
+
KERNEL_FLAGS="-j6"
-KERNEL="IMX6"
-MD_ARGS="-x 63 -y 255"
-NODOC=1
-NOPORTS=
-PART_SCHEME="MBR"
WORLD_FLAGS="-j10"
WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000"
-export BOARDNAME="WANDBOARD"
-export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}"
-export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-
load_stage_env() {
TARGET=${EMBEDDED_TARGET}
TARGET_ARCH=${EMBEDDED_TARGET_ARCH}
@@ -38,25 +28,3 @@ if [ ! -z ${FTP_STAGING} ]; then
load_stage_env
fi
-arm_install_uboot() {
- UBOOT_DIR="/usr/local/share/u-boot/u-boot-wandboard"
- UBOOT_FILES="u-boot.imx"
- FATMOUNT="${DESTDIR%${KERNEL}}/fat"
- UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
- chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
- of=/dev/${mddev} bs=512 seek=2 conv=sync
- 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
- sync
- umount_loop ${CHROOTDIR}/${FATMOUNT}
- umount_loop ${CHROOTDIR}/${UFSMOUNT}
- chroot ${CHROOTDIR} rmdir ${FATMOUNT}
- chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
-
- return 0
-}
Modified: user/gjb/thermite/11-arm-GUMSTIX-snap.conf
==============================================================================
--- user/gjb/thermite/11-arm-GUMSTIX-snap.conf Mon Jun 18 18:43:45 2018 (r335327)
+++ user/gjb/thermite/11-arm-GUMSTIX-snap.conf Mon Jun 18 18:46:32 2018 (r335328)
@@ -7,27 +7,18 @@ BUILDBRANCH="11"
. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
-export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release"
+export KERNEL="GUMSTIX"
+export EMBEDDED_TARGET_ARCH="arm"
+export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)"
+export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
+export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-EMBEDDED_TARGET_ARCH="armv6"
-EMBEDDED_TARGET="arm"
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="sysutils/u-boot-duovero"
-FAT_SIZE="2m"
-FAT_TYPE="12"
-IMAGE_SIZE="1G"
+. ${srcdir}/arm/${KERNEL}.conf
+
KERNEL_FLAGS="-j6"
-KERNEL="GUMSTIX"
-MD_ARGS="-x 63 -y 255"
-NODOC=1
-NOPORTS=
-PART_SCHEME="MBR"
WORLD_FLAGS="-j10"
WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000"
-export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
-export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-
load_stage_env() {
TARGET=${EMBEDDED_TARGET}
TARGET_ARCH=${EMBEDDED_TARGET_ARCH}
@@ -37,24 +28,3 @@ if [ ! -z ${FTP_STAGING} ]; then
load_stage_env
fi
-arm_install_uboot() {
- UBOOT_DIR="/usr/local/share/u-boot/u-boot-duovero"
- FATMOUNT="${DESTDIR%${KERNEL}}/fat"
- UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
- 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 ${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
- sync
- umount_loop ${CHROOTDIR}/${FATMOUNT}
- umount_loop ${CHROOTDIR}/${UFSMOUNT}
- chroot ${CHROOTDIR} rmdir ${FATMOUNT}
- chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
-
- return 0
-}
Modified: user/gjb/thermite/11-armv6-BANANAPI-snap.conf
==============================================================================
--- user/gjb/thermite/11-armv6-BANANAPI-snap.conf Mon Jun 18 18:43:45 2018 (r335327)
+++ user/gjb/thermite/11-armv6-BANANAPI-snap.conf Mon Jun 18 18:46:32 2018 (r335328)
@@ -7,28 +7,18 @@ BUILDBRANCH="11"
. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
-export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release"
+export BOARDNAME="BANANAPI"
+export EMBEDDED_TARGET_ARCH="armv6"
+export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)"
+export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}"
+export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-EMBEDDED_TARGET_ARCH="armv6"
-EMBEDDED_TARGET="arm"
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="sysutils/u-boot-bananapi"
-FAT_SIZE="32m -b 1m"
-FAT_TYPE="16"
-IMAGE_SIZE="1G"
+. ${srcdir}/arm/${BOARDNAME}.conf
+
KERNEL_FLAGS="-j6"
-KERNEL="ALLWINNER"
-MD_ARGS="-x 63 -y 255"
-NODOC=1
-NOPORTS=
-PART_SCHEME="MBR"
WORLD_FLAGS="-j10"
WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000"
-export BOARDNAME="BANANAPI"
-export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}"
-export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-
load_stage_env() {
TARGET=${EMBEDDED_TARGET}
TARGET_ARCH=${EMBEDDED_TARGET_ARCH}
@@ -38,25 +28,3 @@ if [ ! -z ${FTP_STAGING} ]; then
load_stage_env
fi
-arm_install_uboot() {
- UBOOT_DIR="/usr/local/share/u-boot/u-boot-bananapi"
- 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}
- 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
- sync
- umount_loop ${CHROOTDIR}/${FATMOUNT}
- umount_loop ${CHROOTDIR}/${UFSMOUNT}
- chroot ${CHROOTDIR} rmdir ${FATMOUNT}
- chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
-
- return 0
-}
Modified: user/gjb/thermite/11-armv6-BEAGLEBONE-snap.conf
==============================================================================
--- user/gjb/thermite/11-armv6-BEAGLEBONE-snap.conf Mon Jun 18 18:43:45 2018 (r335327)
+++ user/gjb/thermite/11-armv6-BEAGLEBONE-snap.conf Mon Jun 18 18:46:32 2018 (r335328)
@@ -7,27 +7,18 @@ BUILDBRANCH="11"
. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
-export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release"
+export KERNEL="BEAGLEBONE"
+export EMBEDDED_TARGET_ARCH="armv6"
+export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)"
+export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
+export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-EMBEDDED_TARGET_ARCH="armv6"
-EMBEDDED_TARGET="arm"
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="sysutils/u-boot-beaglebone"
-FAT_SIZE="2m"
-FAT_TYPE="12"
-IMAGE_SIZE="1G"
+. ${srcdir}/arm/${KERNEL}.conf
+
KERNEL_FLAGS="-j6"
-KERNEL="BEAGLEBONE"
-MD_ARGS="-x 63 -y 255"
-NODOC=1
-NOPORTS=
-PART_SCHEME="MBR"
WORLD_FLAGS="-j10"
WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000"
-export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
-export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-
load_stage_env() {
TARGET=${EMBEDDED_TARGET}
TARGET_ARCH=${EMBEDDED_TARGET_ARCH}
@@ -37,24 +28,3 @@ if [ ! -z ${FTP_STAGING} ]; then
load_stage_env
fi
-arm_install_uboot() {
- UBOOT_DIR="/usr/local/share/u-boot/u-boot-beaglebone"
- FATMOUNT="${DESTDIR%${KERNEL}}/fat"
- UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
- 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 ${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
- sync
- umount_loop ${CHROOTDIR}/${FATMOUNT}
- umount_loop ${CHROOTDIR}/${UFSMOUNT}
- chroot ${CHROOTDIR} rmdir ${FATMOUNT}
- chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
-
- return 0
-}
Modified: user/gjb/thermite/11-armv6-CUBIEBOARD-snap.conf
==============================================================================
--- user/gjb/thermite/11-armv6-CUBIEBOARD-snap.conf Mon Jun 18 18:43:45 2018 (r335327)
+++ user/gjb/thermite/11-armv6-CUBIEBOARD-snap.conf Mon Jun 18 18:46:32 2018 (r335328)
@@ -7,28 +7,18 @@ BUILDBRANCH="11"
. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
-export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release"
+export BOARDNAME="CUBIEBOARD"
+export EMBEDDED_TARGET_ARCH="armv6"
+export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)"
+export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}"
+export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-EMBEDDED_TARGET_ARCH="armv6"
-EMBEDDED_TARGET="arm"
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="sysutils/u-boot-cubieboard"
-FAT_SIZE="32m -b 1m"
-FAT_TYPE="16"
-IMAGE_SIZE="1G"
+. ${srcdir}/arm/${BOARDNAME}.conf
+
KERNEL_FLAGS="-j6"
-KERNEL="ALLWINNER_UP"
-MD_ARGS="-x 63 -y 255"
-NODOC=1
-NOPORTS=
-PART_SCHEME="MBR"
WORLD_FLAGS="-j10"
WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000"
-export BOARDNAME="CUBIEBOARD"
-export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}"
-export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-
load_stage_env() {
TARGET=${EMBEDDED_TARGET}
TARGET_ARCH=${EMBEDDED_TARGET_ARCH}
@@ -38,25 +28,3 @@ if [ ! -z ${FTP_STAGING} ]; then
load_stage_env
fi
-arm_install_uboot() {
- UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubieboard"
- 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}
- 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
- sync
- umount_loop ${CHROOTDIR}/${FATMOUNT}
- umount_loop ${CHROOTDIR}/${UFSMOUNT}
- chroot ${CHROOTDIR} rmdir ${FATMOUNT}
- chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
-
- return 0
-}
Modified: user/gjb/thermite/11-armv6-CUBIEBOARD2-snap.conf
==============================================================================
--- user/gjb/thermite/11-armv6-CUBIEBOARD2-snap.conf Mon Jun 18 18:43:45 2018 (r335327)
+++ user/gjb/thermite/11-armv6-CUBIEBOARD2-snap.conf Mon Jun 18 18:46:32 2018 (r335328)
@@ -7,28 +7,18 @@ BUILDBRANCH="11"
. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
-export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release"
+export BOARDNAME="CUBIEBOARD2"
+export EMBEDDED_TARGET_ARCH="armv6"
+export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)"
+export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}"
+export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-EMBEDDED_TARGET_ARCH="armv6"
-EMBEDDED_TARGET="arm"
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="sysutils/u-boot-cubieboard2"
-FAT_SIZE="32m -b 1m"
-FAT_TYPE="16"
-IMAGE_SIZE="1G"
+. ${srcdir}/arm/${BOARDNAME}.conf
+
KERNEL_FLAGS="-j6"
-KERNEL="ALLWINNER"
-MD_ARGS="-x 63 -y 255"
-NODOC=1
-NOPORTS=
-PART_SCHEME="MBR"
WORLD_FLAGS="-j10"
WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000"
-export BOARDNAME="CUBIEBOARD2"
-export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}"
-export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-
load_stage_env() {
TARGET=${EMBEDDED_TARGET}
TARGET_ARCH=${EMBEDDED_TARGET_ARCH}
@@ -38,25 +28,3 @@ if [ ! -z ${FTP_STAGING} ]; then
load_stage_env
fi
-arm_install_uboot() {
- UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubieboard2"
- 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}
- 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
- sync
- umount_loop ${CHROOTDIR}/${FATMOUNT}
- umount_loop ${CHROOTDIR}/${UFSMOUNT}
- chroot ${CHROOTDIR} rmdir ${FATMOUNT}
- chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
-
- return 0
-}
Modified: user/gjb/thermite/11-armv6-CUBOX-HUMMINGBOARD-snap.conf
==============================================================================
--- user/gjb/thermite/11-armv6-CUBOX-HUMMINGBOARD-snap.conf Mon Jun 18 18:43:45 2018 (r335327)
+++ user/gjb/thermite/11-armv6-CUBOX-HUMMINGBOARD-snap.conf Mon Jun 18 18:46:32 2018 (r335328)
@@ -7,28 +7,18 @@ BUILDBRANCH="11"
. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
-export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release"
+export BOARDNAME="CUBOX-HUMMINGBOARD"
+export EMBEDDED_TARGET_ARCH="armv6"
+export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)"
+export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}"
+export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-EMBEDDED_TARGET_ARCH="armv6"
-EMBEDDED_TARGET="arm"
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="sysutils/u-boot-cubox-hummingboard"
-FAT_SIZE="50m -b 16384"
-FAT_TYPE="16"
-IMAGE_SIZE="1536M"
+. ${srcdir}/arm/${BOARDNAME}.conf
+
KERNEL_FLAGS="-j6"
-KERNEL="IMX6"
-MD_ARGS="-x 63 -y 255"
-NODOC=1
-NOPORTS=
-PART_SCHEME="MBR"
WORLD_FLAGS="-j10"
WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000"
-export BOARDNAME="CUBOX-HUMMINGBOARD"
-export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}"
-export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-
load_stage_env() {
TARGET=${EMBEDDED_TARGET}
TARGET_ARCH=${EMBEDDED_TARGET_ARCH}
@@ -38,25 +28,3 @@ if [ ! -z ${FTP_STAGING} ]; then
load_stage_env
fi
-arm_install_uboot() {
- UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubox-hummingboard"
- UBOOT_FILES="u-boot.imx"
- FATMOUNT="${DESTDIR%${KERNEL}}/fat"
- UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
- chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
- of=/dev/${mddev} bs=512 seek=2 conv=sync
- 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
- sync
- umount_loop ${CHROOTDIR}/${FATMOUNT}
- umount_loop ${CHROOTDIR}/${UFSMOUNT}
- chroot ${CHROOTDIR} rmdir ${FATMOUNT}
- chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
-
- return 0
-}
Modified: user/gjb/thermite/11-armv6-PANDABOARD-snap.conf
==============================================================================
--- user/gjb/thermite/11-armv6-PANDABOARD-snap.conf Mon Jun 18 18:43:45 2018 (r335327)
+++ user/gjb/thermite/11-armv6-PANDABOARD-snap.conf Mon Jun 18 18:46:32 2018 (r335328)
@@ -7,27 +7,18 @@ BUILDBRANCH="11"
. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
-export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release"
+export KERNEL="PANDABOARD"
+export EMBEDDED_TARGET_ARCH="armv6"
+export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)"
+export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
+export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-EMBEDDED_TARGET_ARCH="armv6"
-EMBEDDED_TARGET="arm"
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="sysutils/u-boot-pandaboard"
-FAT_SIZE="2m"
-FAT_TYPE="12"
-IMAGE_SIZE="1G"
+. ${srcdir}/arm/${KERNEL}.conf
+
KERNEL_FLAGS="-j6"
-KERNEL="PANDABOARD"
-MD_ARGS="-x 63 -y 255"
-NODOC=1
-NOPORTS=
-PART_SCHEME="MBR"
WORLD_FLAGS="-j10"
WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000"
-export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
-export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-
load_stage_env() {
TARGET=${EMBEDDED_TARGET}
TARGET_ARCH=${EMBEDDED_TARGET_ARCH}
@@ -37,24 +28,3 @@ if [ ! -z ${FTP_STAGING} ]; then
load_stage_env
fi
-arm_install_uboot() {
- UBOOT_DIR="/usr/local/share/u-boot/u-boot-pandaboard"
- FATMOUNT="${DESTDIR%${KERNEL}}/fat"
- UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
- 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 ${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
- sync
- umount_loop ${CHROOTDIR}/${FATMOUNT}
- umount_loop ${CHROOTDIR}/${UFSMOUNT}
- chroot ${CHROOTDIR} rmdir ${FATMOUNT}
- chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
-
- return 0
-}
Modified: user/gjb/thermite/11-armv6-RPI-B-snap.conf
==============================================================================
--- user/gjb/thermite/11-armv6-RPI-B-snap.conf Mon Jun 18 18:43:45 2018 (r335327)
+++ user/gjb/thermite/11-armv6-RPI-B-snap.conf Mon Jun 18 18:46:32 2018 (r335328)
@@ -7,27 +7,18 @@ BUILDBRANCH="11"
. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
-export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release"
+export KERNEL="RPI-B"
+export EMBEDDED_TARGET_ARCH="armv6"
+export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)"
+export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
+export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-EMBEDDED_TARGET_ARCH="armv6"
-EMBEDDED_TARGET="arm"
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="sysutils/u-boot-rpi"
-FAT_SIZE="17m"
-FAT_TYPE="16"
-IMAGE_SIZE="1G"
+. ${srcdir}/arm/${KERNEL}.conf
+
KERNEL_FLAGS="-j6"
-KERNEL="RPI-B"
-MD_ARGS="-x 63 -y 255"
-NODOC=1
-NOPORTS=
-PART_SCHEME="MBR"
WORLD_FLAGS="-j10"
WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000"
-export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
-export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-
load_stage_env() {
TARGET=${EMBEDDED_TARGET}
TARGET_ARCH=${EMBEDDED_TARGET_ARCH}
@@ -37,30 +28,3 @@ if [ ! -z ${FTP_STAGING} ]; then
load_stage_env
fi
-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"
- FATMOUNT="${DESTDIR%${KERNEL}}/fat"
- UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
- 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
- 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 \
- ${FATMOUNT}/rpi.dtb
- chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
- sync
- umount_loop ${CHROOTDIR}/${FATMOUNT}
- umount_loop ${CHROOTDIR}/${UFSMOUNT}
- chroot ${CHROOTDIR} rmdir ${FATMOUNT}
- chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
-
- return 0
-}
Modified: user/gjb/thermite/11-armv6-RPI2-snap.conf
==============================================================================
--- user/gjb/thermite/11-armv6-RPI2-snap.conf Mon Jun 18 18:43:45 2018 (r335327)
+++ user/gjb/thermite/11-armv6-RPI2-snap.conf Mon Jun 18 18:46:32 2018 (r335328)
@@ -7,27 +7,18 @@ BUILDBRANCH="11"
. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
-export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release"
+export KERNEL="RPI2"
+export EMBEDDED_TARGET_ARCH="armv6"
+export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)"
+export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
+export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-EMBEDDED_TARGET_ARCH="armv6"
-EMBEDDED_TARGET="arm"
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="sysutils/u-boot-rpi2"
-FAT_SIZE="50m"
-FAT_TYPE="16"
-IMAGE_SIZE="1G"
+. ${srcdir}/arm/${KERNEL}.conf
+
KERNEL_FLAGS="-j6"
-KERNEL="RPI2"
-MD_ARGS="-x 63 -y 255"
-NODOC=1
-NOPORTS=
-PART_SCHEME="MBR"
WORLD_FLAGS="-j10"
WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000"
-export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
-export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-
load_stage_env() {
TARGET=${EMBEDDED_TARGET}
TARGET_ARCH=${EMBEDDED_TARGET_ARCH}
@@ -37,30 +28,3 @@ if [ ! -z ${FTP_STAGING} ]; then
load_stage_env
fi
-arm_install_uboot() {
- UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi2"
- UBOOT_FILES="bootcode.bin config.txt fixup.dat fixup_cd.dat \
- fixup_x.dat start.elf start_cd.elf start_x.elf u-boot.bin"
- FATMOUNT="${DESTDIR%${KERNEL}}/fat"
- UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
- 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
- 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 \
- ${FATMOUNT}/rpi2.dtb
- chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
- sync
- umount_loop ${CHROOTDIR}/${FATMOUNT}
- umount_loop ${CHROOTDIR}/${UFSMOUNT}
- chroot ${CHROOTDIR} rmdir ${FATMOUNT}
- chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
-
- return 0
-}
Modified: user/gjb/thermite/11-armv6-WANDBOARD-snap.conf
==============================================================================
--- user/gjb/thermite/11-armv6-WANDBOARD-snap.conf Mon Jun 18 18:43:45 2018 (r335327)
+++ user/gjb/thermite/11-armv6-WANDBOARD-snap.conf Mon Jun 18 18:46:32 2018 (r335328)
@@ -7,28 +7,18 @@ BUILDBRANCH="11"
. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
-export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release"
+export BOARDNAME="WANDBOARD"
+export EMBEDDED_TARGET_ARCH="armv6"
+export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)"
+export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}"
+export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-EMBEDDED_TARGET_ARCH="armv6"
-EMBEDDED_TARGET="arm"
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="sysutils/u-boot-wandboard"
-FAT_SIZE="50m -b 16384"
-FAT_TYPE="16"
-IMAGE_SIZE="1536M"
+. ${srcdir}/arm/${BOARDNAME}.conf
+
KERNEL_FLAGS="-j6"
-KERNEL="IMX6"
-MD_ARGS="-x 63 -y 255"
-NODOC=1
-NOPORTS=
-PART_SCHEME="MBR"
WORLD_FLAGS="-j10"
WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000"
-export BOARDNAME="WANDBOARD"
-export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}"
-export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-
load_stage_env() {
TARGET=${EMBEDDED_TARGET}
TARGET_ARCH=${EMBEDDED_TARGET_ARCH}
@@ -38,25 +28,3 @@ if [ ! -z ${FTP_STAGING} ]; then
load_stage_env
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list