diff options
97 files changed, 125391 insertions, 288063 deletions
@@ -20,6 +20,7 @@ menu "Target configuration" source "target/config/Config.in.cpu" source "target/config/Config.in.hardware" +source "target/config/Config.in.boards" source "target/config/Config.in.kernel" source "target/config/Config.in.arch" source "target/config/Config.in.system" diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index ba3fcf7ef..caf467bf5 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -1,8 +1,8 @@ -ifeq ($(ADK_KERNEL_VERSION_3_18_5),y) -KERNEL_VERSION:= 3.18.5 +ifeq ($(ADK_KERNEL_VERSION_3_18_6),y) +KERNEL_VERSION:= 3.18.6 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_HASH:= e4442436e59c74169e98d38d2e2a434c7b73f8eda0aa8f20e454eaf52270fc90 +KERNEL_HASH:= c4c1a4841173aa572d79b7530db92ce493dbefe8049e6f461a46dd897df253f5 endif ifeq ($(ADK_KERNEL_VERSION_3_14_28),y) KERNEL_VERSION:= 3.14.28 diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 2c9b5c6ed..97fdb162d 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -138,7 +138,7 @@ ${_BUILD_COOKIE}: ${_CONFIGURE_COOKIE} @env ${MAKE_ENV} ${MAKE} pre-build $(MAKE_TRACE) @$(CMD_TRACE) "compiling... " ifneq ($(filter manual,${BUILD_STYLE}),) - env ${MAKE_ENV} ${MAKE} do-build $(MAKE_TRACE) + env ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} do-build $(MAKE_TRACE) else ifeq ($(strip ${BUILD_STYLE}),) cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ ${MAKE_FLAGS} ${ALL_TARGET} $(MAKE_TRACE) 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/ |