aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2018-03-07 16:00:03 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2018-03-07 16:00:03 +0000
commitaad0373e5a247fa99bedd0a982d028da36c1e760 (patch)
treeeddbe841f198ef10cff850ac90793ed0e06ce789
parent09e32170933643f53b05e9b5ee3cdf8898ac98c6 (diff)
parent36f0eaa0e5702160355ae22ab968345150bafdb2 (diff)
Merge "Adding support for NVM Express partitions"
-rwxr-xr-xscripts/mkefi-agl.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mkefi-agl.sh b/scripts/mkefi-agl.sh
index f2480e2e3..14ade366e 100755
--- a/scripts/mkefi-agl.sh
+++ b/scripts/mkefi-agl.sh
@@ -307,14 +307,14 @@ ROOTFS_END=$((ROOTFS_START+ROOTFS_SIZE))
# MMC devices use a partition prefix character 'p'
PART_PREFIX=""
-if [ ! "${DEVICE#/dev/mmcblk}" = "${DEVICE}" ] || [ ! "${DEVICE#/dev/loop}" = "${DEVICE}" ]; then
+if [ ! "${DEVICE#/dev/mmcblk}" = "${DEVICE}" ] || [ ! "${DEVICE#/dev/nvme0n}" = "${DEVICE}" ] || [ ! "${DEVICE#/dev/loop}" = "${DEVICE}" ]; then
PART_PREFIX="p"
fi
BOOTFS=$DEVICE${PART_PREFIX}1
ROOTFS=$DEVICE${PART_PREFIX}2
TARGET_PART_PREFIX=""
-if [ ! "${TARGET_DEVICE#/dev/mmcblk}" = "${TARGET_DEVICE}" ]; then
+if [ ! "${TARGET_DEVICE#/dev/mmcblk}" = "${TARGET_DEVICE}" ] || [ ! "${TARGET_DEVICE#/dev/nvme0n}" = "${TARGET_DEVICE}" ]; then
TARGET_PART_PREFIX="p"
fi
TARGET_ROOTFS=$TARGET_DEVICE${TARGET_PART_PREFIX}2