From b4d61f0ee3485f89dd8560227c833dc948523ecf Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 14 Nov 2010 21:09:58 +0100 Subject: consolidate x86/x86_64 support use hardware profiles, instead of extra target dirs. fix dependencies. --- target/Config.in | 163 ++++++++++++------------------------------------------- 1 file changed, 36 insertions(+), 127 deletions(-) (limited to 'target/Config.in') 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/ @@ -407,38 +349,6 @@ config ADK_LINUX_X86_WRAP 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 @@ -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 -- cgit v1.2.3