Release DSM6.1 BETA toolkit

- update master branch to DSM6.1
- release new platform: hi3535, broadwell
This commit is contained in:
kevinfang
2016-11-28 11:17:52 +08:00
parent 709c456afa
commit 83aa8464b5
7 changed files with 150 additions and 24 deletions

View File

@ -355,22 +355,7 @@ GetBuildPhase() {
}
GetBuildStage() {
local version="$1"
local phase=$2
[ -z "$phase" ] && phase=$(GetBuildPhase $version)
case $phase in
"beta"|"release"|"hotfix")
echo release
;;
"dev"|"alpha"|"rc")
echo development
;;
*)
return 1
;;
esac
echo release
return 0
}

View File

@ -70,6 +70,8 @@ pkg_get_platform() { # [path of env.mak (default: /env.mak)]
ALPINE) arch="alpine" ;;
STM_MONACO) arch="monaco" ;;
MARVELL_ARMADA38X) arch="armada38x" ;;
HISILICON_HI3535) arch="hi3535" ;;
BROADWELL) arch="broadwell" ;;
*) arch="" ;;
esac
fi
@ -82,8 +84,8 @@ plat_to_unified_plat() {
local unified_plat=
case "$plat" in
x86 | bromolow | cedarview | avoton | braswell )
unified_plat="x86 bromolow cedarview avoton braswell"
x86 | bromolow | cedarview | avoton | braswell | broadwell)
unified_plat="x86 bromolow cedarview avoton braswell broadwell"
;;
# alpine and alpine4k use same define.
alpine | alpine4k )
@ -101,7 +103,7 @@ plat_to_family() {
local family=
case "$plat" in
x86 | bromolow | cedarview | avoton | braswell )
x86 | bromolow | cedarview | avoton | braswell | broadwell)
family="x86_64"
;;
evansport )
@ -117,7 +119,7 @@ plat_to_family() {
family="ppc"
;;
# armv7 not ready platforms.
comcerto2k | armada370 | armada375 | armadaxp | monaco | armada38x)
comcerto2k | armada370 | armada375 | armadaxp | monaco | armada38x | hi3535)
family="$plat"
;;
*)
@ -203,7 +205,7 @@ pkg_get_spk_unified_platform() { # [path of env.mak (default: /env.mak)]
88f6281)
spk_unified_platform="88f628x"
;;
x86 | bromolow | cedarview | avoton | braswell )
x86 | bromolow | cedarview | avoton | braswell | broadwell)
spk_unified_platform="x64"
;;
alpine | alpine4k )

102
include/platform.broadwell Normal file
View File

@ -0,0 +1,102 @@
ToolChainDir32="/usr/local/i686-pc-linux-gnu"
ToolChainPrefix32="/usr/local/i686-pc-linux-gnu/bin/i686-pc-linux-gnu-"
ToolChainBin32="${ToolChainDir32}/bin"
ToolChainInclude32="${ToolChainDir32}/i686-pc-linux-gnu/sys-root/usr/include"
ToolChainLib32="${ToolChainDir32}/i686-pc-linux-gnu/sys-root/lib"
ToolChainSysRoot32="${ToolChainDir32}/i686-pc-linux-gnu/sys-root"
ARCH="x86_64"
PLATFORM_FAMILY="SYNOPLAT_F_X86_64"
ConfigOpt32="--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu --build=i686-pc-linux"
# For sdk usbcam
HOST32=i686-pc-linux-gnu
PLAT_FLAGS="-DSYNO_BROADWELL"
CFLAGS32="-D$PLATFORM_FAMILY -DSYNO_SAS -O2"
LDFLAGS32=""
CC32=${ToolChainPrefix32}gcc
CXX32=${ToolChainPrefix32}g++
LD32=${ToolChainPrefix32}ld
AR32=${ToolChainPrefix32}ar
STRIP32=${ToolChainPrefix32}strip
RANLIB32=${ToolChainPrefix32}ranlib
NM32=${ToolChainPrefix32}nm
READELF32=${ToolChainPrefix32}readelf
StaticDir32="/usr/i686-linux-uclibc"
StaticPrefix32="/usr/i686-linux-uclibc/bin/i386-uclibc-"
StaticInclude32="${StaticDir32}/include"
StaticLib32="${StaticDir32}/lib"
STATIC_CFLAGS32="-I${StaticInclude32} -D$PLATFORM_FAMILY -DSYNO_SAS"
STATIC_LDFLAGS32="-L${StaticLib32}"
STATIC_CC32=${StaticPrefix32}gcc
STATIC_LD32=${StaticPrefix32}ld
STATIC_AR32=${StaticPrefix32}ar
STATIC_STRIP32=${StaticPrefix32}strip
STATIC_RANLIB32=${StaticPrefix32}ranlib
STATIC_NM32=${StaticPrefix32}nm
ToolChainDir64="/usr/local/x86_64-pc-linux-gnu"
ToolChainPrefix64="/usr/local/x86_64-pc-linux-gnu/bin/x86_64-pc-linux-gnu-"
ToolChainBin64="${ToolChainDir64}/bin"
ToolChainInclude64="${ToolChainDir64}/x86_64-pc-linux-gnu/sys-root/usr/include/"
ToolChainSysInclude64=""
ToolChainLib64="${ToolChainDir64}/x86_64-pc-linux-gnu/sys-root/lib"
ToolChainSysRoot64="${ToolChainDir64}/x86_64-pc-linux-gnu/sys-root"
ConfigOpt64="--host=x86_64-pc-linux-gnu --target=x86_64-pc-linux-gnu --build=i686-pc-linux-gnu"
# For sdk usbcam
HOST64=x86_64-pc-linux-gnu
CFLAGS64="-D$PLATFORM_FAMILY -DSYNO_SAS -O2"
LDFLAGS64=""
CC64=${ToolChainPrefix64}gcc
CXX64=${ToolChainPrefix64}g++
LD64=${ToolChainPrefix64}ld
AR64=${ToolChainPrefix64}ar
STRIP64=${ToolChainPrefix64}strip
RANLIB64=${ToolChainPrefix64}ranlib
NM64=${ToolChainPrefix64}nm
READELF64=${ToolChainPrefix64}readelf
StaticDir64="/usr/x86_64-linux-uclibc"
StaticPrefix64="/usr/x86_64-linux-uclibc/bin/x86_64-uclibc-"
StaticInclude64="${StaticDir64}/include"
StaticLib64="${StaticDir64}/lib"
STATIC_CFLAGS64="-I${StaticInclude64} -D$PLATFORM_FAMILY -DSYNO_SAS"
STATIC_LDFLAGS64="-L${StaticLib64}"
STATIC_CC64=${StaticPrefix64}gcc
STATIC_LD64=${StaticPrefix64}ld
STATIC_AR64=${StaticPrefix64}ar
STATIC_STRIP64=${StaticPrefix64}strip
STATIC_RANLIB64=${StaticPrefix64}ranlib
STATIC_NM64=${StaticPrefix64}nm
#For Grub in EFI framework
GrubHOST64=x86_64-pc-linux-gnu
GrubToolChainDir64="/usr/local/x86_64-pc-linux-gnu"
GrubToolChainPrefix64="/usr/local/x86_64-pc-linux-gnu/bin/x86_64-pc-linux-gnu-"
GrubToolChainBin64="${GrubToolChainDir64}/bin"
GrubToolChainInclude64="${GrubToolChainDir64}/include"
GrubToolChainSysInclude64=""
GrubToolChainLib64="${GrubToolChainDir64}/lib"
GrubConfigOpt64="--host=x86_64-pc-linux-gnu --target=x86_64-pc-linux-gnu --build=i686-pc-linux-gnu"
GrubCFLAGS64="-I${GrubToolChainInclude64} -D$PLATFORM_FAMILY"
GrubLDFLAGS64="-L${GrubToolChainLib64}"
GrubCC64=${GrubToolChainPrefix64}gcc
GrubCXX64=${GrubToolChainPrefix64}g++
GrubLD64=${GrubToolChainPrefix64}ld
GrubAR64=${GrubToolChainPrefix64}ar
GrubSTRIP64=${GrubToolChainPrefix64}strip
GrubRANLIB64=${GrubToolChainPrefix64}ranlib
GrubNM64=${GrubToolChainPrefix64}nm
KernelToolchain="gcc493_glibc220_linaro_x86_64"
ToolchainTGZList="$KernelToolchain gcc493_glibc220_linaro_i686on64 uclibc09332_i686 uclibc09332_x86_64"
SynoKernelConfig="broadwell"
SynoGNUSources="x86 x64"

33
include/platform.hi3535 Normal file
View File

@ -0,0 +1,33 @@
ToolChainDir32="/usr/local/arm-cortexa9-linux-gnueabi"
ToolChainPrefix32="/usr/local/arm-cortexa9-linux-gnueabi/bin/arm-cortexa9-linux-gnueabi-"
ToolChainBin32="${ToolChainDir32}/bin"
ToolChainInclude32="${ToolChainDir32}/arm-cortexa9-linux-gnueabi/sysroot/usr/include"
ToolChainLib32="${ToolChainDir32}/arm-cortexa9-linux-gnueabi/sysroot/lib"
ToolChainSysRoot32="${ToolChainDir32}/arm-cortexa9-linux-gnueabi/sysroot"
ARCH="arm"
PLATFORM_FAMILY="SYNOPLAT_F_ARMV7"
ConfigOpt32="--host=arm-cortexa9-linux-gnueabi --target=arm-cortexa9-linux-gnueabi --build=i686-pc-linux"
# For sdk usbcam
HOST32=armle-unknown-linux
PLAT_FLAGS="-DSYNO_HISILICON_HI3535"
CFLAGS32="-I${ToolChainInclude32} -D$PLATFORM_FAMILY -O2 -mfloat-abi=soft -mtune=cortex-a9 -mthumb"
LDFLAGS32="-L${ToolChainLib32}"
CC32=${ToolChainPrefix32}gcc
CXX32=${ToolChainPrefix32}g++
LD32=${ToolChainPrefix32}ld
AR32=${ToolChainPrefix32}ar
STRIP32=${ToolChainPrefix32}strip
RANLIB32=${ToolChainPrefix32}ranlib
NM32=${ToolChainPrefix32}nm
READELF32=${ToolChainPrefix32}readelf
KernelToolchain="gcc483_glibc219_hi3535"
ToolchainTGZList="$KernelToolchain"
UBootToolchain="gcc483_glibc219_hi3535"
SynoKernelConfig="hi3535"
SynoGNUSources="hi3535"
BRINGUP_VERSION=5.2

View File

@ -6,7 +6,7 @@ __INCLUDE_PLATFORMS__=defined
Source "include/variable"
AllPlatformOptionNames="6281 alpine alpine4k armada370 armada375 armada38x armadaxp avoton braswell bromolow cedarview comcerto2k evansport monaco qoriq x64"
AllPlatformOptionNames="6281 alpine alpine4k armada370 armada375 armada38x armadaxp avoton braswell broadwell bromolow cedarview comcerto2k evansport hi3535 monaco qoriq x64"
AllPlatforms=" bromolow BROMOLOW linux-3.10.x Intel Bromolow
6281 MARVELL_88F6281 linux-2.6.32 Marvell 88F6281
@ -24,6 +24,8 @@ AllPlatforms=" bromolow BROMOLOW linux-3.10.x Intel Bromolow
braswell BRASWELL linux-3.10.x Intel Braswell
monaco STM_MONACO linux-3.10.x-bsp STM Monaco H412
armada38x MARVELL_ARMADA38X linux-3.10.x-bsp Marvell armada38x
hi3535 HISILICON_HI3535 linux-3.4.x Hisilicon Hi3535
broadwell BROADWELL linux-3.10.x Intel Broadwell
"
#
@ -34,7 +36,7 @@ AllPlatformOptions () {
}
Is64BitPlatform() {
local all64BitPlatforms="X64 BROMOLOW CEDARVIEW AVOTON BRASWELL"
local all64BitPlatforms="X64 BROMOLOW CEDARVIEW AVOTON BRASWELL BROADWELL"
CheckInList $BUILD_TARGET $all64BitPlatforms && return 0 || return 1
}

View File

@ -31,3 +31,5 @@ alpine="linux-3.10.x-bsp"
alpine4k="linux-3.10.x-bsp"
monaco="linux-3.10.x-bsp"
armada38x="linux-3.10.x-bsp"
hi3535="linux-3.4.x"
broadwell="linux-3.10.x"

View File

@ -1,3 +1,3 @@
# Copyright (c) 2000-2016 Synology Inc. All rights reserved.
AvailablePlatform_6_0="6281 alpine alpine4k armada370 armada375 armada38x armadaxp avoton braswell bromolow cedarview comcerto2k evansport monaco qoriq x64"
AvailablePlatform_6_1="6281 alpine alpine4k armada370 armada375 armada38x armadaxp avoton braswell broadwell bromolow cedarview comcerto2k evansport hi3535 monaco qoriq x64"