Merge branch 'master' of git+ssh://openadk.org/git/openadk

8 files changed, 20 insertions, 46 deletions

diff --git a/package/bcm28xx-bootloader/Makefile b/package/bcm28xx-bootloader/Makefile
index d966ade15..258855bce 100644
--- a/package/bcm28xx-bootloader/Makefile
+++ b/package/bcm28xx-bootloader/Makefile
@@ -67,23 +67,6 @@ ifeq ($(ADK_TARGET_SYSTEM_RASPBERRRY_PI),y)
 	printf "gpu_mem=$(ADK_TARGET_GPU_MEM)\n" >> \
 		$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
 endif
-ifeq ($(ADK_KERNEL_BCM2709_DT),y)
-	printf "device_tree=bcm2709-rpi-2-b.dtb\n" >> \
-		$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
-endif
-ifeq ($(ADK_KERNEL_BCM2708_DT),y)
-	printf "device_tree=bcm2708-rpi-b.dtb\n" >> \
-		$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
-endif
-ifneq ($(ADK_KERNEL_BCM2708_DT)$(ADK_KERNEL_BCM2709_DT),)
-	printf "device_tree_address=0x100\n" >> \
-		$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
-	printf "kernel_address=0x8000\n" >> \
-		$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
-	printf "disable_commandline_tags=2\n" >> \
-		$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
-	printf "dtparam=i2s=on,spi=on,i2c_arm=on,i2c_vc=on\n" >> \
-		$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
 ifneq ($(ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_AMP),)
 	printf "dtoverlay=hifiberry-amp\n" >> \
 		$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
@@ -108,10 +91,6 @@ ifneq ($(ADK_KERNEL_SND_BCM2708_SOC_RPI_PROTO),)
 	printf "dtoverlay=rpi-proto\n" >> \
 		$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
 endif
-else
-	printf "device_tree=\n" >> \
-		$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
-endif
 ifeq ($(ADK_PACKAGE_BCM28XX_DEBUGTOOL),y)
 	$(INSTALL_DIR) $(IDIR_BCM28XX_DEBUGTOOL)/opt/vc/bin
 	$(INSTALL_BIN) $(WRKBUILD)/hardfp/opt/vc/bin/vcdbg \
diff --git a/package/curl/Makefile b/package/curl/Makefile
index 055e8ff11..4482fc22b 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		curl
 PKG_VERSION:=		7.41.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		58c9f7cb1be9c26e6a2fd9326c14e054780dc4bb74b590a1d47fb3788a31535d
 PKG_DESCR:=		client-side url transfer tool
 PKG_SECTION:=		net/http
@@ -26,7 +26,7 @@ PKGSS_LIBCURL:=		zlib
 PKG_FLAVOURS_CURL:=	WITH_IPV6
 PKGFD_WITH_IPV6:=	enable ipv6 support
 
-PKG_CHOICES_LIBCURL:=	WITHOUT_SSL WITH_GNUTLS WITH_OPENSSL WITH_CYASSL
+PKG_CHOICES_LIBCURL:=	WITHOUT_SSL WITH_GNUTLS WITH_OPENSSL WITH_WOLFSSL
 PKGCD_WITHOUT_SSL:=	use no ssl
 PKGCD_WITH_OPENSSL:=	use openssl for crypto
 PKGCS_WITH_OPENSSL:=	libopenssl ca-certificates libgmp
@@ -34,9 +34,9 @@ PKGCB_WITH_OPENSSL:=	openssl
 PKGCD_WITH_GNUTLS:=	use gnutls for crypto
 PKGCS_WITH_GNUTLS:=	libgnutls ca-certificates libgmp
 PKGCB_WITH_GNUTLS:=	gnutls
-PKGCD_WITH_CYASSL:=	use cyassl for crypto
-PKGCS_WITH_CYASSL:=	cyassl ca-certificates
-PKGCB_WITH_CYASSL:=	cyassl
+PKGCD_WITH_WOLFSSL:=	use wolfssl for crypto
+PKGCS_WITH_WOLFSSL:=	wolfssl ca-certificates
+PKGCB_WITH_WOLFSSL:=	wolfssl
 
 include ${ADK_TOPDIR}/mk/package.mk
 
@@ -58,7 +58,7 @@ CONFIGURE_ARGS+=	--with-gnutls="${STAGING_TARGET_DIR}/usr" \
 			--without-ssl \
 			--without-axtls
 endif
-ifeq (${ADK_PACKAGE_LIBCURL_WITH_CYASSL},y)
+ifeq (${ADK_PACKAGE_LIBCURL_WITH_WOLFSSL},y)
 CONFIGURE_ARGS+=	--with-cyassl="${STAGING_TARGET_DIR}/usr" \
 			--without-ssl \
 			--without-gnutls \
diff --git a/target/arm/Makefile b/target/arm/Makefile
index 479ab738e..0e7441090 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -99,19 +99,15 @@ endif
 kernel-strip:
 	@cp $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
-ifeq ($(ADK_KERNEL_BCM2708_DT),y)
 	@echo adding DT trailer to kernel $(MAKE_TRACE)
 	-rm $(BUILD_DIR)/$(TARGET_KERNEL)
 	$(ADK_TOPDIR)/scripts/mkknlimg --dtok $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) $(MAKE_TRACE)
 endif
-endif
 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI2),y)
-ifeq ($(ADK_KERNEL_BCM2709_DT),y)
 	@echo adding DT trailer to kernel $(MAKE_TRACE)
 	-rm $(BUILD_DIR)/$(TARGET_KERNEL)
 	$(ADK_TOPDIR)/scripts/mkknlimg --dtok $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) $(MAKE_TRACE)
 endif
-endif
 
 kernel-install: kernel-strip
 	@cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
diff --git a/target/arm/kernel/raspberry-pi b/target/arm/kernel/raspberry-pi
index 0399d9bcc..d3f74f8af 100644
--- a/target/arm/kernel/raspberry-pi
+++ b/target/arm/kernel/raspberry-pi
@@ -10,6 +10,7 @@ CONFIG_MACH_BCM2708=y
 CONFIG_BCM2708_VCMEM=y
 CONFIG_BCM2708_DMAER=y
 CONFIG_BCM2708_VCHIQ=y
+CONFIG_BCM2708_DT=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
diff --git a/target/arm/kernel/raspberry-pi2 b/target/arm/kernel/raspberry-pi2
index 767a675c3..67eb76e87 100644
--- a/target/arm/kernel/raspberry-pi2
+++ b/target/arm/kernel/raspberry-pi2
@@ -1,9 +1,17 @@
 CONFIG_ARM=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
+CONFIG_PHYS_OFFSET=0
 CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_BCM2709=y
 CONFIG_MACH_BCM2709=y
+CONFIG_BCM2709_DT=y
 CONFIG_HAVE_ARM_ARCH_TIMER=y
 CONFIG_FIQ=y
+CONFIG_BCM2708_VCMEM=y
+CONFIG_BCM2708_NOL2CACHE=y
+CONFIG_BCM2708_VCHIQ=y
+CONFIG_USE_OF=y
+CONFIG_ATAGS=y
+CONFIG_KUSER_HELPERS=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_CMDLINE_FROM_BOOTLOADER=y
diff --git a/target/config/Config.in.kernelversion.choice b/target/config/Config.in.kernelversion.choice
index 1d5224aac..4a85f50a3 100644
--- a/target/config/Config.in.kernelversion.choice
+++ b/target/config/Config.in.kernelversion.choice
@@ -35,6 +35,8 @@ config ADK_KERNEL_VERSION_3_12_38
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
 	depends on !ADK_TARGET_ARCH_NIOS2
 	depends on !ADK_TARGET_SYSTEM_QEMU_SPARC
+	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
 	select ADK_KERNEL_VERSION_3_12
 
 config ADK_KERNEL_VERSION_3_10_71
diff --git a/target/linux/config/Config.in.dma b/target/linux/config/Config.in.dma
index c3038289d..144fb2d2d 100644
--- a/target/linux/config/Config.in.dma
+++ b/target/linux/config/Config.in.dma
@@ -23,11 +23,11 @@ config ADK_KERNEL_BCM_VC_CMA
 config ADK_KERNEL_DMA_BCM2708
         bool
         select ADK_KERNEL_DMADEVICES
-	select ADK_KERNEL_BCM_VC_SM
-	select ADK_KERNEL_BCM_VC_CMA
 	select ADK_KERNEL_CMA
 	select ADK_KERNEL_CMA_SIZE_SEL_MBYTES
 	select ADK_KERNEL_DMA_CMA
+	select ADK_KERNEL_BCM_VC_SM
+	select ADK_KERNEL_BCM_VC_CMA
 	depends on ADK_TARGET_BOARD_BCM28XX
 	default y if ADK_TARGET_BOARD_BCM28XX
 	default n
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index 95904d9af..296dba2fc 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -227,18 +227,6 @@ config ADK_KERNEL_HIGHMEM
 	help
 	  Enable high memory support.
 
-config ADK_KERNEL_BCM2708_DT
-	bool
-	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
-	depends on ADK_KERNEL_VERSION_3_18
-	default y
-
-config ADK_KERNEL_BCM2709_DT
-	bool
-	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI2
-	depends on ADK_KERNEL_VERSION_3_18
-	default y
-
 config ADK_KERNEL_CC_OPTIMIZE_FOR_SIZE
 	bool "Optimize for size"
 	# does not boot in qemu-microblaze