summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/bcm2835-bootloader/Makefile36
-rw-r--r--package/bcm2835-vc/Makefile2
-rw-r--r--package/gcj/Makefile2
-rw-r--r--package/kodi/Makefile25
-rw-r--r--package/libcec/Makefile9
-rw-r--r--package/libxml2/Makefile2
-rw-r--r--package/omxplayer/Makefile2
-rw-r--r--package/sqlite/Makefile2
-rw-r--r--package/u-boot/Makefile5
-rw-r--r--package/wiringPi/Makefile2
10 files changed, 70 insertions, 17 deletions
diff --git a/package/bcm2835-bootloader/Makefile b/package/bcm2835-bootloader/Makefile
index 168c00e3c..2fbf19d16 100644
--- a/package/bcm2835-bootloader/Makefile
+++ b/package/bcm2835-bootloader/Makefile
@@ -4,14 +4,14 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= bcm2835-bootloader
-PKG_VERSION:= 9b068fe44503f564579a25fd849df4ec784f9d4d
-PKG_RELEASE:= 3
-PKG_DESCR:= bootloader for raspberry pi
+PKG_VERSION:= a43480416153e88e8499ae85e4a760dcaa4a5810
+PKG_RELEASE:= 1
+PKG_DESCR:= bootloader for bcm28xx
PKG_SECTION:= base/boot
PKG_URL:= https://github.com/raspberrypi/firmware
PKG_SITES:= https://github.com/raspberrypi/firmware.git
-PKG_SYSTEM_DEPENDS:= raspberry-pi
+PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2
PKG_CHOICES_BCM2835_BOOTLOADER:= DEFAULT EXTRA CUTDOWN
PKGCD_DEFAULT:= default bootloader
@@ -52,15 +52,43 @@ ifeq ($(ADK_PACKAGE_BCM2835_BOOTLOADER_CUTDOWN),y)
endif
printf "gpu_mem=$(ADK_TARGET_GPU_MEM)\n" >> \
$(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+ifeq ($(ADK_KERNEL_BCM2709_DT),y)
+ printf "device_tree=bcm2709-rpi-2-b.dtb\n" >> \
+ $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+endif
ifeq ($(ADK_KERNEL_BCM2708_DT),y)
printf "device_tree=bcm2708-rpi-b.dtb\n" >> \
$(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+endif
+ifneq ($(ADK_KERNEL_BCM2708_DT)$(ADK_KERNEL_BCM2709_DT),)
printf "device_tree_address=0x100\n" >> \
$(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
printf "kernel_address=0x8000\n" >> \
$(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
printf "disable_commandline_tags=2\n" >> \
$(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+ printf "dtparam=i2s=on,spi=on,i2c_arm=on,i2c_vc=on\n" >> \
+ $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+ifneq ($(ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_AMP),)
+ printf "dtoverlay=hifiberry-amp\n" >> \
+ $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+endif
+ifneq ($(ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DAC),)
+ printf "dtoverlay=hifiberry-dac\n" >> \
+ $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+endif
+ifneq ($(ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI),)
+ printf "dtoverlay=hifiberry-digi\n" >> \
+ $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+endif
+ifneq ($(ADK_KERNEL_SND_BCM2708_SOC_RPI_DAC),)
+ printf "dtoverlay=rpi-dac\n" >> \
+ $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+endif
+ifneq ($(ADK_KERNEL_SND_BCM2708_SOC_IQAUDIO_DAC),)
+ printf "dtoverlay=iqaudio-dac\n" >> \
+ $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+endif
ifneq ($(ADK_KERNEL_SND_BCM2708_SOC_RPI_PROTO),)
printf "dtoverlay=rpi-proto\n" >> \
$(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
diff --git a/package/bcm2835-vc/Makefile b/package/bcm2835-vc/Makefile
index 8efad79bd..6e4a4afe8 100644
--- a/package/bcm2835-vc/Makefile
+++ b/package/bcm2835-vc/Makefile
@@ -13,7 +13,7 @@ PKG_BUILDDEP:= cmake-host
PKG_URL:= https://github.com/raspberrypi/userland
PKG_SITES:= https://github.com/raspberrypi/userland.git
-PKG_SYSTEM_DEPENDS:= raspberry-pi
+PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2
include ${ADK_TOPDIR}/mk/package.mk
diff --git a/package/gcj/Makefile b/package/gcj/Makefile
index 006955a42..52b11e4d1 100644
--- a/package/gcj/Makefile
+++ b/package/gcj/Makefile
@@ -4,7 +4,7 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= gcj
-PKG_VERSION:= 4.8.4
+PKG_VERSION:= 4.9.2
PKG_RELEASE:= 1
PKG_HASH:= 655fe692ddd333c29c5a1418f50f63a42cdd9e9eb7ebdb7f621e33c4b8799e31
PKG_DESCR:= java compiler
diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index 7e90ba9ed..4242bbf34 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= kodi
-PKG_VERSION:= 14.0
-PKG_RELEASE:= 4
-PKG_HASH:= 11746d95cc59361f36ce6ea9d0d36bbd9ec3376e991f5ec1720f8ff740b91192
+PKG_VERSION:= 14.1
+PKG_RELEASE:= 1
+PKG_HASH:= a38059e292cf8523918834e49fcc2d688525ceb7951ddf7f5ee535f4147255d6
PKG_DESCR:= software media player
PKG_SECTION:= mm/video
PKG_DEPENDS:= boost python2 libstdcxx glibc-gconv
@@ -31,7 +31,7 @@ PKG_URL:= http://kodi.tv/
PKG_SITES:= http://mirrors.kodi.tv/releases/source/
DISTFILES:= $(PKG_VERSION)-Helix.tar.gz
-WRKDIST= $(WRKDIR)/xbmc-14.0-Helix
+WRKDIST= $(WRKDIR)/xbmc-14.1-Helix
PKG_CHOICES_KODI:= WITH_LIBRESSL WITH_OPENSSL
PKGCD_WITH_LIBRESSL:= with libressl
@@ -75,9 +75,11 @@ PKG_LIBC_DEPENDS:= glibc
PKG_DEPENDS_RASPBERRY_PI:= bcm2835-vc
PKG_BUILDDEP_RASPBERRY_PI:= bcm2835-vc
+PKG_DEPENDS_RASPBERRY_PI2:= bcm2835-vc
+PKG_BUILDDEP_RASPBERRY_PI2:= bcm2835-vc
PKG_DEPENDS_SOLIDRUN_IMX6:= libfslvpuwrap gpu-viv-bin-mx6q
PKG_BUILDDEP_SOLIDRUN_IMX6:= libfslvpuwrap gpu-viv-bin-mx6q
-PKG_SYSTEM_DEPENDS:= raspberry-pi solidrun-imx6
+PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2 solidrun-imx6
DIFF_IGNOREFILES:= configure missing depcomp install-sh INSTALL \
aclocal.m4 config.h.in
@@ -98,6 +100,12 @@ TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/opt/vc/include \
-I$(STAGING_TARGET_DIR)/opt/vc/include/interface/vmcs_host/linux
TARGET_LDFLAGS+= -L$(STAGING_TARGET_DIR)/opt/vc/lib
endif
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI2),y)
+TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/opt/vc/include \
+ -I$(STAGING_TARGET_DIR)/opt/vc/include/interface/vcos/pthreads \
+ -I$(STAGING_TARGET_DIR)/opt/vc/include/interface/vmcs_host/linux
+TARGET_LDFLAGS+= -L$(STAGING_TARGET_DIR)/opt/vc/lib
+endif
AUTOTOOL_STYLE:= autoreconf
CONFIGURE_ENV+= DESTDIR='${WRKINST}' \
@@ -176,6 +184,13 @@ CONFIGURE_ARGS+= --with-platform=raspberry-pi \
--disable-sdl \
--disable-x11
endif
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI2),y)
+CONFIGURE_ARGS+= --with-platform=raspberry-pi \
+ --enable-player=omxplayer \
+ --enable-gles \
+ --disable-sdl \
+ --disable-x11
+endif
ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y)
CONFIGURE_ARGS+= --disable-x11 \
--disable-sdl \
diff --git a/package/libcec/Makefile b/package/libcec/Makefile
index 68bfcc708..27b1fe6f6 100644
--- a/package/libcec/Makefile
+++ b/package/libcec/Makefile
@@ -17,7 +17,9 @@ PKG_OPTS:= dev
PKG_DEPENDS_RASPBERRY_PI:= bcm2835-vc
PKG_BUILDDEP_RASPBERRY_PI:= bcm2835-vc
-PKG_SYSTEM_DEPENDS:= raspberry-pi solidrun-imx6
+PKG_DEPENDS_RASPBERRY_PI2:= bcm2835-vc
+PKG_BUILDDEP_RASPBERRY_PI2:= bcm2835-vc
+PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2 solidrun-imx6
include $(ADK_TOPDIR)/mk/package.mk
@@ -32,6 +34,11 @@ CONFIGURE_ARGS+= --enable-rpi \
--with-rpi-include-path=$(STAGING_TARGET_DIR)/opt/vc/include \
--with-rpi-lib-path=$(STAGING_TARGET_DIR)/opt/vc/lib
endif
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI2),y)
+CONFIGURE_ARGS+= --enable-rpi \
+ --with-rpi-include-path=$(STAGING_TARGET_DIR)/opt/vc/include \
+ --with-rpi-lib-path=$(STAGING_TARGET_DIR)/opt/vc/lib
+endif
libcec-install:
$(INSTALL_DIR) $(IDIR_LIBCEC)/usr/lib
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index ff0a5ec4a..294ad23d2 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -34,7 +34,7 @@ $(eval $(call PKG_template,LIBXML2_PYTHON,libxml2-python,${PKG_VERSION}-${PKG_RE
include $(ADK_TOPDIR)/mk/python.mk
HOST_STYLE:= auto
-HOST_CONFIGURE_ARGS+= --with-python \
+HOST_CONFIGURE_ARGS+= --with-python='$(STAGING_HOST_DIR)/usr' \
--without-iconv \
--without-lzma \
--without-zlib
diff --git a/package/omxplayer/Makefile b/package/omxplayer/Makefile
index 09634a613..b04524ee7 100644
--- a/package/omxplayer/Makefile
+++ b/package/omxplayer/Makefile
@@ -16,7 +16,7 @@ PKG_BUILDDEP:= ffmpeg boost bcm2835-vc freetype pcre dbus
PKG_URL:= https://github.com/popcornmix/omxplayer
PKG_SITES:= http://openadk.org/distfiles/
-PKG_SYSTEM_DEPENDS:= raspberry-pi
+PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2
PKG_LIBC_DEPENDS:= glibc musl
include $(ADK_TOPDIR)/mk/package.mk
diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile
index 89d227e12..035cf0088 100644
--- a/package/sqlite/Makefile
+++ b/package/sqlite/Makefile
@@ -6,7 +6,7 @@ include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= sqlite
PKG_VERSION:= 3.8.8.1
PKG_RELEASE:= 1
-PKG_HASH:= 98c33abe4106e508e73fda648b2657ac9e969fe24695f543dcde68cc71f3091b
+PKG_HASH:= 2721361eb4a71d5f727dfa466bd910dadd5dbeb4d2d57b8b34205f7ce7e5b7f9
PKG_DESCR:= embeddable sql database cli
PKG_SECTION:= sys/misc
PKG_BUILDDEP:= ncurses readline
diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile
index e32c9b7a3..276c0fc20 100644
--- a/package/u-boot/Makefile
+++ b/package/u-boot/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:= ftp://ftp.denx.de/pub/u-boot/
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SYSTEM_DEPENDS:= raspberry-pi atmel-ngw100
+PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2 atmel-ngw100
include $(ADK_TOPDIR)/mk/host.mk
include $(ADK_TOPDIR)/mk/package.mk
@@ -27,6 +27,9 @@ $(eval $(call PKG_template,U_BOOT,u-boot,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEP
ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
CONFIG:= rpi_defconfig
endif
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI2),y)
+CONFIG:= rpi_defconfig
+endif
ifeq ($(ADK_TARGET_SYSTEM_ATMEL_NGW100),y)
CONFIG:= atngw100_defconfig
endif
diff --git a/package/wiringPi/Makefile b/package/wiringPi/Makefile
index 5e75cc946..810b42dbd 100644
--- a/package/wiringPi/Makefile
+++ b/package/wiringPi/Makefile
@@ -12,7 +12,7 @@ PKG_HASH:= ddc71b86f71e7e5104a89f88a68bea20122b6ea9f8c535219d180bf89502a69d
PKG_URL:= http://wiringpi.com/
PKG_SITES:= git://git.drogon.net/wiringPi
-PKG_SYSTEM_DEPENDS:= raspberry-pi
+PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2
include $(ADK_TOPDIR)/mk/package.mk