Browse Source

update realtek-firmware, set EXTRA_FIRMWARE_DIR directory

Waldemar Brodkorb 1 month ago
parent
commit
0c4f1def52

+ 4 - 2
package/realtek-firmware/Makefile

@@ -4,13 +4,15 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		realtek-firmware
-PKG_VERSION:=		1.1
+PKG_VERSION:=		1.2
 PKG_RELEASE:=		1
-PKG_HASH:=		df7a02fd10fb83d11f4015bf55f58644c6ecc7528f884f2f32729b727053840a
+PKG_HASH:=		a06e7834f15ee4c6cd0c205f61c9667023c0a195ec182a7700877ea90bbaa142
 PKG_DESCR:=		firmware for realtek wired and wireless cards
 PKG_SECTION:=		sys/firmware
 PKG_SITES:=		http://distfiles.openadk.org/
 
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
+
 PKG_SUBPKGS:=		REALTEK_FIRMWARE_WIRELESS REALTEK_FIRMWARE_WIRED
 
 include ${ADK_TOPDIR}/mk/package.mk

+ 4 - 0
target/linux/config/Config.in.misc

@@ -24,6 +24,10 @@ config ADK_LINUX_KERNEL_EXTRA_FIRMWARE
 	default "usb8388.bin" if ADK_TARGET_SYSTEM_OLPC_XO_1
 	default ""
 
+config ADK_LINUX_KERNEL_EXTRA_FIRMWARE_DIR
+	string 
+	default "firmware"
+
 config ADK_LINUX_KERNEL_FW_LOADER_USER_HELPER
 	bool
 

+ 5 - 4
toolchain/linux-headers/Makefile

@@ -14,10 +14,11 @@ include $(ADK_TOPDIR)/mk/kernel-vars.mk
 
 $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_FILE_VER)/.patched:
 ifeq ($(ADK_TARGET_SYSTEM_PCENGINES_APU),y)
-ifeq ($(ADK_KERNEL_ROOT_NFS),y)
-	cd $(DL_DIR) && wget http://distfiles.openadk.org/realtek-firmware-1.1.tar.xz
-	tar xf $(DL_DIR)/realtek-firmware-1.1.tar.xz \
-		--strip-components=2 -C $(WRKSRC)/firmware realtek-firmware-1.1
+ifeq ($(ADK_TARGET_ROOTFS_NFSROOT),y)
+	cd $(DL_DIR) && wget https://distfiles.openadk.org/realtek-firmware-1.2.tar.gz
+	mkdir -p $(WRKSRC)/firmware
+	tar xf $(DL_DIR)/realtek-firmware-1.2.tar.gz \
+		--strip-components=2 -C $(WRKSRC)/firmware realtek-firmware-1.2
 endif
 endif
 ifeq ($(ADK_TARGET_ARCH_XTENSA),y)