diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/Config.in | 163 | ||||
| -rw-r--r-- | target/Config.in.x86 | 34 | ||||
| -rw-r--r-- | target/Config.in.x86_64 | 44 | ||||
| -rw-r--r-- | target/bulk.lst | 6 | ||||
| -rw-r--r-- | target/bulkdef.lst | 18 | ||||
| -rw-r--r-- | target/bulktool.lst | 6 | ||||
| -rw-r--r-- | target/linux/config/Config.in.block | 36 | ||||
| -rw-r--r-- | target/linux/config/Config.in.kvm | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.netdevice | 4 | ||||
| -rw-r--r-- | target/linux/config/Config.in.usb | 3 | ||||
| -rw-r--r-- | target/rescue-x86/Makefile | 22 | ||||
| -rw-r--r-- | target/rescue-x86/kernel.config | 1106 | ||||
| -rw-r--r-- | target/rescue-x86/target.mk | 7 | ||||
| -rw-r--r-- | target/rescue-x86/uclibc.config | 241 | ||||
| -rw-r--r-- | target/rescue-x86_64/Makefile | 22 | ||||
| -rw-r--r-- | target/rescue-x86_64/files/etc/inittab | 4 | ||||
| -rw-r--r-- | target/rescue-x86_64/files/etc/mdev.conf | 14 | ||||
| -rw-r--r-- | target/rescue-x86_64/kernel.config | 1163 | ||||
| -rw-r--r-- | target/rescue-x86_64/target.mk | 7 | ||||
| -rw-r--r-- | target/shuttle/files/etc/inittab | 4 | ||||
| -rw-r--r-- | target/shuttle/files/etc/mdev.conf | 14 | ||||
| -rw-r--r-- | target/shuttle/uclibc.config | 223 | ||||
| -rw-r--r-- | target/target.lst | 14 | ||||
| -rw-r--r-- | target/toolchain-x86/target.mk | 7 | ||||
| -rw-r--r-- | target/toolchain-x86/uclibc.config | 241 | ||||
| -rw-r--r-- | target/toolchain-x86_64/target.mk | 7 | ||||
| -rw-r--r-- | target/toolchain-x86_64/uclibc.config | 240 | ||||
| -rw-r--r-- | target/x86/Makefile (renamed from target/ibmx40/Makefile) | 0 | ||||
| -rw-r--r-- | target/x86/files/etc/inittab (renamed from target/ibmx40/files/etc/inittab) | 0 | ||||
| -rw-r--r-- | target/x86/files/etc/mdev.conf (renamed from target/ibmx40/files/etc/mdev.conf) | 0 | ||||
| -rw-r--r-- | target/x86/files/etc/network/interfaces (renamed from target/ibmx40/files/etc/network/interfaces) | 0 | ||||
| -rw-r--r-- | target/x86/files/etc/notmpfs (renamed from target/ibmx40/files/etc/notmpfs) | 0 | ||||
| -rw-r--r-- | target/x86/kernel.config (renamed from target/ibmx40/kernel.config) | 109 | ||||
| -rw-r--r-- | target/x86/target.mk (renamed from target/ibmx40/target.mk) | 0 | ||||
| -rw-r--r-- | target/x86/uclibc.config (renamed from target/ibmx40/uclibc.config) | 0 | ||||
| -rw-r--r-- | target/x86_64/Makefile (renamed from target/shuttle/Makefile) | 5 | ||||
| -rw-r--r-- | target/x86_64/files/etc/inittab (renamed from target/rescue-x86/files/etc/inittab) | 0 | ||||
| -rw-r--r-- | target/x86_64/files/etc/mdev.conf (renamed from target/rescue-x86/files/etc/mdev.conf) | 0 | ||||
| -rw-r--r-- | target/x86_64/files/etc/network/interfaces (renamed from target/shuttle/files/etc/network/interfaces) | 0 | ||||
| -rw-r--r-- | target/x86_64/files/etc/notmpfs (renamed from target/shuttle/files/etc/notmpfs) | 0 | ||||
| -rw-r--r-- | target/x86_64/kernel.config (renamed from target/shuttle/kernel.config) | 0 | ||||
| -rw-r--r-- | target/x86_64/target.mk (renamed from target/shuttle/target.mk) | 4 | ||||
| -rw-r--r-- | target/x86_64/uclibc.config (renamed from target/rescue-x86_64/uclibc.config) | 0 |
43 files changed, 174 insertions, 3596 deletions
diff --git a/target/Config.in b/target/Config.in index f2484c9ff..a835f5d36 100644 --- a/target/Config.in +++ b/target/Config.in @@ -83,12 +83,6 @@ config ADK_ppc_toolchain config ADK_sparc_toolchain tristate -config ADK_x86_toolchain - tristate - -config ADK_x86_64_toolchain - tristate - config ADK_arm_qemu tristate @@ -125,27 +119,12 @@ config ADK_zaurus config ADK_foxg20 tristate -config ADK_ibmx40 - tristate - config ADK_foxboard tristate config ADK_lemote tristate -config ADK_x86_rescue - tristate - -config ADK_x86_64_rescue - tristate - -config ADK_mips_rescue - tristate - -config ADK_mipsel_rescue - tristate - config ADK_brcm tristate @@ -155,7 +134,7 @@ config ADK_ag241 config ADK_wag54g tristate -config ADK_shuttle +config ADK_x86_64 tristate config ADK_x86 @@ -166,14 +145,14 @@ config ADK_TARGET default "alix" if ADK_alix default "wrap" if ADK_wrap default "brcm" if ADK_brcm + default "x86" if ADK_x86 + default "x86_64" if ADK_x86_64 default "toolchain-arm" if ADK_arm_toolchain default "toolchain-armel" if ADK_armel_toolchain default "toolchain-mips" if ADK_mips_toolchain default "toolchain-mipsel" if ADK_mipsel_toolchain default "toolchain-ppc" if ADK_ppc_toolchain default "toolchain-sparc" if ADK_sparc_toolchain - default "toolchain-x86" if ADK_x86_toolchain - default "toolchain-x86_64" if ADK_x86_64_toolchain default "qemu-arm" if ADK_arm_qemu default "qemu-cris" if ADK_cris_qemu default "qemu-mips" if ADK_mips_qemu @@ -188,14 +167,8 @@ config ADK_TARGET default "rb4xx" if ADK_rb4xx default "zaurus" if ADK_arm default "lemote" if ADK_lemote - default "ibmx40" if ADK_ibmx40 default "wag54g" if ADK_wag54g default "ag241" if ADK_ag241 - default "rescue-x86" if ADK_x86_rescue - default "rescue-x86_64" if ADK_x86_64_rescue - default "rescue-mips" if ADK_mips_rescue - default "rescue-mipsel" if ADK_mipsel_rescue - default "shuttle" if ADK_shuttle # c library @@ -328,14 +301,6 @@ config ADK_LINUX_XSCALE_ZAURUS Support for Sharp Zaurus SL-C3200 (aka Terrier) Status: development -config ADK_LINUX_RESCUE - bool "Minimal Linux Rescuesystem" - select ADK_KERNEL_INPUT_KEYBOARD - select ADK_TARGET_WITH_INPUT - help - Rescuesystem with can be used to Boot from Disk or USB stick. - Status: development - config ADK_LINUX_QEMU bool "Qemu Emulator" select ADK_KERNEL_NET_PCI @@ -351,39 +316,17 @@ config ADK_LINUX_TOOLCHAIN help Toolchain only support -config ADK_LINUX_X86_IBMX40 - bool "IBM X40 laptop" - select ADK_ibmx40 - select ADK_HARDWARE_IBMX40 +config ADK_LINUX_X86 + bool "x86 system" + select ADK_x86 help - Support for a IBM X40 laptop. - Status: development + Support for a x86 system. -config ADK_LINUX_X86_64_SHUTTLE - bool "Shuttle PC" - select ADK_shuttle - select ADK_TARGET_WITH_USB - select ADK_TARGET_WITH_VGA - select ADK_TARGET_WITH_PCI - select ADK_TARGET_WITH_INPUT - select ADK_TARGET_WITH_PP - select ADK_KERNEL_INPUT_KEYBOARD - select ADK_KERNEL_SCSI - select ADK_KERNEL_NETDEVICES - select ADK_KERNEL_NET_PCI - select ADK_KERNEL_NET_ETHERNET - select ADK_KERNEL_SATA_AHCI if ADK_TARGET_ROOTFS_ARCHIVE - select ADK_KERNEL_BLK_DEV_SD if ADK_TARGET_ROOTFS_ARCHIVE - select ADK_KERNEL_BLK_DEV_MD if ADK_TARGET_ROOTFS_ARCHIVE - select ADK_KERNEL_MD_RAID0 if ADK_TARGET_ROOTFS_ARCHIVE - select ADK_KERNEL_MD_RAID1 if ADK_TARGET_ROOTFS_ARCHIVE - select ADK_KPACKAGE_KMOD_SATA_AHCI if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK - select ADK_KPACKAGE_KMOD_BLK_DEV_MD if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK - select ADK_KPACKAGE_KMOD_MD_RAID0 if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK - select ADK_KPACKAGE_KMOD_MD_RAID1 if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK - help - Support for a nice and fast shuttle xpc with AMD quad-core CPU. - Status: development +config ADK_LINUX_X86_64 + bool "x86_64 system" + select ADK_x86_64 + help + Support for a x86_64/amd64 system. config ADK_LINUX_X86_WRAP bool "PC Engines WRAP" @@ -397,9 +340,8 @@ config ADK_LINUX_X86_WRAP select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_MII - select ADK_KERNEL_CRC32 select ADK_TARGET_WITH_WATCHDOG - select BUSYBOX_HWCLOCK + select ADK_TARGET_WITH_RTC help End of life, but I still have one board. http://www.pcengines.ch/ @@ -409,38 +351,6 @@ endchoice choice prompt "Architecture" -depends on ADK_LINUX_RESCUE - -config ADK_LINUX_X86_64_RESCUE - bool "x86_64" - select ADK_x86_64_rescue - help - X86 architecture. - -config ADK_LINUX_X86_RESCUE - bool "x86" - select ADK_x86_rescue - help - X86 architecture. - -config ADK_LINUX_MIPSEL_RESCUE - bool "mips (little endian)" - select ADK_mipsel_rescue - depends on ADK_BROKEN - help - MIPS LE architecture. - -config ADK_LINUX_MIPS_RESCUE - bool "mips (big endian)" - select ADK_mips_rescue - depends on ADK_BROKEN - help - MIPS BE architecture. - -endchoice - -choice -prompt "Architecture" depends on ADK_LINUX_TOOLCHAIN config ADK_LINUX_ARM_TOOLCHAIN @@ -489,13 +399,6 @@ config ADK_LINUX_SPARC_TOOLCHAIN help Status: toolchain only -config ADK_LINUX_X86_TOOLCHAIN - bool "X86 Toolchain (32 Bit)" - select ADK_x86_toolchain - select ADK_TOOLCHAIN_ONLY - help - Status: toolchain only - config ADK_LINUX_X86_64_TOOLCHAIN bool "X86 Toolchain (64 Bit)" select ADK_x86_64_toolchain @@ -592,6 +495,7 @@ config ADK_LINUX_X86_64_QEMU endchoice source "target/Config.in.alix" +source "target/Config.in.x86" choice prompt "Routerboard model" @@ -674,14 +578,13 @@ config ADK_TARGET_LIB_EGLIBC bool "Embedded GNU C library" select ADK_eglibc depends on ADK_LINUX_QEMU || \ - ADK_LINUX_X86_IBMX40 || \ + ADK_LINUX_X86 || \ + ADK_LINUX_X86_64 || \ ADK_LINUX_X86_ALIX || \ ADK_LINUX_X86_WRAP || \ ADK_LINUX_MIPS_RB4XX || \ ADK_LINUX_MIPS_RB532 || \ - ADK_LINUX_X86_64_SHUTTLE || \ ADK_LINUX_MIPS64_LEMOTE || \ - ADK_LINUX_RESCUE || \ ADK_LINUX_TOOLCHAIN help http://www.eglibc.org @@ -690,13 +593,12 @@ config ADK_TARGET_LIB_GLIBC bool "GNU C library" select ADK_glibc depends on ADK_LINUX_QEMU || \ - ADK_LINUX_X86_IBMX40 || \ + ADK_LINUX_X86 || \ + ADK_LINUX_X86_64 || \ ADK_LINUX_X86_ALIX || \ ADK_LINUX_X86_WRAP || \ ADK_LINUX_MIPS_RB532 || \ ADK_LINUX_MIPS_RB4XX || \ - ADK_LINUX_X86_64_SHUTTLE || \ - ADK_LINUX_RESCUE || \ ADK_LINUX_MIPS64_LEMOTE || \ ADK_LINUX_TOOLCHAIN help @@ -719,12 +621,12 @@ prompt "Target Firmware type" config ADK_TARGET_ROOTFS_INITRAMFS bool "initramfs filesystem" depends on \ + ADK_LINUX_X86 || \ + ADK_LINUX_X86_64 || \ ADK_LINUX_X86_ALIX || \ ADK_LINUX_QEMU || \ - ADK_LINUX_X86_64_SHUTTLE || \ ADK_LINUX_NATIVE || \ - ADK_LINUX_MIPS64_LEMOTE || \ - ADK_LINUX_RESCUE + ADK_LINUX_MIPS64_LEMOTE select ADK_KERNEL_BLK_DEV_INITRD help create an read-only initramfs system. @@ -735,11 +637,10 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK depends on \ ADK_LINUX_X86_ALIX || \ ADK_LINUX_QEMU || \ - ADK_LINUX_X86_IBMX40 || \ - ADK_LINUX_X86_64_SHUTTLE || \ + ADK_LINUX_X86 || \ + ADK_LINUX_X86_64 || \ ADK_LINUX_NATIVE || \ - ADK_LINUX_MIPS64_LEMOTE || \ - ADK_LINUX_RESCUE + ADK_LINUX_MIPS64_LEMOTE help create an read-only initramfs system. @@ -795,7 +696,7 @@ config ADK_TARGET_ROOTFS_USB select ADK_KERNEL_USB_UHCI_HCD select ADK_KERNEL_USB_STORAGE select ADK_KERNEL_EXT2_FS - depends on ADK_LINUX_X86_IBMX40 + depends on ADK_LINUX_X86 || ADK_LINUX_X86_64 help Boot system from USB stick. @@ -817,16 +718,16 @@ config ADK_TARGET_ROOTFS_ARCHIVE ADK_LINUX_NATIVE || \ ADK_LINUX_QEMU || \ ADK_LINUX_XSCALE_ZAURUS || \ - ADK_LINUX_X86_IBMX40 || \ + ADK_LINUX_X86 || \ ADK_LINUX_MIPS64_LEMOTE || \ - ADK_LINUX_X86_64_SHUTTLE + ADK_LINUX_X86_64 help Use this option if your root filesystem is ext2/ext3/ext4/xfs. config ADK_TARGET_ROOTFS_ENCRYPTED bool "Encrypted read-write root filesystem" depends on ADK_LINUX_MIPS64_LEMOTE || \ - ADK_LINUX_X86_IBMX40 + ADK_LINUX_X86 select ADK_LINUX_INITRAMFS_BUILTIN select ADK_PACKAGE_CRYPTINIT select ADK_KERNEL_BLK_DEV_DM @@ -861,6 +762,14 @@ config ADK_TARGET_ROOTFS_ENCRYPTED endchoice +config ADK_TARGET_ROOTFS_USB_DEVICE + prompt "Target device node for USB stick" + string + depends on ADK_TARGET_ROOTFS_USB + default "/dev/sdb1" + help + Target device node for the USB stick. + choice prompt "Compression method for initramfs and kernel" depends on ADK_TARGET_ROOTFS_INITRAMFS || ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK diff --git a/target/Config.in.x86 b/target/Config.in.x86 new file mode 100644 index 000000000..86591f1f7 --- /dev/null +++ b/target/Config.in.x86 @@ -0,0 +1,34 @@ +choice +depends on ADK_LINUX_X86 +prompt "Hardware model" + +config ADK_HARDWARE_GENERIC + bool "Generic x86 system" + help + Generic x86 system. + +config ADK_HARDWARE_IBMX40 + bool "IBM X40 laptop" + select ADK_TARGET_WITH_USB + select ADK_TARGET_WITH_PCI + select ADK_TARGET_WITH_VGA + select ADK_TARGET_WITH_INPUT + select ADK_TARGET_WITH_RTC + select ADK_TARGET_WITH_HDD + select ADK_KERNEL_NLS + select ADK_KERNEL_EXT2_FS + select ADK_KERNEL_SCSI + select ADK_KERNEL_ATA + select ADK_KERNEL_BLK_DEV_SD + select ADK_KERNEL_INPUT_KEYBOARD + select ADK_KERNEL_SWAP + help + Hardware profile for IBM X40 laptop's. + +config ADK_HARDWARE_GENERIC_X86_TOOLCHAIN + bool "x86 toolchain" + select ADK_TOOLCHAIN_ONLY + help + x86 toolchain. + +endchoice diff --git a/target/Config.in.x86_64 b/target/Config.in.x86_64 new file mode 100644 index 000000000..82b8f2686 --- /dev/null +++ b/target/Config.in.x86_64 @@ -0,0 +1,44 @@ +choice +depends on ADK_LINUX_X86_64 +prompt "Hardware model" + +config ADK_HARDWARE_GENERIC + bool "Generic x86_64/amd64 system" + help + Generic x86_64/amd64 system. + +config ADK_HARDWARE_SHUTTLE + bool "Shuttle PC" + select ADK_shuttle + select ADK_TARGET_WITH_USB + select ADK_TARGET_WITH_VGA + select ADK_TARGET_WITH_PCI + select ADK_TARGET_WITH_RTC + select ADK_TARGET_WITH_INPUT + select ADK_TARGET_WITH_PP + select ADK_KERNEL_INPUT_KEYBOARD + select ADK_KERNEL_SCSI + select ADK_KERNEL_NETDEVICES + select ADK_KERNEL_NET_PCI + select ADK_KERNEL_NET_ETHERNET + select ADK_KERNEL_SATA_AHCI if ADK_TARGET_ROOTFS_ARCHIVE + select ADK_KERNEL_BLK_DEV_SD if ADK_TARGET_ROOTFS_ARCHIVE + select ADK_KERNEL_BLK_DEV_MD if ADK_TARGET_ROOTFS_ARCHIVE + select ADK_KERNEL_MD_RAID0 if ADK_TARGET_ROOTFS_ARCHIVE + select ADK_KERNEL_MD_RAID1 if ADK_TARGET_ROOTFS_ARCHIVE + select ADK_KPACKAGE_KMOD_SATA_AHCI if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK + select ADK_KPACKAGE_KMOD_BLK_DEV_MD if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK + select ADK_KPACKAGE_KMOD_MD_RAID0 if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK + select ADK_KPACKAGE_KMOD_MD_RAID1 if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK + help + Support for a nice and fast shuttle xpc with AMD quad-core CPU. + Status: development + + +config ADK_HARDWARE_GENERIC_X86_64_TOOLCHAIN + bool "x86_64 toolchain" + select ADK_TOOLCHAIN_ONLY + help + x86_64 toolchain. + +endchoice diff --git a/target/bulk.lst b/target/bulk.lst index 036585a78..72bf5c124 100644 --- a/target/bulk.lst +++ b/target/bulk.lst @@ -30,6 +30,6 @@ x86_64_qemu eglibc archive x86_64_qemu glibc archive lemote eglibc archive lemote glibc archive -ibmx40 uclibc archive -ibmx40 eglibc archive -ibmx40 glibc archive +x86 uclibc archive +x86 eglibc archive +x86 glibc archive diff --git a/target/bulkdef.lst b/target/bulkdef.lst index 7ffce6203..e100ea2c7 100644 --- a/target/bulkdef.lst +++ b/target/bulkdef.lst @@ -58,15 +58,15 @@ lemote eglibc initramfs lemote glibc initramfs lemote eglibc initramfs-piggyback lemote glibc initramfs-piggyback -ibmx40 uclibc archive -ibmx40 eglibc archive -ibmx40 glibc archive -ibmx40 uclibc initramfs -ibmx40 eglibc initramfs -ibmx40 glibc initramfs -ibmx40 uclibc initramfs-piggyback -ibmx40 eglibc initramfs-piggyback -ibmx40 glibc initramfs-piggyback +x86 uclibc archive +x86 eglibc archive +x86 glibc archive +x86 uclibc initramfs +x86 eglibc initramfs +x86 glibc initramfs +x86 uclibc initramfs-piggyback +x86 eglibc initramfs-piggyback +x86 glibc initramfs-piggyback shuttle uclibc archive shuttle eglibc archive shuttle glibc archive diff --git a/target/bulktool.lst b/target/bulktool.lst index 6005df9a3..abafba6d9 100644 --- a/target/bulktool.lst +++ b/target/bulktool.lst @@ -13,9 +13,3 @@ mipsel_toolchain glibc ppc_toolchain uclibc ppc_toolchain eglibc ppc_toolchain glibc -x86_toolchain uclibc -x86_toolchain eglibc -x86_toolchain glibc -x86_64_toolchain uclibc -x86_64_toolchain eglibc -x86_64_toolchain glibc diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index d8b32c716..0558f536a 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -59,7 +59,7 @@ config ADK_KERNEL_SATA_AHCI select ADK_KERNEL_BLOCK select ADK_KERNEL_ATA select ADK_KERNEL_BLK_DEV_SD - depends on ADK_LINUX_X86_64_SHUTTLE + default y if ADK_HARDWARE_SHUTTLE default n config ADK_KPACKAGE_KMOD_SATA_AHCI @@ -69,44 +69,10 @@ config ADK_KPACKAGE_KMOD_SATA_AHCI select ADK_KERNEL_ATA select ADK_KERNEL_BLK_DEV_SD depends on !ADK_KERNEL_SATA_AHCI - depends on ADK_LINUX_X86_64_SHUTTLE default n help Enables support for AHCI Serial ATA. -#config ADK_KERNEL_IDE -# boolean -# default n -# -#config ADK_KPACKAGE_KMOD_BLK_DEV_IDE -# prompt "kmod-ide.......................... IDE support" -# tristate -# select ADK_KERNEL_BLOCK -# select ADK_KERNEL_IDE -# default n -# help -# If you say Y here, you will use the full-featured IDE driver to -# control up to ten ATA/IDE interfaces, each being able to serve a -# "master" and a "slave" device, for a total of up to twenty ATA/IDE -# disk/cdrom/tape/floppy drives. -# -# Useful information about large (>540 MB) IDE disks, multiple -# interfaces, what to do if ATA/IDE devices are not automatically -# detected, sound card ATA/IDE ports, module support, and other -# topics, is contained in <file:Documentation/ide.txt>. For detailed -# information about hard drives, consult the Disk-HOWTO and the -# Multi-Disk-HOWTO, available from -# <http://www.tldp.org/docs.html#howto>. -# -# To fine-tune ATA/IDE drive/interface parameters for improved -# performance, look for the hdparm package at -# <ftp://ibiblio.org/pub/Linux/system/hardware/>. -# -# To compile this driver as a module, choose M here and read -# <file:Documentation/ide.txt>. The module will be called ide-mod. -# Do not compile this driver as a module if your root file system (the -# one containing the directory /) is located on an IDE device. - config ADK_KPACKAGE_KMOD_BLK_DEV_LOOP prompt "kmod-loop......................... Loop mount support" tristate diff --git a/target/linux/config/Config.in.kvm b/target/linux/config/Config.in.kvm index 4fc515e0e..20aaa4f92 100644 --- a/target/linux/config/Config.in.kvm +++ b/target/linux/config/Config.in.kvm @@ -1,5 +1,5 @@ menu "Virtualization" -depends on ADK_LINUX_X86_64_SHUTTLE +depends on ADK_LINUX_X86_64 || ADK_LINUX_X86 config ADK_KERNEL_VIRTUALIZATION bool diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index ca71d554c..c3a42da09 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -83,6 +83,7 @@ config ADK_KPACKAGE_KMOD_E1000 select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NETDEV_1000 tristate + default y if ADK_HARDWARE_IBMX40 default n help This driver supports Intel(R) PRO/1000 gigabit ethernet family of @@ -190,6 +191,7 @@ config ADK_KPACKAGE_KMOD_MAC80211 select ADK_KERNEL_WIRELESS select ADK_KERNEL_WLAN_80211 select ADK_KERNEL_CRC32 + default y if ADK_HARDWARE_IBMX40 default n config ADK_DEBUG_MAC80211 @@ -209,6 +211,7 @@ config ADK_KPACKAGE_KMOD_ATH5K select ADK_KERNEL_ATH_COMMON depends on ADK_KPACKAGE_KMOD_MAC80211 depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI + default y if ADK_HARDWARE_IBMX40 default n help Driver for Atheros 5xxx/24xx cards. @@ -309,5 +312,4 @@ config ADK_KERNEL_RT2X00_DEBUG help endmenu - endmenu diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index d9a8020b0..9f25aed81 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -31,6 +31,7 @@ config ADK_KPACKAGE_KMOD_USB default y if ADK_HARDWARE_ALIX1C default y if ADK_HARDWARE_ALIX2D2 default y if ADK_HARDWARE_ALIX2D13 + default y if ADK_HARDWARE_IBMX40 default n depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 || ADK_KERNEL_USB) select ADK_KERNEL_NLS @@ -85,6 +86,7 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD default y if ADK_HARDWARE_ALIX1C default y if ADK_HARDWARE_ALIX2D2 default y if ADK_HARDWARE_ALIX2D13 + default y if ADK_HARDWARE_IBMX40 default n depends on !ADK_LINUX_CRIS_FOXBOARD depends on ADK_KPACKAGE_KMOD_USB @@ -133,6 +135,7 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD default y if ADK_HARDWARE_ALIX1C default y if ADK_HARDWARE_ALIX2D2 default y if ADK_HARDWARE_ALIX2D13 + default y if ADK_HARDWARE_IBMX40 default n depends on ADK_KPACKAGE_KMOD_USB select ADK_PACKAGE_KMOD_USB_CONTROLLER diff --git a/target/rescue-x86/Makefile b/target/rescue-x86/Makefile deleted file mode 100644 index 60891ff0c..000000000 --- a/target/rescue-x86/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(TOPDIR)/rules.mk -include $(TOPDIR)/mk/kernel.mk -include $(TOPDIR)/mk/modules.mk -include $(TOPDIR)/mk/kernel-build.mk -include $(TOPDIR)/mk/image.mk - -KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage - -ifeq ($(FS),initramfs) -imageinstall: $(BIN_DIR)/$(INITRAMFS) - @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel - @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' - @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' -endif -ifeq ($(FS),initramfs-piggyback) -imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs - @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel - @echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' -endif diff --git a/target/rescue-x86/kernel.config b/target/rescue-x86/kernel.config deleted file mode 100644 index fccfb8fca..000000000 --- a/target/rescue-x86/kernel.config +++ /dev/null @@ -1,1106 +0,0 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.6.33 -# Mon Mar 1 20:53:37 2010 -# -# CONFIG_64BIT is not set -CONFIG_X86_32=y -# CONFIG_X86_64 is not set -CONFIG_X86=y -CONFIG_OUTPUT_FORMAT="elf32-i386" -CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" -CONFIG_GENERIC_TIME=y -CONFIG_GENERIC_CMOS_UPDATE=y -CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_LOCKDEP_SUPPORT=y -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_MMU=y -CONFIG_ZONE_DMA=y -CONFIG_GENERIC_ISA_DMA=y -CONFIG_GENERIC_IOMAP=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_HWEIGHT=y -CONFIG_ARCH_MAY_HAVE_PC_FDC=y -# CONFIG_RWSEM_GENERIC_SPINLOCK is not set -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -# CONFIG_GENERIC_TIME_VSYSCALL is not set -CONFIG_ARCH_HAS_CPU_RELAX=y -CONFIG_ARCH_HAS_DEFAULT_IDLE=y -CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y -CONFIG_HAVE_SETUP_PER_CPU_AREA=y -CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y -CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y -# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -# CONFIG_ZONE_DMA32 is not set -CONFIG_ARCH_POPULATES_NODE_MAP=y -# CONFIG_AUDIT_ARCH is not set -CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y -CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y -CONFIG_GENERIC_HARDIRQS=y -CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_X86_32_LAZY_GS=y -CONFIG_KTIME_SCALAR=y -CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -CONFIG_CONSTRUCTORS=y - -# -# General setup -# -CONFIG_EXPERIMENTAL=y -CONFIG_BROKEN_ON_SMP=y -CONFIG_LOCK_KERNEL=y -CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_BZIP2=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_LZO=y -CONFIG_KERNEL_GZIP=y -# CONFIG_KERNEL_BZIP2 is not set -# CONFIG_KERNEL_LZMA is not set -# CONFIG_KERNEL_LZO is not set -CONFIG_SWAP=y -CONFIG_SYSVIPC=y -CONFIG_SYSVIPC_SYSCTL=y -CONFIG_POSIX_MQUEUE=y -CONFIG_POSIX_MQUEUE_SYSCTL=y -# CONFIG_BSD_PROCESS_ACCT is not set -# CONFIG_TASKSTATS is not set -# CONFIG_AUDIT is not set - -# -# RCU Subsystem -# -CONFIG_TREE_RCU=y -# CONFIG_TREE_PREEMPT_RCU is not set -# CONFIG_TINY_RCU is not set -# CONFIG_RCU_TRACE is not set -CONFIG_RCU_FANOUT=32 -# CONFIG_RCU_FANOUT_EXACT is not set -# CONFIG_TREE_RCU_TRACE is not set -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=15 -CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -# CONFIG_GROUP_SCHED is not set -# CONFIG_CGROUPS is not set -# CONFIG_SYSFS_DEPRECATED_V2 is not set -# CONFIG_RELAY is not set -# CONFIG_NAMESPACES is not set -CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_RD_GZIP=y -# CONFIG_RD_BZIP2 is not set -# CONFIG_RD_LZMA is not set -# CONFIG_RD_LZO is not set -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_SYSCTL=y -CONFIG_ANON_INODES=y -CONFIG_EMBEDDED=y -CONFIG_UID16=y -CONFIG_SYSCTL_SYSCALL=y -# CONFIG_KALLSYMS is not set -CONFIG_HOTPLUG=y -CONFIG_PRINTK=y -CONFIG_BUG=y -# CONFIG_ELF_CORE is not set -# CONFIG_PCSPKR_PLATFORM is not set -CONFIG_BASE_FULL=y -CONFIG_FUTEX=y -CONFIG_EPOLL=y -CONFIG_SIGNALFD=y -CONFIG_TIMERFD=y -CONFIG_EVENTFD=y -CONFIG_SHMEM=y -CONFIG_AIO=y -CONFIG_HAVE_PERF_EVENTS=y - -# -# Kernel Performance Events And Counters -# -CONFIG_PERF_EVENTS=y -# CONFIG_PERF_COUNTERS is not set -# CONFIG_VM_EVENT_COUNTERS is not set -CONFIG_PCI_QUIRKS=y -# CONFIG_COMPAT_BRK is not set -CONFIG_SLAB=y -# CONFIG_SLUB is not set -# CONFIG_SLOB is not set -# CONFIG_PROFILING is not set -CONFIG_HAVE_OPROFILE=y -CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_HAVE_IOREMAP_PROT=y -CONFIG_HAVE_KPROBES=y -CONFIG_HAVE_KRETPROBES=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_DMA_ATTRS=y -CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_HW_BREAKPOINT=y -CONFIG_HAVE_USER_RETURN_NOTIFIER=y - -# -# GCOV-based kernel profiling -# -# CONFIG_SLOW_WORK is not set -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_SLABINFO=y -CONFIG_RT_MUTEXES=y -CONFIG_BASE_SMALL=0 -CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set |