From 48900fdcef926ccb30707df033522e59d367bf1f Mon Sep 17 00:00:00 2001 From: kevinfang Date: Wed, 23 Aug 2017 17:10:15 +0800 Subject: [PATCH] Release DSM6.1 new platforms apollolake/rtd1296/denverton --- include/pkg_util.sh | 14 +++-- include/platform.apollolake | 102 ++++++++++++++++++++++++++++++++++++ include/platform.denverton | 76 +++++++++++++++++++++++++++ include/platform.rtd1296 | 57 ++++++++++++++++++++ include/platforms | 5 +- include/project.depends | 3 ++ include/toolkit.config | 2 +- 7 files changed, 253 insertions(+), 6 deletions(-) create mode 100644 include/platform.apollolake create mode 100644 include/platform.denverton create mode 100644 include/platform.rtd1296 diff --git a/include/pkg_util.sh b/include/pkg_util.sh index 9518063..4eace52 100755 --- a/include/pkg_util.sh +++ b/include/pkg_util.sh @@ -59,6 +59,9 @@ pkg_get_platform() { # [path of env.mak (default: /env.mak)] PPC_QORIQ) arch="qoriq" ;; X64) arch="x86" ;; BROMOLOW) arch="bromolow" ;; + DENVERTON) arch="denverton" ;; + REALTEK_RTD1296) arch="rtd1296" ;; + APOLLOLAKE) arch="apollolake" ;; CEDARVIEW) arch="cedarview" ;; AVOTON) arch="avoton" ;; BRASWELL) arch="braswell" ;; @@ -87,8 +90,8 @@ plat_to_unified_plat() { local unified_plat= case "$plat" in - x86 | bromolow | cedarview | avoton | braswell | broadwell | dockerx64 | kvmx64 | grantley) - unified_plat="x86 bromolow cedarview avoton braswell broadwell dockerx64 kvmx64 grantley" + x86 | bromolow | cedarview | avoton | braswell | broadwell | dockerx64 | kvmx64 | grantley | denverton | apollolake) + unified_plat="x86 bromolow cedarview avoton braswell broadwell dockerx64 kvmx64 grantley denverton apollolake" ;; # alpine and alpine4k use same define. alpine | alpine4k ) @@ -106,7 +109,7 @@ plat_to_family() { local family= case "$plat" in - x86 | bromolow | cedarview | avoton | braswell | broadwell | dockerx64 | kvmx64 | grantley) + x86 | bromolow | cedarview | avoton | braswell | broadwell | dockerx64 | kvmx64 | grantley | denverton | apollolake) family="x86_64" ;; evansport ) @@ -121,6 +124,9 @@ plat_to_family() { qoriq ) family="ppc" ;; + rtd1296 ) + family="armv8" + ;; # armv7 not ready platforms. comcerto2k | armada370 | armada375 | armadaxp | monaco | armada38x | hi3535) family="$plat" @@ -208,7 +214,7 @@ pkg_get_spk_unified_platform() { # [path of env.mak (default: /env.mak)] 88f6281) spk_unified_platform="88f628x" ;; - x86 | bromolow | cedarview | avoton | braswell | broadwell | dockerx64 | kvmx64 | grantley) + x86 | bromolow | cedarview | avoton | braswell | broadwell | dockerx64 | kvmx64 | grantley | denverton | apollolake) spk_unified_platform="x64" ;; alpine | alpine4k ) diff --git a/include/platform.apollolake b/include/platform.apollolake new file mode 100644 index 0000000..23a6ec5 --- /dev/null +++ b/include/platform.apollolake @@ -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_APOLLOLAKE" +CFLAGS32="-D$PLATFORM_FAMILY -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" +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 -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" +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="apollolake" +SynoGNUSources="x86 x64" diff --git a/include/platform.denverton b/include/platform.denverton new file mode 100644 index 0000000..1c39116 --- /dev/null +++ b/include/platform.denverton @@ -0,0 +1,76 @@ +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_DENVERTON" +CFLAGS32="-D$PLATFORM_FAMILY -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 + +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 -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 + +#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" +SynoKernelConfig="denverton" +SynoGNUSources="x86 x64" diff --git a/include/platform.rtd1296 b/include/platform.rtd1296 new file mode 100644 index 0000000..6088d11 --- /dev/null +++ b/include/platform.rtd1296 @@ -0,0 +1,57 @@ +ToolChainDir32="/usr/local/aarch64-unknown-linux-gnueabi" +ToolChainPrefix32="${ToolChainDir32}/bin/aarch64-unknown-linux-gnueabi-" +ToolChainBin32="${ToolChainDir32}/bin" +ToolChainSysRoot32="${ToolChainDir32}/aarch64-unknown-linux-gnueabi/sysroot" +ToolChainInclude32="${ToolChainSysRoot32}/usr/include" +ToolChainLib32="${ToolChainSysRoot32}/lib" + +ARCH="arm64" +PLATFORM_FAMILY="SYNOPLAT_F_ARMV8" + +ConfigOpt32="--host=aarch64-unknown-linux-gnueabi --target=aarch64-unknown-linux-gnueabi --build=x86_64-build_pc-linux-gnu" + +# For sdk usbcam +HOST32=aarch64-unknown-linux-gnueabi/ + +PLAT_FLAGS="-DSYNO_REALTEK_RTD1296" +CFLAGS32="-I${ToolChainInclude32} -D$PLATFORM_FAMILY -O2 -mcpu=cortex-a53 -march=armv8-a -fno-diagnostics-show-caret -Wno-unused-local-typedefs" +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 + + +ToolChainDir64="/usr/local/aarch64-unknown-linux-gnueabi" +ToolChainPrefix64="${ToolChainDir64}/bin/aarch64-unknown-linux-gnueabi-" +ToolChainBin64="${ToolChainDir64}/bin" +ToolChainInclude64="${ToolChainDir64}/aarch64-unknown-linux-gnueabi/sys-root/usr/include/" +ToolChainSysInclude64="" +ToolChainLib64="${ToolChainDir64}/aarch64-unknown-linux-gnueabi/sysroot/lib" +ToolChainSysRoot64="${ToolChainDir64}/aarch64-unknown-linux-gnueabi/sysroot/" + +ConfigOpt64="--host=aarch64-unknown-linux-gnueabi --target=aarch64-unknown-linux-gnueabi --build=x86_64-build_pc-linux-gnu" + +# For sdk usbcam +HOST64=aarch64-unknown-linux-gnueabi + +CFLAGS64="-D$PLATFORM_FAMILY -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 + +KernelToolchain="gcc494_glibc220_armv8" +ToolchainTGZList="$KernelToolchain" +UBootToolchain="gcc483_glibc219_hard" +SynoKernelConfig="rtd1296" +SynoGNUSources="rtd1296" diff --git a/include/platforms b/include/platforms index d8e1729..0feb136 100644 --- a/include/platforms +++ b/include/platforms @@ -6,7 +6,7 @@ __INCLUDE_PLATFORMS__=defined Source "include/variable" -AllPlatformOptionNames="6281 alpine alpine4k armada370 armada375 armada38x armadaxp avoton braswell broadwell bromolow cedarview comcerto2k evansport hi3535 monaco qoriq x64 dockerx64 grantley kvmx64" +AllPlatformOptionNames="6281 alpine alpine4k armada370 armada375 armada38x armadaxp avoton braswell broadwell bromolow cedarview comcerto2k evansport hi3535 monaco qoriq x64 dockerx64 grantley kvmx64 rtd1296 apollolake denverton" AllPlatforms=" bromolow BROMOLOW linux-3.10.x Intel Bromolow 6281 MARVELL_88F6281 linux-2.6.32 Marvell 88F6281 @@ -29,6 +29,9 @@ AllPlatforms=" bromolow BROMOLOW linux-3.10.x Intel Bromolow dockerx64 DOCKERX64 linux-3.10.x Synology Docker X64 kvmx64 KVMX64 linux-3.10.x Virtual Machine grantley GRANTLEY linux-3.10.x Intel Grantley + apollolake APOLLOLAKE linux-4.4.x Intel Apollo Lake + rtd1296 REALTEK_RTD1296 linux-4.4.x Realtek rtd1296 + denverton DENVERTON linux-4.4.x Intel Denverton " # diff --git a/include/project.depends b/include/project.depends index e262d16..2efcf92 100644 --- a/include/project.depends +++ b/include/project.depends @@ -36,3 +36,6 @@ broadwell="linux-3.10.x" dockerx64="linux-3.10.x" kvmx64="linux-4.4.x" grantley="linux-3.10.x" +denverton="linux-4.4.x" +apollolake="linux-4.4.x" +rtd1296="linux-4.4.x" diff --git a/include/toolkit.config b/include/toolkit.config index 827ae0c..4e4fef6 100755 --- a/include/toolkit.config +++ b/include/toolkit.config @@ -1,4 +1,4 @@ # 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 broadwell grantley" -AvailablePlatform_6_1="6281 alpine alpine4k armada370 armada375 armada38x armadaxp avoton braswell broadwell bromolow cedarview comcerto2k dockerx64 evansport grantley hi3535 kvmx64 monaco qoriq x64" +AvailablePlatform_6_1="6281 alpine alpine4k armada370 armada375 armada38x armadaxp avoton braswell broadwell bromolow cedarview comcerto2k dockerx64 evansport grantley hi3535 kvmx64 monaco qoriq x64 rtd1296 denverton apollolake"