diff options
| -rw-r--r-- | target/config/Config.in.target | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.misc | 3 | ||||
| -rw-r--r-- | toolchain/kernel-headers/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/target/config/Config.in.target b/target/config/Config.in.target index 1e4e5d178..afe4e55ce 100644 --- a/target/config/Config.in.target +++ b/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) diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index 42d9e7a57..8771af1c1 100644 --- a/target/linux/config/Config.in.misc +++ b/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 diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index 6021e9d9f..7a5706078 100644 --- a/toolchain/kernel-headers/Makefile +++ b/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 \ |