diff options
| -rw-r--r-- | target/config/Config.in.kernel | 1 | ||||
| -rw-r--r-- | target/config/Config.in.target | 7 | ||||
| -rw-r--r-- | target/linux/config/Config.in.ethernet | 5 | ||||
| -rw-r--r-- | target/linux/config/Config.in.misc | 5 | ||||
| -rw-r--r-- | target/linux/config/Config.in.pm | 1 | ||||
| -rw-r--r-- | target/x86_64/Makefile | 3 | ||||
| -rw-r--r-- | toolchain/kernel-headers/Makefile | 4 |
7 files changed, 21 insertions, 5 deletions
diff --git a/target/config/Config.in.kernel b/target/config/Config.in.kernel index c01fdfa31..212ec0004 100644 --- a/target/config/Config.in.kernel +++ b/target/config/Config.in.kernel @@ -59,4 +59,5 @@ config ADK_TARGET_KERNEL_MINICONFIG default "mikrotik-rb4xx" if ADK_TARGET_SYSTEM_MIKROTIK_RB4XX default "mikrotik-rb532" if ADK_TARGET_SYSTEM_MIKROTIK_RB532 default "generic-pc" if ADK_TARGET_SYSTEM_GENERIC_PC + default "pcengines-apu" if ADK_TARGET_SYSTEM_PCENGINES_APU diff --git a/target/config/Config.in.target b/target/config/Config.in.target index e3e271c32..c203b8a13 100644 --- a/target/config/Config.in.target +++ b/target/config/Config.in.target @@ -37,6 +37,7 @@ config ADK_TARGET_CMDLINE default "console=ttyAMA0" if ADK_TARGET_SYSTEM_ARM_FM default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 + default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_APU default "console=ttymxc0,115200 console=tty0" if ADK_TARGET_SYSTEM_CUBOX_I && ADK_RUNTIME_VERBOSE_INIT_VGA default "console=tty0 console=ttymxc0,115200" if ADK_TARGET_SYSTEM_CUBOX_I && ADK_RUNTIME_VERBOSE_INIT_SERIAL default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40 && ADK_RUNTIME_VERBOSE_INIT_VGA @@ -147,6 +148,7 @@ 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) @@ -160,11 +162,10 @@ config ADK_TARGET_ROOTFS_USB select ADK_KERNEL_USB_OHCI_HCD select ADK_KERNEL_USB_UHCI_HCD select ADK_KERNEL_USB_STORAGE - select ADK_KERNEL_EXT2_FS select ADK_PACKAGE_ADKINSTALL depends on ADK_TARGET_WITH_USB_BOOT help - Boot system from USB stick. + Boot system from USB stick. config ADK_TARGET_ROOTFS_ISO boolean "ISO image" @@ -208,7 +209,7 @@ config ADK_TARGET_ROOT_EXT4_RASPBERRY_PI choice prompt "Root filesystem type" -depends on ADK_TARGET_ROOTFS_ARCHIVE && !ADK_TARGET_SYSTEM_RASPBERRY_PI && !ADK_TARGET_QEMU +depends on ADK_TARGET_ROOTFS_ARCHIVE || ADK_TARGET_ROOTFS_USB && !ADK_TARGET_SYSTEM_RASPBERRY_PI && !ADK_TARGET_QEMU default ADK_TARGET_ROOT_EXT4 config ADK_TARGET_ROOT_EXT4 diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet index ffd4d40da..faa63206b 100644 --- a/target/linux/config/Config.in.ethernet +++ b/target/linux/config/Config.in.ethernet @@ -248,10 +248,13 @@ config ADK_KERNEL_SKY2 config ADK_KERNEL_R8169 prompt "RTL8169 driver" tristate + select ADK_KERNEL_NET_VENDOR_REALTEK select ADK_KERNEL_NETDEV_1000 select ADK_KERNEL_MII select ADK_KERNEL_FW_LOADER - depends on ADK_TARGET_WITH_PCI + select ADK_PACKAGE_REALTEK_FIRMWARE_WIRED + depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_MINIPCI + default y if ADK_TARGET_SYSTEM_PCENGINES_APU default n help diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index 41e8edc0c..42d9e7a57 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -2,6 +2,11 @@ config ADK_KERNEL_FIRMWARE_IN_KERNEL boolean default n +config ADK_KERNEL_EXTRA_FIRMWARE + string + default "rtl_nic/rtl8168e-2.fw" if ADK_KERNEL_R8169 && ADK_KERNEL_ROOT_NFS + default "" + config ADK_KERNEL_FW_LOADER_USER_HELPER boolean default n diff --git a/target/linux/config/Config.in.pm b/target/linux/config/Config.in.pm index 4bfe42c58..702e516eb 100644 --- a/target/linux/config/Config.in.pm +++ b/target/linux/config/Config.in.pm @@ -38,6 +38,7 @@ config ADK_HARDWARE_ACPI select ADK_KERNEL_ACPI_FAN select ADK_KERNEL_ACPI_DOCK default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_PCENGINES_APU default n help Enable ACPI support. diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index d2a39a4ff..e4e0c4d1d 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/Makefile @@ -79,7 +79,8 @@ endif ifeq ($(ADK_TARGET_FS),usb) targethelp: @echo 'The root tarball is: ${FW_DIR}/${ROOTFSTARBALL}' - @echo "To install everything to USB use scripts/install.sh" + @echo "To install everything to USB use:" + @echo "sudo ./scripts/install.sh -t /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL)" endif ifeq ($(ADK_TARGET_FS),iso) targethelp: diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index 42eb9ff2b..6021e9d9f 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile @@ -9,6 +9,10 @@ include ${ADK_TOPDIR}/mk/kernel-vars.mk 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 +endif ifeq ($(ADK_LINUX_XTENSA),y) tar xf $(ADK_TOPDIR)/target/xtensa/overlay/xtensa_dc232b.tar \ --strip-components=1 -C $(WRKSRC) linux |