ソースを参照

make nfsroot for apu hopefully working

Waldemar Brodkorb 10 年 前
コミット
57c805ae0a

+ 0 - 1
target/config/Config.in.target

@@ -151,7 +151,6 @@ config ADK_TARGET_ROOTFS_NFSROOT
 	select ADK_PACKAGE_ADKINSTALL
 	depends on !ADK_TARGET_QEMU && !ADK_TARGET_VBOX && !ADK_TARGET_SYSTEM_ARANYM_M68K
 	depends on !ADK_TARGET_SYSTEM_ARM_FM
-	depends on !ADK_TARGET_SYSTEM_PCENGINES_APU
 	help
 	  Root filesystem mounted via NFS. (DHCP)
 

+ 2 - 1
target/linux/config/Config.in.misc

@@ -1,10 +1,11 @@
 config ADK_KERNEL_FIRMWARE_IN_KERNEL
 	boolean 
+	default y if ADK_KERNEL_R8169 && ADK_KERNEL_ROOT_NFS
 	default n
 
 config ADK_KERNEL_EXTRA_FIRMWARE
 	string
-	default "rtl_nic/rtl8168e-2.fw" if ADK_KERNEL_R8169 && ADK_KERNEL_ROOT_NFS
+	default "rtl8168e-2.fw" if ADK_KERNEL_R8169 && ADK_KERNEL_ROOT_NFS
 	default ""
 
 config ADK_KERNEL_FW_LOADER_USER_HELPER

+ 1 - 1
toolchain/kernel-headers/Makefile

@@ -11,7 +11,7 @@ include ${ADK_TOPDIR}/mk/buildhlp.mk
 $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched:
 ifeq ($(ADK_KERNEL_ROOT_NFS),y)
 	tar xf $(DL_DIR)/realtek-firmware-1.1.tar.xz \
-		--strip-components=1 -C $(WRKSRC) realtek-firmware-1.1
+		--strip-components=2 -C $(WRKSRC)/firmware realtek-firmware-1.1
 endif
 ifeq ($(ADK_LINUX_XTENSA),y)
 	tar xf $(ADK_TOPDIR)/target/xtensa/overlay/xtensa_dc232b.tar \