diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-04-06 16:11:11 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-04-06 16:11:11 +0200 |
| commit | c2586b3ee4f5bb508374513bd28573ca1b49c404 (patch) | |
| tree | fdbdcfd1497811a402607e869749fe3ec886209f /package | |
| parent | 82a266c21bdd3fd746fc862654abd131f74c2f51 (diff) | |
| parent | 1554c2ef3adde4cc08d1bec75ea65a0bd3688239 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
| -rw-r--r-- | package/bcm28xx-bootloader/Makefile | 21 | ||||
| -rw-r--r-- | package/curl/Makefile | 12 |
2 files changed, 6 insertions, 27 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 \ |