Просмотр исходного кода

avr32: add openssl-legacy for u-boot mkimage

Waldemar Brodkorb 4 дней назад
Родитель
Сommit
cfc2afad13

+ 39 - 0
package/openssl-legacy/Makefile

@@ -0,0 +1,39 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		openssl-legacy
+PKG_VERSION:=		1.0.2u
+PKG_RELEASE:=		1
+PKG_HASH:=		ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16
+PKG_DESCR:=		ssl/tls library (legacy)
+PKG_SECTION:=		libs/crypto
+PKG_URL:=		https://openssl-library.org/
+PKG_SITES:=		https://github.com/openssl/openssl/releases/download/OpenSSL_1_0_2u/
+
+DISTFILES:=             openssl-$(PKG_VERSION).tar.gz
+WRKDIST=		$(WRKDIR)/openssl-$(PKG_VERSION)
+
+PKG_CFLINE_OPENSSL_LEGACY:=	depends on ADK_HOST_ONLY
+
+include $(ADK_TOPDIR)/mk/host.mk
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,OPENSSL_LEGACY,openssl-legacy,${PKG_VERSION}-${PKG_RELEASE}))
+
+HOST_STYLE:=		manual
+INSTALL_TARGET:=	install_sw
+FAKE_FLAGS+=		INSTALL_PREFIX=${WRKINST}
+
+host-configure:
+	(cd $(WRKBUILD); ./config --prefix='$(STAGING_HOST_DIR)/usr' -fPIC -ldl no-tests)
+
+host-build:
+	(cd $(WRKBUILD); $(MAKE))
+
+openssl-legacy-hostinstall:
+	(cd $(WRKBUILD); $(MAKE) install)
+
+include $(ADK_TOPDIR)/mk/host-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

+ 4 - 3
package/u-boot-avr32/Makefile

@@ -9,12 +9,13 @@ PKG_RELEASE:=		1
 PKG_HASH:=		c8373949d7f0de1059e507b83a655d4cea539f75dc66ccdbb27adbd38d83095e
 PKG_HASH:=		c8373949d7f0de1059e507b83a655d4cea539f75dc66ccdbb27adbd38d83095e
 PKG_DESCR:=		portable bootloader
 PKG_DESCR:=		portable bootloader
 PKG_SECTION:=		base/boot
 PKG_SECTION:=		base/boot
-HOST_BUILDDEP:=		gnutls-host openssl-host dtc-host
+HOST_BUILDDEP:=		gnutls-host openssl-legacy-host dtc-host
 PKG_BUILDDEP:=		u-boot-avr32-host
 PKG_BUILDDEP:=		u-boot-avr32-host
 PKG_URL:=		http://www.denx.de/wiki/U-Boot	
 PKG_URL:=		http://www.denx.de/wiki/U-Boot	
 PKG_SITES:=		ftp://ftp.denx.de/pub/u-boot/
 PKG_SITES:=		ftp://ftp.denx.de/pub/u-boot/
 
 
 DISTFILES:=		u-boot-$(PKG_VERSION).tar.bz2
 DISTFILES:=		u-boot-$(PKG_VERSION).tar.bz2
+WRKDIST=		$(WRKDIR)/u-boot-$(PKG_VERSION)
 
 
 PKG_SYSTEM_DEPENDS:=	atmel-ngw100
 PKG_SYSTEM_DEPENDS:=	atmel-ngw100
 
 
@@ -42,7 +43,7 @@ host-build:
 	(cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \
 	(cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \
 		$(HOST_MAKE_FLAGS) tools $(MAKE_TRACE) )
 		$(HOST_MAKE_FLAGS) tools $(MAKE_TRACE) )
 
 
-u-boot-hostinstall:
+u-boot-avr32-hostinstall:
 	$(INSTALL_BIN) $(WRKBUILD)/tools/mk{,env}image \
 	$(INSTALL_BIN) $(WRKBUILD)/tools/mk{,env}image \
 		$(STAGING_HOST_DIR)/usr/bin
 		$(STAGING_HOST_DIR)/usr/bin
 
 
@@ -59,7 +60,7 @@ do-build:
 		CROSS_COMPILE='$(TARGET_CROSS)' \
 		CROSS_COMPILE='$(TARGET_CROSS)' \
 		$(MAKE) env)
 		$(MAKE) env)
 
 
-u-boot-install:
+u-boot-avr32-install:
 	$(CP) $(WRKBUILD)/$(UBOOT) $(FW_DIR)
 	$(CP) $(WRKBUILD)/$(UBOOT) $(FW_DIR)
 	$(INSTALL_DIR) $(IDIR_U_BOOT)/etc
 	$(INSTALL_DIR) $(IDIR_U_BOOT)/etc
 	$(CP) ./files/fw_env.config $(IDIR_U_BOOT)/etc
 	$(CP) ./files/fw_env.config $(IDIR_U_BOOT)/etc

+ 1 - 1
target/avr32/systems/atmel-ngw100

@@ -9,7 +9,7 @@ config ADK_TARGET_SYSTEM_ATMEL_NGW100
 	select ADK_TARGET_WITH_SD
 	select ADK_TARGET_WITH_SD
 	select ADK_TARGET_KERNEL_UIMAGE
 	select ADK_TARGET_KERNEL_UIMAGE
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
-	select ADK_HOST_BUILD_U_BOOT
+	select ADK_HOST_BUILD_U_BOOT_AVR32
 	help
 	help
 	  Atmel NGW100
 	  Atmel NGW100
 
 

+ 8 - 4
target/config/Config.in.tools

@@ -41,7 +41,7 @@ config ADK_HOST_BUILD_LIBTOOL
 
 
 config ADK_HOST_BUILD_OPENSSL
 config ADK_HOST_BUILD_OPENSSL
 	bool
 	bool
-	default y
+	default y if !ADK_TARGET_ARCH_AVR32
 
 
 config ADK_HOST_BUILD_PKGCONF
 config ADK_HOST_BUILD_PKGCONF
 	bool
 	bool
@@ -89,12 +89,10 @@ config ADK_HOST_BUILD_FINDUTILS
 
 
 config ADK_HOST_BUILD_GAWK
 config ADK_HOST_BUILD_GAWK
 	bool
 	bool
-	default y if ADK_HOST_DARWIN
 	default n
 	default n
 
 
 config ADK_HOST_BUILD_OBJCONV
 config ADK_HOST_BUILD_OBJCONV
 	bool
 	bool
-	default y if ADK_HOST_DARWIN
 	default n
 	default n
 
 
 config ADK_HOST_BUILD_GREP
 config ADK_HOST_BUILD_GREP
@@ -103,7 +101,13 @@ config ADK_HOST_BUILD_GREP
 
 
 config ADK_HOST_BUILD_U_BOOT
 config ADK_HOST_BUILD_U_BOOT
 	bool
 	bool
-	depends on !ADK_TARGET_ARCH_H8300
+	depends on !ADK_TARGET_ARCH_H8300 && !ADK_TARGET_ARCH_AVR32
+	default y if ADK_HOST_NEED_UBOOT
+	default n
+
+config ADK_HOST_BUILD_U_BOOT_AVR32
+	bool
+	depends on ADK_TARGET_ARCH_AVR32
 	default y if ADK_HOST_NEED_UBOOT
 	default y if ADK_HOST_NEED_UBOOT
 	default n
 	default n