diff options
23 files changed, 173 insertions, 51 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index 4d1b66b5b..d07da61c9 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1312,6 +1312,7 @@ $(eval $(call KMOD_template,SND_USB_AUDIO,snd-usb-audio,\ # $(eval $(call KMOD_template,BT,bt,\ + $(MODULES_DIR)/kernel/net/ieee802154/6lowpan_iphc \ $(MODULES_DIR)/kernel/net/bluetooth/bluetooth \ ,70)) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 5ce14b176..0ca11d180 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -110,6 +110,12 @@ endif ifeq (${ADK_SIMPLE_NETWORK_CONFIG_WLAN0_DHCP},y) printf "\nauto wlan0\niface wlan0 inet dhcp\n" >> ${IDIR_BASE_FILES}/etc/network/interfaces +ifeq (${ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2},y) + printf "\twireless-mode sta\n" >> ${IDIR_BASE_FILES}/etc/network/interfaces + printf "\twireless-ssid ${ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2_SSID}\n" >> ${IDIR_BASE_FILES}/etc/network/interfaces + printf "\twireless-security wpa2\n" >> ${IDIR_BASE_FILES}/etc/network/interfaces + printf "\twireless-passphrase ${ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2_PW}\n\n" >> ${IDIR_BASE_FILES}/etc/network/interfaces +endif endif ifeq (${ADK_SIMPLE_NETWORK_CONFIG_WLAN0_STATIC},y) printf "\nauto wlan0\niface wlan0 inet static\n" >> ${IDIR_BASE_FILES}/etc/network/interfaces diff --git a/package/kodi/Makefile b/package/kodi/Makefile index a2727cc53..3b9dbeafa 100644 --- a/package/kodi/Makefile +++ b/package/kodi/Makefile @@ -5,8 +5,8 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kodi PKG_VERSION:= 14.0alpha4 -PKG_RELEASE:= 3 -PKG_MD5SUM:= 5bd39942150249d9eccf792d77b92554 +PKG_RELEASE:= 4 +PKG_MD5SUM:= ac54bdac1f5c6dd2a2c75818391740a4 PKG_DESCR:= software media player PKG_SECTION:= mm/video PKG_DEPENDS:= boost python2 libstdcxx glibc-gconv diff --git a/package/logitechmediaserver/Makefile b/package/logitechmediaserver/Makefile index daafeefb0..fe339a175 100644 --- a/package/logitechmediaserver/Makefile +++ b/package/logitechmediaserver/Makefile @@ -32,5 +32,10 @@ INSTALL_STYLE:= manual logitechmediaserver-install: $(INSTALL_DIR) $(IDIR_LOGITECHMEDIASERVER)/opt/lms $(CP) $(WRKSRC)/* $(IDIR_LOGITECHMEDIASERVER)/opt/lms + @find $(IDIR_LOGITECHMEDIASERVER)/opt/lms -type f -exec chmod 644 {} \; + @find $(IDIR_LOGITECHMEDIASERVER)/opt/lms -type d -exec chmod 755 {} \; + $(INSTALL_DIR) $(IDIR_LOGITECHMEDIASERVER)/opt/lms/prefs/plugin + $(INSTALL_DIR) $(IDIR_LOGITECHMEDIASERVER)/opt/lms/Logs + $(INSTALL_DIR) $(IDIR_LOGITECHMEDIASERVER)/opt/lms/Cache include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/logitechmediaserver/files/logitechmediaserver.init b/package/logitechmediaserver/files/logitechmediaserver.init index 86c3148b2..267c88bb9 100644 --- a/package/logitechmediaserver/files/logitechmediaserver.init +++ b/package/logitechmediaserver/files/logitechmediaserver.init @@ -12,7 +12,7 @@ autostart) exec sh $0 start ;; start) - chown -R squeezeboxserver /opt/lms/prefs + chown -R squeezeboxserver /opt/lms/prefs /opt/lms/Logs /opt/lms/Cache perl /opt/lms/slimserver.pl ;; stop) diff --git a/package/mpd/Makefile b/package/mpd/Makefile index 3b423d3b4..3d7152bcc 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -16,11 +16,12 @@ PKG_URL:= http://www.musicpd.org/ PKG_SITES:= http://www.musicpd.org/download/mpd/0.18/ PKG_BUILDDEP_UCLIBC:= libiconv-tiny +PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny PKG_FLAVOURS_MPD:= WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR PKG_FLAVOURS_MPD+= WITH_OGG WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG PKG_FLAVOURS_MPD+= WITH_SHOUT WITH_CURL WITH_SAMPLERATE WITH_HTTPD -PKG_FLAVOURS_MPD+= WITH_OPUS WITH_PULSE WITH_AVAHI +PKG_FLAVOURS_MPD+= WITH_SNDFILE WITH_OPUS WITH_PULSE WITH_AVAHI PKGFD_WITH_ALSA:= enable ALSA output PKGFS_WITH_ALSA:= alsa-lib @@ -109,21 +110,28 @@ ifeq ($(ADK_PACKAGE_MPD_WITH_OPUS),y) PKG_FDEPENDS+= libopus endif -PKGFD_WITH_PULSE:= enable PULSE support +PKGFD_WITH_SNDFILE:= enable sndfile support +PKGFS_WITH_SNDFILE:= libsndfile +PKGFB_WITH_SNDFILE:= libsndfile +ifeq ($(ADK_PACKAGE_MPD_WITH_SNDFILE),y) +PKG_FDEPENDS+= libsndfile +endif + +PKGFD_WITH_PULSE:= enable pulse support PKGFS_WITH_PULSE:= pulseaudio PKGFB_WITH_PULSE:= pulseaudio ifeq ($(ADK_PACKAGE_MPD_WITH_PULSE),y) PKG_FDEPENDS+= pulseaudio endif -PKGFD_WITH_AVAHI:= enable AVAHI/zeroconf support +PKGFD_WITH_AVAHI:= enable avahi/zeroconf support PKGFS_WITH_AVAHI:= libavahi libdbus PKGFB_WITH_AVAHI:= avahi ifeq ($(ADK_PACKAGE_MPD_WITH_AVAHI),y) PKG_FDEPENDS+= libavahi endif -PKGFD_WITH_HTTPD:= enable HTTP output +PKGFD_WITH_HTTPD:= enable http output include ${ADK_TOPDIR}/mk/package.mk @@ -145,6 +153,12 @@ CONFIGURE_ARGS+= --disable-jack \ --disable-soundcloud \ --enable-inotify +ifneq (${ADK_PACKAGE_MPD_WITH_SNDFILE},) +CONFIGURE_ARGS+= --enable-sndfile +else +CONFIGURE_ARGS+= --disable-sndfile +endif + ifneq (${ADK_PACKAGE_MPD_WITH_HTTPD},) CONFIGURE_ARGS+= --enable-httpd-output else diff --git a/package/p5-image-scale/Makefile b/package/p5-image-scale/Makefile index c21edb1a3..a894e0182 100644 --- a/package/p5-image-scale/Makefile +++ b/package/p5-image-scale/Makefile @@ -25,8 +25,11 @@ include $(ADK_TOPDIR)/mk/perl.mk CONFIG_STYLE:= perl XAKE_FLAGS+= $(PERL_ENV) CONFIGURE_ARGS+= --with-jpeg-includes=${STAGING_TARGET_DIR}/usr/include \ + --with-jpeg-libs=${STAGING_TARGET_DIR}/usr/lib \ --with-png-includes=${STAGING_TARGET_DIR}/usr/include \ - --with-gif-includes=${STAGING_TARGET_DIR}/usr/include + --with-png-libs=${STAGING_TARGET_DIR}/usr/lib \ + --with-gif-includes=${STAGING_TARGET_DIR}/usr/include \ + --with-gif-libs=${STAGING_TARGET_DIR}/usr/lib \ p5-image-scale-install: $(INSTALL_DIR) $(IDIR_P5_IMAGE_SCALE)$(PERL_SITEDIR) diff --git a/package/p5-image-scale/patches/patch-src_png_c b/package/p5-image-scale/patches/patch-src_png_c new file mode 100644 index 000000000..a17a509c1 --- /dev/null +++ b/package/p5-image-scale/patches/patch-src_png_c @@ -0,0 +1,11 @@ +--- Image-Scale-0.08.orig/src/png.c 2011-07-11 10:03:28.000000000 -0500 ++++ Image-Scale-0.08/src/png.c 2014-10-06 15:07:14.824434687 -0500 +@@ -40,7 +40,7 @@ image_png_read_buf(png_structp png_ptr, + } + } + +- png_memcpy(data, buffer_ptr(im->buf), len); ++ memcpy(data, buffer_ptr(im->buf), len); + buffer_consume(im->buf, len); + + goto ok; diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile index c1f06c305..018d0524e 100644 --- a/package/tcpdump/Makefile +++ b/package/tcpdump/Makefile @@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= tcpdump PKG_VERSION:= 4.6.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= dab267ec30216a069747d10314079ec7 PKG_DESCR:= tool for network monitoring and data acquisition PKG_SECTION:= net/debug @@ -43,9 +43,6 @@ XAKE_FLAGS+= GCC_HONOUR_COPTS=s tcpdump-install: ${INSTALL_DIR} ${IDIR_TCPDUMP}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/usr/sbin/tcpdump ${IDIR_TCPDUMP}/usr/sbin/ -ifneq (${ADK_PACKAGE_TCPDUMP_WITH_CHROOT},) - ${INSTALL_DIR} ${IDIR_TCPDUMP}/var/lib/tcpdump -endif + ${INSTALL_BIN} ${WRKINST}/usr/sbin/tcpdump ${IDIR_TCPDUMP}/usr/sbin include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/ympd/patches/patch-CMakeLists_txt b/package/ympd/patches/patch-CMakeLists_txt index 779a5d26b..762e46601 100644 --- a/package/ympd/patches/patch-CMakeLists_txt +++ b/package/ympd/patches/patch-CMakeLists_txt @@ -1,5 +1,5 @@ --- ympd-1.2.2.orig/CMakeLists.txt 2014-09-28 13:39:27.000000000 +0200 -+++ ympd-1.2.2/CMakeLists.txt 2014-09-28 16:12:53.000000000 +0200 ++++ ympd-1.2.2/CMakeLists.txt 2014-10-05 00:46:09.000000000 +0200 @@ -16,9 +16,6 @@ include_directories(${PROJECT_BINARY_DIR include(CheckCSourceCompiles) @@ -10,7 +10,7 @@ file(GLOB RESOURCES RELATIVE ${PROJECT_SOURCE_DIR} htdocs/js/* -@@ -28,11 +25,11 @@ file(GLOB RESOURCES +@@ -28,11 +25,11 @@ file(GLOB RESOURCES htdocs/index.html ) diff --git a/package/ympd/patches/patch-htdocs_mkdata_c b/package/ympd/patches/patch-htdocs_mkdata_c new file mode 100644 index 000000000..e285e5dc3 --- /dev/null +++ b/package/ympd/patches/patch-htdocs_mkdata_c @@ -0,0 +1,35 @@ +--- ympd-1.2.2.orig/htdocs/mkdata.c 2014-09-28 13:39:27.000000000 +0200 ++++ ympd-1.2.2/htdocs/mkdata.c 2014-10-05 08:52:52.000000000 +0200 +@@ -7,7 +7,6 @@ + + #include <stdlib.h> + #include <stdio.h> +-#include <error.h> + #include <errno.h> + #include <string.h> + +@@ -58,16 +57,20 @@ int main(int argc, char *argv[]) + int i, j, buf; + FILE *fd; + +- if(argc <= 1) +- error(EXIT_FAILURE, 0, "Usage: ./%s <this_file> <file1> [file2, ...] > embedded_data.c", argv[0]); ++ if(argc <= 1) { ++ printf("Usage: ./%s <this_file> <file1> [file2, ...] > embedded_data.c", argv[0]); ++ exit(EXIT_FAILURE); ++ } + + for(i = 1; i < argc; i++) + { + printf("static const unsigned char v%d[] = {", i); + + fd = fopen(argv[i], "r"); +- if(!fd) +- error(EXIT_FAILURE, errno, "Failed open file %s", argv[i]); ++ if(!fd) { ++ printf("Failed open file %s", argv[i]); ++ exit(EXIT_FAILURE); ++ } + + j = 0; + while((buf = fgetc(fd)) != EOF) diff --git a/scripts/install.sh b/scripts/install.sh index 47acc20f4..66553de6b 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -474,21 +474,21 @@ partuuid=$(dd if="$T/firsttrack" bs=1 count=4 skip=$((0x1B8)) 2>/dev/null | \ (( quiet )) || print Cleaning out partitions... (( datafssz )) && dd if=/dev/zero of="$tgt" bs=1048576 count=1 \ - seek=$((cyls - cfgfs - datafssz)) -dd if=/dev/zero bs=1048576 of="$tgt" count=1 seek=$((spartofs / 2048)) + seek=$((cyls - cfgfs - datafssz)) > /dev/null 2>&1 +dd if=/dev/zero bs=1048576 of="$tgt" count=1 seek=$((spartofs / 2048)) > /dev/null 2>&1 (( quiet )) || if (( grub )); then print Writing MBR and GRUB2 to target device... system PARTUUID=$partuuid else print Writing MBR to target device... system PARTUUID=$partuuid fi -dd if="$T/firsttrack" of="$tgt" +dd if="$T/firsttrack" of="$tgt" > /dev/null 2>&1 case $target { (solidrun-imx6) fwdir=$(dirname "$src") - dd if="$fwdir/SPL" of="$tgt" bs=1024 seek=1 - dd if="$fwdir/u-boot.img" of="$tgt" bs=1024 seek=42 + dd if="$fwdir/SPL" of="$tgt" bs=1024 seek=1 > /dev/null 2>&1 + dd if="$fwdir/u-boot.img" of="$tgt" bs=1024 seek=42 > /dev/null 2>&1 ;; (raspberry-pi) (( quiet )) || print "Creating filesystem on ${bootpart}..." diff --git a/target/arm/raspberry-pi/patches/3.16.2/raspberry-pi.patch b/target/arm/raspberry-pi/patches/3.16.2/raspberry-pi.patch index a22683a31..eca3a9639 100644 --- a/target/arm/raspberry-pi/patches/3.16.2/raspberry-pi.patch +++ b/target/arm/raspberry-pi/patches/3.16.2/raspberry-pi.patch @@ -110217,19 +110217,6 @@ diff -Nur linux-3.16.2/sound/soc/codecs/Kconfig linux-3.16-rpi/sound/soc/codecs/ select SND_SOC_RT5631 if I2C select SND_SOC_RT5640 if I2C select SND_SOC_RT5645 if I2C -@@ -428,12 +429,6 @@ - config SND_SOC_PCM512x - tristate - --config SND_SOC_PCM512x_I2C -- tristate "Texas Instruments PCM512x CODECs - I2C" -- depends on I2C -- select SND_SOC_PCM512x -- select REGMAP_I2C -- - config SND_SOC_PCM512x_SPI - tristate "Texas Instruments PCM512x CODECs - SPI" - depends on SPI_MASTER @@ -449,6 +444,12 @@ default m if SND_SOC_RT5645=m default m if SND_SOC_RT5651=m diff --git a/target/arm/systems/raspberry-pi b/target/arm/systems/raspberry-pi index 45fd531d3..c0f375f68 100644 --- a/target/arm/systems/raspberry-pi +++ b/target/arm/systems/raspberry-pi @@ -12,6 +12,8 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_INPUT select ADK_TARGET_WITH_SD + select ADK_TARGET_WITH_I2C + select ADK_TARGET_WITH_SPI select ADK_PACKAGE_BCM2835_BOOTLOADER select ADK_TARGET_WITH_ROOT_RW select ADK_TARGET_KERNEL_ZIMAGE diff --git a/target/collections/mpd b/target/collections/mpd index be6ccf680..456386e8b 100644 --- a/target/collections/mpd +++ b/target/collections/mpd @@ -20,6 +20,7 @@ config ADK_PKG_MPD select ADK_PACKAGE_MPD_WITH_SHOUT select ADK_PACKAGE_MPD_WITH_CURL select ADK_PACKAGE_MPD_WITH_SAMPLERATE + select ADK_PACKAGE_MPD_WITH_SNDFILE select ADK_PACKAGE_MPD_WITH_HTTPD select ADK_PACKAGE_FILE select ADK_PACKAGE_HTOP diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 207bcc0c1..6b7ee495b 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -349,6 +349,29 @@ config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_GW endmenu +choice +prompt "WLAN Security" +depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_STATIC || ADK_SIMPLE_NETWORK_CONFIG_WLAN0_DHCP +default ADK_SIMPLE_NETWORK_CONFIG_WLAN0_NOSEC + +config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_NOSEC + bool "No security" + +config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2 + bool "WPA2" + +endchoice + +config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2_SSID + depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2 + string "SSID" + default "" + +config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2_PW + depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2 + string "Password" + default "" + menu "eth1 Configuration" depends on ADK_SIMPLE_NETWORK_CONFIG && \ ADK_TARGET_SYSTEM_MIKROTIK_RB532 diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain index 3a5d98cf1..16c075212 100644 --- a/target/config/Config.in.toolchain +++ b/target/config/Config.in.toolchain @@ -74,7 +74,9 @@ config ADK_TOOLCHAIN_BINUTILS_2_20_1 config ADK_TOOLCHAIN_BINUTILS_2_22 prompt "2.22" boolean - depends on ADK_LINUX_BFIN || ADK_LINUX_CRIS + depends on ADK_LINUX_BFIN \ + || ADK_LINUX_CRIS \ + || ADK_LINUX_M68K config ADK_TOOLCHAIN_BINUTILS_2_23_ARC prompt "2.23-arc" @@ -88,6 +90,7 @@ config ADK_TOOLCHAIN_BINUTILS_2_24 depends on !ADK_LINUX_ARC depends on !ADK_LINUX_AVR32 depends on !ADK_LINUX_CRIS + depends on !ADK_LINUX_M68K config ADK_TOOLCHAIN_BINUTILS_GIT prompt "git" @@ -97,6 +100,7 @@ config ADK_TOOLCHAIN_BINUTILS_GIT depends on !ADK_LINUX_ARC depends on !ADK_LINUX_AVR32 depends on !ADK_LINUX_CRIS + depends on !ADK_LINUX_M68K endchoice diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index d354ba0d3..f9bea1260 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -81,6 +81,10 @@ config ADK_KERNEL_SND_SOC_PCM5102A boolean select ADK_KERNEL_SND_SOC_I2C_AND_SPI +config ADK_KERNEL_SND_SOC_PCM512x_I2C + boolean + select ADK_KERNEL_SND_SOC_I2C_AND_SPI + config ADK_KERNEL_SND_PCM_DMAENGINE boolean @@ -165,7 +169,6 @@ config ADK_KERNEL_SND_BCM2708_SOC_I2S select ADK_KERNEL_SND_DMAENGINE_PCM select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM select ADK_KERNEL_REGMAP_MMIO - select ADK_KERNEL_SND_SOC_PCM5102A depends on ADK_TARGET_SYSTEM_RASPBERRY_PI default n @@ -174,8 +177,8 @@ config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DAC boolean select ADK_KERNEL_DMA_BCM2708 select ADK_KERNEL_SND_BCM2708_SOC_I2S + select ADK_KERNEL_SND_SOC_PCM5102A depends on ADK_TARGET_SYSTEM_RASPBERRY_PI - default y if ADK_PKG_MPDBOX default n config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI @@ -193,7 +196,6 @@ config ADK_KERNEL_SND_BCM2708_SOC_RPI_DAC select ADK_KERNEL_DMA_BCM2708 select ADK_KERNEL_SND_BCM2708_SOC_I2S depends on ADK_TARGET_SYSTEM_RASPBERRY_PI - default y if ADK_PKG_MPDBOX default n config ADK_KERNEL_SND_BCM2708_SOC_IQAUDIO_DAC @@ -201,8 +203,8 @@ config ADK_KERNEL_SND_BCM2708_SOC_IQAUDIO_DAC boolean select ADK_KERNEL_DMA_BCM2708 select ADK_KERNEL_SND_BCM2708_SOC_I2S + select ADK_KERNEL_SND_SOC_PCM512x_I2C depends on ADK_TARGET_SYSTEM_RASPBERRY_PI - default y if ADK_PKG_MPDBOX default n config ADK_KERNEL_SND_IMX_SOC diff --git a/target/linux/config/Config.in.i2c b/target/linux/config/Config.in.i2c index bc4da73f6..83ef3a1fa 100644 --- a/target/linux/config/Config.in.i2c +++ b/target/linux/config/Config.in.i2c @@ -7,13 +7,25 @@ config ADK_KERNEL_I2C config ADK_KERNEL_I2C_CHARDEV tristate +config ADK_KERNEL_I2C_BCM2835 + prompt "I2C driver for Raspberry PI" + tristate + select ADK_KERNEL_I2C + select ADK_KERNEL_REGMAP_I2C + select ADK_KERNEL_I2C_CHARDEV + depends on ADK_TARGET_SYSTEM_RASPBERRY_PI + default y if ADK_TARGET_SYSTEM_RASPBERRY_PI + default n + help + I2C driver for Raspberry PI. + config ADK_KERNEL_I2C_IMX - prompt "I2C driver for IMX6" + prompt "I2C driver for Solidrun IMX6" tristate - depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 select ADK_KERNEL_I2C select ADK_KERNEL_REGMAP_I2C select ADK_KERNEL_I2C_CHARDEV + depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default n help diff --git a/target/linux/config/Config.in.spi b/target/linux/config/Config.in.spi index 12637f9cb..9a6e6e337 100644 --- a/target/linux/config/Config.in.spi +++ b/target/linux/config/Config.in.spi @@ -26,12 +26,23 @@ config ADK_KERNEL_SPI_PXA2XX tristate select ADK_KERNEL_SPI +config ADK_KERNEL_SPI_BCM2835 + prompt "SPI driver for Raspberry PI" + tristate + select ADK_KERNEL_SPI + select ADK_KERNEL_SPI_MASTER + select ADK_KERNEL_SPI_BITBANG + depends on ADK_TARGET_SYSTEM_RASPBERRY_PI + default y if ADK_TARGET_SYSTEM_RASPBERRY_PI + default n + config ADK_KERNEL_SPI_IMX - prompt "SPI driver for Solidrun Cubox-i/Hummingboard" + prompt "SPI driver for Solidrun IMX6" tristate select ADK_KERNEL_SPI select ADK_KERNEL_SPI_MASTER select ADK_KERNEL_SPI_BITBANG + depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default n diff --git a/toolchain/binutils/Makefile.inc b/toolchain/binutils/Makefile.inc index 464f959cb..8e1392bed 100644 --- a/toolchain/binutils/Makefile.inc +++ b/toolchain/binutils/Makefile.inc @@ -4,8 +4,8 @@ PKG_NAME:= binutils ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_24),y) PKG_VERSION:= 2.24 -PKG_MD5SUM:= a5dd5dd2d212a282cc1d4a84633e0d88 PKG_RELEASE:= 1 +PKG_MD5SUM:= a5dd5dd2d212a282cc1d4a84633e0d88 PKG_SITES:= ${MASTER_SITE_GNU:=binutils/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz endif @@ -13,22 +13,28 @@ ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_23_ARC),y) # git commit afcd0783a37c73e09439737a11e0b3183746a652 # https://github.com/foss-for-synopsys-dwc-arc-processors/binutils-gdb/tree/arc-2.23-tls PKG_VERSION:= 2.23 -PKG_MD5SUM:= a5dd5dd2d212a282cc1d4a84633e0d88 PKG_RELEASE:= 1 +PKG_MD5SUM:= a5dd5dd2d212a282cc1d4a84633e0d88 PKG_SITES:= http://www.openadk.org/distfiles/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-arc.tar.xz endif ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_22),y) PKG_VERSION:= 2.22 -PKG_MD5SUM:= a5dd5dd2d212a282cc1d4a84633e0d88 PKG_RELEASE:= 1 +PKG_MD5SUM:= a5dd5dd2d212a282cc1d4a84633e0d88 PKG_SITES:= ${MASTER_SITE_GNU:=binutils/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz endif ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_20_1),y) PKG_VERSION:= 2.20.1 -PKG_MD5SUM:= a5dd5dd2d212a282cc1d4a84633e0d88 PKG_RELEASE:= 1 +PKG_MD5SUM:= a5dd5dd2d212a282cc1d4a84633e0d88 PKG_SITES:= ${MASTER_SITE_GNU:=binutils/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz endif +ifeq ($(ADK_TOOLCHAIN_BINUTILS_GIT),y) +PKG_VERSION:= git +PKG_RELEASE:= 1 +PKG_REPO:= git://sourceware.org/git/binutils-gdb.git +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz +endif diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 39fc3efc9..dc59bfd35 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -282,9 +282,11 @@ ifeq ($(ADK_TARGET_USE_GOLD),y) (cd $(TOOLCHAIN_DIR)/usr/bin && \ ln -sf $(GNU_TARGET_NAME)-ld.gold $(GNU_TARGET_NAME)-ld) else +ifeq (ADK_TOOLCHAIN_BINUTILS_2_20_1),) (cd $(TOOLCHAIN_DIR)/usr/bin && \ ln -sf $(GNU_TARGET_NAME)-ld.bfd $(GNU_TARGET_NAME)-ld) endif +endif cd $(STAGING_TARGET_DIR)/lib && \ ln -sf libstdc++.so.6.0.$(LIBSTDCXXVER) libstdc++.so && \ ln -sf libstdc++.so.6.0.$(LIBSTDCXXVER) libstdc++.so.6 diff --git a/toolchain/uclibc/Makefile.inc b/toolchain/uclibc/Makefile.inc index c58903290..2b043758a 100644 --- a/toolchain/uclibc/Makefile.inc +++ b/toolchain/uclibc/Makefile.inc @@ -3,13 +3,13 @@ PKG_NAME:= uClibc ifeq ($(ADK_LIBC_VERSION),git) -PKG_VERSION:= 0.9.34-git -PKG_REPO:= git://git.uclibc.org/uClibc.git +PKG_VERSION:= 0.9.34-git +PKG_RELEASE:= 1 +PKG_REPO:= git://git.uclibc.org/uClibc.git else -PKG_VERSION:= $(ADK_LIBC_VERSION) -PKG_SITES:= http://downloads.uclibc-ng.org/ -endif +PKG_VERSION:= $(ADK_LIBC_VERSION) PKG_RELEASE:= 1 -PKG_MD5SUM:= 73e6fe215648d02246f4d195b25fb17e PKG_SITES:= http://uclibc.org/downloads/ +endif +PKG_MD5SUM:= 73e6fe215648d02246f4d195b25fb17e DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.xz |