aboutsummaryrefslogtreecommitdiff
path: root/release/arm
diff options
context:
space:
mode:
Diffstat (limited to 'release/arm')
-rw-r--r--release/arm/BEAGLEBONE.conf19
-rw-r--r--release/arm/PANDABOARD.conf19
-rw-r--r--release/arm/RPI-B.conf22
-rw-r--r--release/arm/RPI2.conf22
-rw-r--r--release/arm/WANDBOARD.conf23
5 files changed, 51 insertions, 54 deletions
diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
index 87d2ffe7a6da..3ae48714fc33 100644
--- a/release/arm/BEAGLEBONE.conf
+++ b/release/arm/BEAGLEBONE.conf
@@ -17,22 +17,21 @@ MD_ARGS="-x 63 -y 255"
NODOC=1
arm_install_uboot() {
- UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-beaglebone"
- FATMOUNT="${DESTDIR##${KERNEL}}/fat"
- UFSMOUNT="${DESTDIR##${KERNEL}}/ufs"
+ 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}
- cp -p ${UBOOT_DIR}/MLO ${CHROOTDIR}/${FATMOUNT}/MLO
- cp -p ${UBOOT_DIR}/u-boot.img ${CHROOTDIR}/${FATMOUNT}/u-boot.img
- cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
- ${CHROOTDIR}/${FATMOUNT}/ubldr
- touch ${CHROOTDIR}/${UFSMOUNT}/firstboot
+ 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} touch ${UFSMOUNT}/firstboot
sync
umount_loop ${CHROOTDIR}/${FATMOUNT}
umount_loop ${CHROOTDIR}/${UFSMOUNT}
- rmdir ${CHROOTDIR}/${FATMOUNT}
- rmdir ${CHROOTDIR}/${UFSMOUNT}
+ chroot ${CHROOTDIR} rmdir ${FATMOUNT}
+ chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
return 0
}
diff --git a/release/arm/PANDABOARD.conf b/release/arm/PANDABOARD.conf
index 28a46396b4fb..b5a120e9041b 100644
--- a/release/arm/PANDABOARD.conf
+++ b/release/arm/PANDABOARD.conf
@@ -17,22 +17,21 @@ FAT_TYPE="12"
MD_ARGS="-x 63 -y 255"
arm_install_uboot() {
- UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-pandaboard"
- FATMOUNT="${DESTDIR##${KERNEL}}/fat"
- UFSMOUNT="${DESTDIR##${KERNEL}}/ufs"
+ 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}
- cp -p ${UBOOT_DIR}/MLO ${CHROOTDIR}/${FATMOUNT}/MLO
- cp -p ${UBOOT_DIR}/u-boot.img ${CHROOTDIR}/${FATMOUNT}/u-boot.img
- cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
- ${CHROOTDIR}/${FATMOUNT}/ubldr
- touch ${CHROOTDIR}/${UFSMOUNT}/firstboot
+ 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} touch ${UFSMOUNT}/firstboot
sync
umount_loop ${CHROOTDIR}/${FATMOUNT}
umount_loop ${CHROOTDIR}/${UFSMOUNT}
- rmdir ${CHROOTDIR}/${FATMOUNT}
- rmdir ${CHROOTDIR}/${UFSMOUNT}
+ chroot ${CHROOTDIR} rmdir ${FATMOUNT}
+ chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
return 0
}
diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf
index db3c1025fca9..e5abaab9fd18 100644
--- a/release/arm/RPI-B.conf
+++ b/release/arm/RPI-B.conf
@@ -17,27 +17,27 @@ MD_ARGS="-x 63 -y 255"
NODOC=1
arm_install_uboot() {
- UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-rpi"
+ 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"
+ 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
- cp -p ${UBOOT_DIR}/${_UF} ${CHROOTDIR}/${FATMOUNT}/${_UF}
+ chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \
+ ${FATMOUNT}/${_UF}
done
- cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
- ${CHROOTDIR}/${FATMOUNT}/ubldr
- cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/dtb/rpi.dtb \
- ${CHROOTDIR}/${FATMOUNT}/rpi.dtb
- touch ${CHROOTDIR}/${UFSMOUNT}/firstboot
+ chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
+ 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}
- rmdir ${CHROOTDIR}/${FATMOUNT}
- rmdir ${CHROOTDIR}/${UFSMOUNT}
+ chroot ${CHROOTDIR} rmdir ${FATMOUNT}
+ chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
return 0
}
diff --git a/release/arm/RPI2.conf b/release/arm/RPI2.conf
index aadd4582a9c3..e1d15d124425 100644
--- a/release/arm/RPI2.conf
+++ b/release/arm/RPI2.conf
@@ -17,27 +17,27 @@ FAT_TYPE="16"
MD_ARGS="-x 63 -y 255"
arm_install_uboot() {
- UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-rpi2"
+ 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"
+ 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
- cp -p ${UBOOT_DIR}/${_UF} ${CHROOTDIR}/${FATMOUNT}/${_UF}
+ chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \
+ ${FATMOUNT}/${_UF}
done
- cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
- ${CHROOTDIR}/${FATMOUNT}/ubldr
- cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/dtb/rpi2.dtb \
- ${CHROOTDIR}/${FATMOUNT}/rpi2.dtb
- touch ${CHROOTDIR}/${UFSMOUNT}/firstboot
+ chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
+ 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}
- rmdir ${CHROOTDIR}/${FATMOUNT}
- rmdir ${CHROOTDIR}/${UFSMOUNT}
+ chroot ${CHROOTDIR} rmdir ${FATMOUNT}
+ chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
return 0
}
diff --git a/release/arm/WANDBOARD.conf b/release/arm/WANDBOARD.conf
index 63614d7cf083..42b452310a16 100644
--- a/release/arm/WANDBOARD.conf
+++ b/release/arm/WANDBOARD.conf
@@ -17,26 +17,25 @@ MD_ARGS="-x 63 -y 255"
NODOC=1
arm_install_uboot() {
- UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-wandboard"
+ 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##${CHROOTDIR}}/${UBOOT_FILES} \
+ FATMOUNT="${DESTDIR%${KERNEL}}/fat"
+ UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
+ chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
of=/dev/${mddev} bs=512 seek=2
chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
- cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
- ${CHROOTDIR}/${FATMOUNT}/ubldr
- chroot ${CHROOTDIR} echo \
- 'setenv fdt_file wandboard-quad.dtb; fatload mmc 0:1 11000000 ubldr; bootelf 11000000;' \
- > ${FATMOUNT}/boot.txt
- touch ${CHROOTDIR}/${UFSMOUNT}/firstboot
+ chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
+ chroot ${CHROOTDIR} /bin/sh -c 'echo \
+ setenv fdt_file wandboard-quad.dtb\; fatload mmc 0:1 11000000 ubldr\; bootelf 11000000\; \
+ > ${FATMOUNT}/boot.txt'
+ chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
sync
umount_loop ${CHROOTDIR}/${FATMOUNT}
umount_loop ${CHROOTDIR}/${UFSMOUNT}
- rmdir ${CHROOTDIR}/${FATMOUNT}
- rmdir ${CHROOTDIR}/${UFSMOUNT}
+ chroot ${CHROOTDIR} rmdir ${FATMOUNT}
+ chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
return 0
}