diff options
| -rw-r--r-- | mk/modules.mk | 2 | ||||
| -rw-r--r-- | target/config/Config.in | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.block | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.graphics | 5 | ||||
| -rw-r--r-- | target/linux/config/Config.in.input | 5 | ||||
| -rw-r--r-- | target/linux/config/Config.in.misc | 3 | ||||
| -rw-r--r-- | target/linux/config/Config.in.multimedia | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.netdevice | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.pm | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.usb | 3 |
10 files changed, 23 insertions, 4 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index 0d6a86ebb..78897efc3 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -71,7 +71,7 @@ $(eval $(call KMOD_template,MAC80211,mac80211,\ $(eval $(call KMOD_template,ATH5K,ath5k,\ $(MODULES_DIR)/kernel/drivers/net/wireless/ath/ath \ $(MODULES_DIR)/kernel/drivers/net/wireless/ath/ath5k/ath5k \ -,20, kmod-leds-class)) +,20)) $(eval $(call KMOD_template,P54_COMMON,p54-common,\ $(MODULES_DIR)/kernel/drivers/net/wireless/p54/p54common \ diff --git a/target/config/Config.in b/target/config/Config.in index f5a9398b5..0e0cb4740 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -291,7 +291,7 @@ config ADK_TARGET_CMDLINE default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP default "console=ttyS0,115200 console=tty0 geodewdt.nowayout=1" if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40 - default "console=ttyS0,115200" + default "" # c library config ADK_uclibc diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index f8673351a..e9e735fe3 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -128,6 +128,7 @@ config ADK_KERNEL_ATA_PIIX default y if ADK_TARGET_SYSTEM_QEMU_X86 default y if ADK_TARGET_SYSTEM_QEMU_X86_64 default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default n config ADK_KERNEL_SATA_AHCI diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index 00c06eb8b..667593de9 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -2,12 +2,14 @@ config ADK_KERNEL_VT boolean default y if ADK_HARDWARE_QEMU default y if ADK_TARGET_WITH_VGA + default y if ADK_NATIVE_SYSTEM_IBM_X40 default n config ADK_KERNEL_VT_CONSOLE boolean default y if ADK_HARDWARE_QEMU default y if ADK_TARGET_WITH_VGA + default y if ADK_NATIVE_SYSTEM_IBM_X40 default n config ADK_KERNEL_FONTS @@ -79,8 +81,9 @@ config ADK_HARDWARE_GRAPHICS_INTEL_I915 select ADK_KERNEL_DRM_I915_KMS select ADK_KERNEL_DRM_I915 default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default n - depends on ADK_TARGET_SYSTEM_IBM_X40 + depends on ADK_TARGET_SYSTEM_IBM_X40 || ADK_NATIVE_SYSTEM_IBM_X40 help AGP/DRM/KMS support for Intel chipset i915. diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input index 3c55fb8dd..4a18af573 100644 --- a/target/linux/config/Config.in.input +++ b/target/linux/config/Config.in.input @@ -5,6 +5,7 @@ config ADK_KERNEL_INPUT boolean default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 default n @@ -13,6 +14,7 @@ config ADK_KERNEL_INPUT_KEYBOARD boolean default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 default n @@ -21,6 +23,7 @@ config ADK_KERNEL_KEYBOARD_ATKBD boolean default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 default n @@ -29,6 +32,7 @@ config ADK_KERNEL_INPUT_MOUSE boolean default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 default n @@ -37,6 +41,7 @@ config ADK_KERNEL_INPUT_MOUSEDEV boolean default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 default n diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index 8acd0dabe..b910eeec5 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -39,8 +39,9 @@ config ADK_KERNEL_RTC_DRV_CMOS default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default n - depends on (ADK_TARGET_SYSTEM_PCENGINES_ALIX1C || ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 || ADK_TARGET_SYSTEM_IBM_X40) + depends on (ADK_TARGET_SYSTEM_PCENGINES_ALIX1C || ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 || ADK_TARGET_SYSTEM_IBM_X40 || ADK_NATIVE_SYSTEM_IBM_X40) help PC CMOS RTC support. diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia index 201e4c281..ec4acfe48 100644 --- a/target/linux/config/Config.in.multimedia +++ b/target/linux/config/Config.in.multimedia @@ -53,6 +53,7 @@ config ADK_KPACKAGE_KMOD_SND_OSSEMUL select ADK_KERNEL_SND_PCM_OSS select ADK_KPACKAGE_KMOD_SND default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default n help ALSA OSS Emulation @@ -63,6 +64,7 @@ config ADK_KPACKAGE_KMOD_SND_INTEL8X0 select ADK_KPACKAGE_KMOD_SND_AC97_CODEC select ADK_KPACKAGE_KMOD_SND default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default n depends on ADK_TARGET_WITH_PCI help diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index b45e17ccd..a6251a71d 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -125,6 +125,7 @@ config ADK_KERNEL_E1000 select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NETDEV_1000 default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_QEMU_X86 default y if ADK_TARGET_SYSTEM_QEMU_X86_64 default n @@ -318,6 +319,7 @@ config ADK_KPACKAGE_KMOD_ATH5K select ADK_KPACKAGE_KMOD_MAC80211 depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_AHB default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_FON_FON2100 default n help diff --git a/target/linux/config/Config.in.pm b/target/linux/config/Config.in.pm index 2f90df20c..0c59194a9 100644 --- a/target/linux/config/Config.in.pm +++ b/target/linux/config/Config.in.pm @@ -37,6 +37,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_NATIVE_SYSTEM_IBM_X40 default n help Enable ACPI support. @@ -46,6 +47,7 @@ config ADK_KERNEL_SUSPEND boolean select ADK_KERNEL_PM default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default n help Enable Suspend-to-RAM and Suspend-to-Disk support. diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index 2be0c4f31..6d1108953 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -35,6 +35,7 @@ config ADK_KPACKAGE_KMOD_USB default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 default n @@ -77,6 +78,7 @@ config ADK_KPACKAGE_KMOD_USB_UHCI_HCD depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832 depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416 default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default n help @@ -156,6 +158,7 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default n help |