manuel
/
void-mklive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #23 from Gottox/usbamory 

add platform support for USB armory
This commit is contained in:
Enno Boland 2015-04-29 16:39:19 +02:00
parent bc5f40d51f 8b238fad3f
commit 6557b08b4c
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-arm-images.sh.in
View File

@ -2,7 +2,7 @@
set -e set -e
PLATFORMS="beaglebone cubieboard2 odroid-u2 rpi rpi2" PLATFORMS="beaglebone cubieboard2 odroid-u2 rpi rpi2 usbarmory"
DATE=$(date '+%Y%m%d') DATE=$(date '+%Y%m%d')
for f in ${PLATFORMS}; do for f in ${PLATFORMS}; do

2
build-rootfs.sh.in
View File

@ -2,7 +2,7 @@
set -e set -e
PLATFORMS="beaglebone cubieboard2 odroid-u2 rpi rpi2" PLATFORMS="beaglebone cubieboard2 odroid-u2 rpi rpi2 usbarmory"
for f in ${PLATFORMS}; do for f in ${PLATFORMS}; do
./mkrootfs.sh $@ $f ./mkrootfs.sh $@ $f

4
mkimage.sh.in
View File

@ -113,7 +113,7 @@ fi
# double check PLATFORM is supported... # double check PLATFORM is supported...
case "$PLATFORM" in case "$PLATFORM" in
bananapi|beaglebone|cubieboard2|odroid-u2|rpi|rpi2);; bananapi|beaglebone|cubieboard2|odroid-u2|rpi|rpi2|usbarmory);;
*) die "The $PLATFORM is not supported, exiting..." *) die "The $PLATFORM is not supported, exiting..."
esac esac
@ -182,6 +182,8 @@ elif [ "$PLATFORM" = "odroid-u2" ]; then
dd if=${ROOTFSDIR}/boot/bl2.signed.bin of=${LOOPDEV} seek=31 >/dev/null 2>&1 dd if=${ROOTFSDIR}/boot/bl2.signed.bin of=${LOOPDEV} seek=31 >/dev/null 2>&1
dd if=${ROOTFSDIR}/boot/u-boot.bin of=${LOOPDEV} seek=63 >/dev/null 2>&1 dd if=${ROOTFSDIR}/boot/u-boot.bin of=${LOOPDEV} seek=63 >/dev/null 2>&1
dd if=${ROOTFSDIR}/boot/E4412_S.tzsw.signed.bin of=${LOOPDEV} seek=2111 >/dev/null 2>&1 dd if=${ROOTFSDIR}/boot/E4412_S.tzsw.signed.bin of=${LOOPDEV} seek=2111 >/dev/null 2>&1
elif [ "$PLATFORM" = "usbarmory" ]; then
dd if=${ROOTFSDIR}/boot/u-boot.imx of=${LOOPDEV} bs=512 seek=2 conv=fsync
fi fi
mountpoint -q ${ROOTFSDIR}/boot && umount ${ROOTFSDIR}/boot mountpoint -q ${ROOTFSDIR}/boot && umount ${ROOTFSDIR}/boot

3
mkrootfs.sh.in
View File

@ -47,7 +47,7 @@ Usage: $PROGNAME [options] <platform>
Supported platforms: i686, i686-musl, x86_64, x86_64-musl, Supported platforms: i686, i686-musl, x86_64, x86_64-musl,
bananapi, beaglebone, cubieboard2, odroid-u2, bananapi, beaglebone, cubieboard2, odroid-u2,
rpi, rpi2 (armv7) rpi, rpi2 (armv7), usbarmory
Options Options
-b <syspkg> Set an alternative base-system package (defaults to base-system) -b <syspkg> Set an alternative base-system package (defaults to base-system)
@ -138,6 +138,7 @@ case "$PLATFORM" in
odroid-u2) _ARCH="armv7l"; QEMU_BIN=qemu-arm-static;; odroid-u2) _ARCH="armv7l"; QEMU_BIN=qemu-arm-static;;
rpi) _ARCH="armv6l"; QEMU_BIN=qemu-arm-static;; rpi) _ARCH="armv6l"; QEMU_BIN=qemu-arm-static;;
rpi2) SUBPLATFORM="rpi"; _ARCH="armv7l"; QEMU_BIN=qemu-arm-static;; rpi2) SUBPLATFORM="rpi"; _ARCH="armv7l"; QEMU_BIN=qemu-arm-static;;
usbarmory) _ARCH="armv7l"; QEMU_BIN=qemu-arm-static;;
x86_64) _ARCH="x86_64"; QEMU_BIN=qemu-x86_64-static;; x86_64) _ARCH="x86_64"; QEMU_BIN=qemu-x86_64-static;;
x86_64-musl) _ARCH="x86_64-musl"; QEMU_BIN=qemu-x86_64-static;; x86_64-musl) _ARCH="x86_64-musl"; QEMU_BIN=qemu-x86_64-static;;
*) die "$PROGNAME: invalid platform!";; *) die "$PROGNAME: invalid platform!";;