diff options
author | chunseoklee <chunseok.lee@samsung.com> | 2017-01-03 04:10:48 +0300 |
---|---|---|
committer | chunseoklee <chunseok.lee@samsung.com> | 2017-01-03 04:42:25 +0300 |
commit | 2a6244795ba341b449deb05f9ed452a9663c936b (patch) | |
tree | a811b107a57e1e9bd56ee38752cb07ea2f969012 /cross | |
parent | 4375dcc04793da8fa3f9d9353293acc1c2185ec1 (diff) |
Use armel instead of arm-softfp
Signed-off-by: chunseoklee <chunseok.lee@samsung.com>
Diffstat (limited to 'cross')
-rw-r--r-- | cross/arm-softfp/sources.list.jessie | 6 | ||||
-rw-r--r-- | cross/armel/sources.list.jessie | 7 | ||||
-rw-r--r-- | cross/armel/toolchain.cmake (renamed from cross/arm-softfp/toolchain.cmake) | 0 | ||||
-rw-r--r-- | cross/armel/tryrun.cmake (renamed from cross/arm-softfp/tryrun.cmake) | 0 | ||||
-rwxr-xr-x | cross/build-rootfs.sh | 16 |
5 files changed, 18 insertions, 11 deletions
diff --git a/cross/arm-softfp/sources.list.jessie b/cross/arm-softfp/sources.list.jessie deleted file mode 100644 index 5b8510e5e7..0000000000 --- a/cross/arm-softfp/sources.list.jessie +++ /dev/null @@ -1,6 +0,0 @@ -deb http://ftp.debian.org/debian/ jessie main contrib non-free -deb-src http://ftp.debian.org/debian/ jessie main contrib non-free - -# lldb-3.6-dev is unavailable in jessie -deb http://ftp.debian.org/debian/ stretch main contrib non-free -deb-src http://ftp.debian.org/debian/ stretch main contrib non-free diff --git a/cross/armel/sources.list.jessie b/cross/armel/sources.list.jessie new file mode 100644 index 0000000000..d63875ae2a --- /dev/null +++ b/cross/armel/sources.list.jessie @@ -0,0 +1,7 @@ +deb http://ftp.debian.org/debian/ jessie main contrib non-free +deb-src http://ftp.debian.org/debian/ jessie main contrib non-free + +# Stable repo is the only repo that has llvm for armel +deb http://ftp.debian.org/debian/ stable main contrib non-free +deb-src http://ftp.debian.org/debian/ stable main contrib non-free + diff --git a/cross/arm-softfp/toolchain.cmake b/cross/armel/toolchain.cmake index 2985ce5442..2985ce5442 100644 --- a/cross/arm-softfp/toolchain.cmake +++ b/cross/armel/toolchain.cmake diff --git a/cross/arm-softfp/tryrun.cmake b/cross/armel/tryrun.cmake index f6d9159caa..f6d9159caa 100644 --- a/cross/arm-softfp/tryrun.cmake +++ b/cross/armel/tryrun.cmake diff --git a/cross/build-rootfs.sh b/cross/build-rootfs.sh index e840a2bdc8..ae19804701 100755 --- a/cross/build-rootfs.sh +++ b/cross/build-rootfs.sh @@ -3,8 +3,8 @@ usage() { echo "Usage: $0 [BuildArch] [UbuntuCodeName]" - echo "BuildArch can be: arm, arm-softfp, arm64, x86" - echo "UbuntuCodeName - optional, Code name for Ubuntu, can be: trusty(default), vivid, wily, xenial. If BuildArch is arm-softfp, UbuntuCodeName is ignored." + echo "BuildArch can be: arm, armel, arm64, x86" + echo "UbuntuCodeName - optional, Code name for Ubuntu, can be: trusty(default), vivid, wily, xenial. If BuildArch is armel, UbuntuCodeName is ignored." exit 1 } @@ -30,6 +30,8 @@ __UbuntuPackages+=" zlib1g-dev" if [ -z "$LLVM_ARM_HOME" ]; then __LLDB_Package="lldb-3.6-dev" fi + + __BuildArch=arm __UbuntuArch=armhf @@ -60,11 +62,10 @@ for i in "$@" ; do __UbuntuArch=i386 __UbuntuRepo="http://archive.ubuntu.com/ubuntu" ;; - arm-softfp) - __BuildArch=arm-softfp + armel) + __BuildArch=armel __UbuntuArch=armel __UbuntuRepo="http://ftp.debian.org/debian/" - __UbuntuPackages+=" ${__LLDB_Package:-}" __MachineTriple=arm-linux-gnueabi __UbuntuCodeName=jessie ;; @@ -93,6 +94,11 @@ if [[ "$__BuildArch" == "arm" ]]; then __UbuntuPackages+=" ${__LLDB_Package:-}" fi +if [ "$__BuildArch" == "armel" ]; then + __LLDB_Package="lldb-3.5-dev" + __UbuntuPackages+=" ${__LLDB_Package:-}" +fi + __RootfsDir="$__CrossDir/rootfs/$__BuildArch" if [[ -n "$ROOTFS_DIR" ]]; then |