Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apollolake update #3088

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ RUN dpkg --add-architecture i386
# Install required packages
RUN apt-get update && \
apt-get install -y automake \
bc \
bison \
build-essential \
check \
Expand Down Expand Up @@ -36,6 +37,7 @@ RUN apt-get update && \
lzip \
mercurial \
ncurses-dev \
php5 \
pkg-config \
python3 \
subversion \
Expand Down
4 changes: 4 additions & 0 deletions cross/libvpx/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ ifeq ($(findstring $(ARCH),$(ARM7_ARCHES)),$(ARCH))
CONFIGURE_ARGS += --target=armv7-linux-gcc
endif

ifeq ($(findstring $(ARCH),$(ARM8_ARCHES)),$(ARCH))
CONFIGURE_ARGS += --target=armv8-linux-gcc
endif

ifeq ($(findstring $(ARCH),$(x86_ARCHES)),$(ARCH))
DEPENDS += native/yasm
ENV += PATH=$(YASM_PATH):$$PATH
Expand Down
15 changes: 15 additions & 0 deletions kernel/syno-apollolake-6.1/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
ARCH ?= apollolake
TCVERSION ?= 6.1
PKG_NAME = apollolake
PKG_BRANCH = 15152
PKG_ARCH = $(PKG_NAME)
PKG_EXT = txz
PKG_DIST_NAME = linux-4.4.x.$(PKG_EXT)
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch/$(PKG_ARCH)-source
PKG_EXTRACT = linux-4.4.x
SYNO_CONFIG = synoconfigs/$(ARCH)
BASE_ARCH = x86_64

HOMEPAGE = http://www.synology.com/

include ../../mk/spksrc.kernel-modules.mk
3 changes: 3 additions & 0 deletions kernel/syno-apollolake-6.1/digests
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
linux-4.4.x.txz SHA1 d86de6e33ade6d6abcf60bb95e961f7a4cb6ef8b
linux-4.4.x.txz SHA256 77fcd8628e9b435031f773eef392d1a06f72331403edd08e630415799e578a25
linux-4.4.x.txz MD5 24489c7b34e7e621aae477c56e0e115a
6 changes: 3 additions & 3 deletions kernel/syno-armada370-5.2/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
armada370-source.txz SHA1 5a03da5e57a97e591374f6dc6270a52469a54830
armada370-source.txz SHA256 69e6f0fb4e857559881765acc90f68b0be9df866127839f235ec195e080d4948
armada370-source.txz MD5 f4bea59f49ce1fd0ed3d8112e7a7f567
armada370-source.txz SHA1 69e7aab55ec22ebf1cdd3f6ed01dad15aa4765c5
armada370-source.txz SHA256 abe606c7867d651dd6c27bc7af6198785514758119a896d50e1329195a26d72d
armada370-source.txz MD5 d4d4c1fb6dd70593ad980343c88ae94b
6 changes: 3 additions & 3 deletions kernel/syno-ppc853x-5.2/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
853x-source.txz SHA1 bb5720e10fedb904639a580623233016c527dddc
853x-source.txz SHA256 ffa8bb523dd05cc7897ef099f96eb97328924e27d44da88b9d4ea042fd170a32
853x-source.txz MD5 00bf3f3dcd18ba9835914184f452d093
853x-source.txz SHA1 b81b44876c2d9471d7bde3bd59114f90b2cd918e
853x-source.txz SHA256 4d2910f0e4d9a859457588b01f5f7decc0b982a84c767410b41766653eee51a5
853x-source.txz MD5 97a518c45e12052d901c279acb4d4373
7 changes: 5 additions & 2 deletions spk/debian-chroot/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,16 @@ DEBIAN_ARCH =
ifeq ($(findstring $(ARCH),88f6281),$(ARCH))
DEBIAN_ARCH = armel
endif
ifeq ($(findstring $(ARCH),alpine armada370 armada375 armada38x armadaxp monaco),$(ARCH))
ifeq ($(findstring $(ARCH),alpine armada370 armada375 armada38x armadaxp monaco hi3535),$(ARCH))
DEBIAN_ARCH = armhf
endif
ifeq ($(findstring $(ARCH),rtd1296),$(ARCH))
DEBIAN_ARCH = arm64
endif
ifeq ($(findstring $(ARCH),evansport),$(ARCH))
DEBIAN_ARCH = i386
endif
ifeq ($(findstring $(ARCH),braswell bromolow cedarview x86 avoton x64),$(ARCH))
ifeq ($(findstring $(ARCH),braswell bromolow cedarview x86 avoton x64 apollolake),$(ARCH))
DEBIAN_ARCH = amd64
endif
ifeq ($(findstring $(ARCH),qoriq),$(ARCH))
Expand Down
10 changes: 7 additions & 3 deletions spk/gentoo-chroot/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,15 @@ ifeq ($(findstring $(ARCH),88f6281),$(ARCH))
GENTOO_CPU = arm
GENTOO_ARCH = armv5tel
endif
ifeq ($(findstring $(ARCH),alpine armada370 armada375 armada38x armadaxp monaco),$(ARCH))
ifeq ($(findstring $(ARCH),alpine armada370 armada375 armada38x armadaxp monaco hi3535),$(ARCH))
GENTOO_CPU = arm
GENTOO_ARCH = armv7a_hardfp
endif
ifeq ($(findstring $(ARCH),braswell bromolow cedarview evansport x86 avoton x64),$(ARCH))
ifeq ($(findstring $(ARCH),rtd1296),$(ARCH))
GENTOO_CPU = arm
GENTOO_ARCH = arm64
endif
ifeq ($(findstring $(ARCH),braswell bromolow cedarview evansport x86 avoton x64 apollolake),$(ARCH))
GENTOO_CPU = x86
GENTOO_ARCH = i686
endif
Expand All @@ -58,7 +62,7 @@ gentoo-chroot_extra_install:
wget -nv -c -O $(WORK_DIR)/$(GENTOO_STAGE3_FILE) $(GENTOO_STAGE3_URL)
install -m 755 -d $(STAGING_DIR)/var
install -m 755 -d $(STAGING_DIR)/var/chroottarget
tar xjpf $(WORK_DIR)/$(GENTOO_STAGE3_FILE) -C $(STAGING_DIR)/var/chroottarget --exclude './dev/*'
tar xpf $(WORK_DIR)/$(GENTOO_STAGE3_FILE) -C $(STAGING_DIR)/var/chroottarget --exclude './dev/*'
install -m 755 -d $(STAGING_DIR)/etc
install -m 644 src/mounts $(STAGING_DIR)/etc/mounts
install -m 755 -d $(STAGING_DIR)/app
Expand Down
2 changes: 1 addition & 1 deletion spk/lirc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ $(error Sorry, this package does not support the $(ARCH) architecture.)
endif

# Use older LIRC build for ARCHs with kernel < 2.6.36
ifneq ($(findstring $(ARCH),alpine armada370 armada375 armada38x armadaxp avoton braswell bromolow cedarview evansport x64 x86),$(ARCH))
ifeq ($(findstring $(ARCH),88f6281 ppc824x ppc853x ppc854x qoriq),$(ARCH))
SPK_VERS = 0.8.7
LIRC_SUPPORTED_DRIVERS = mceusb uirt uirt2
endif
Expand Down