summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
author박종현/On-Device Lab(SR)/Staff Engineer/삼성전자 <jh1302.park@samsung.com>2019-03-05 09:58:18 +0900
committer오형석/On-Device Lab(SR)/Staff Engineer/삼성전자 <hseok82.oh@samsung.com>2019-03-05 09:58:18 +0900
commita6aa97b3f11a0952b0a7ab323d34f2fe7f3e7521 (patch)
tree80c83c21d262d51e323cab696e2143f19ea4a973 /scripts
parent9d55e3e91be4277354a4f8728dfab9c39bec6774 (diff)
downloadnnfw-a6aa97b3f11a0952b0a7ab323d34f2fe7f3e7521.tar.gz
nnfw-a6aa97b3f11a0952b0a7ab323d34f2fe7f3e7521.tar.bz2
nnfw-a6aa97b3f11a0952b0a7ab323d34f2fe7f3e7521.zip
Use ROOTFS_DIR without indirection (#4562)
* Use ROOTFS_DIR without indirection The current implementation of Makfile sets ROOTFS_ARM/ROOTFS_ARM64 from ROOTFS_DIR environment variable, and CMake uses ROOTFS_ARM/ROOTFS_ARM64 environment variable to locate the location of root filesystem. This commit eliminates this indirection and now CMake uses ROOTFS_DIR without indirection. Signed-off-by: Jonghyun Park <jh1302.park@samsung.com> * Update configure command
Diffstat (limited to 'scripts')
-rw-r--r--scripts/command/configure16
1 files changed, 0 insertions, 16 deletions
diff --git a/scripts/command/configure b/scripts/command/configure
index 3b654d677..24c4f0da4 100644
--- a/scripts/command/configure
+++ b/scripts/command/configure
@@ -20,24 +20,8 @@ TARGET_ARCH_LC="$(echo ${TARGET_ARCH} | tr A-Z a-z)"
BUILD_TYPE_LC="$(echo ${BUILD_TYPE} | tr A-Z a-z)"
if [ "${TARGET_ARCH_LC}" == *"arm64"* ]; then
- # arm64 as target-arch comes from Android
- if [ ! -z ${ROOTFS_DIR} ]; then
- ROOTFS_ARM64="${ROOTFS_DIR}"
- export ROOTFS_ARM64
- fi
# For now Android is the only option for arm64
TARGET_OS=android
-elif [ "${TARGET_ARCH_LC}" == *"arm"* ]; then
- if [ ! -z ${ROOTFS_DIR} ] ; then
- ROOTFS_ARM="${ROOTFS_DIR}"
- export ROOTFS_ARM
- fi
-elif [ "${TARGET_ARCH_LC}" == *"aarch64"* ]; then
- # aarch64 as target-arch comes from all except for Android
- if [ ! -z ${ROOTFS_DIR} ] ; then
- ROOTFS_ARM64="${ROOTFS_DIR}"
- export ROOTFS_ARM64
- fi
fi
# Todo: we may set CROSS_BUILD=1 when ROOTFS_DIR is given