diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-12 21:10:52 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-12 21:10:52 +0200 |
commit | 681a668edf704bbb000a49c835b3d71fa7035d86 (patch) | |
tree | 27df7d51e37260f63812466b31369c1a144cdc45 /target/config | |
parent | 2d1f73d4334593134d3a47704a2614ffcae384ae (diff) | |
parent | 6c2bc15eb5c40548f6a98c37ab0b825b9c163343 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/config')
-rw-r--r-- | target/config/Config.in | 82 | ||||
-rw-r--r-- | target/config/Config.in.adk | 7 | ||||
-rw-r--r-- | target/config/Config.in.arch.choice | 6 | ||||
-rw-r--r-- | target/config/Config.in.arch.default | 4 | ||||
-rw-r--r-- | target/config/Config.in.runtime | 127 | ||||
-rw-r--r-- | target/config/Config.in.system.choice | 1 |
6 files changed, 225 insertions, 2 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index 70941eb9b..81b225989 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -74,6 +74,29 @@ config ADK_TARGET_ABI_N64 endchoice # submodel support +# +choice +prompt "Qemu ARM Emulation" +depends on ADK_TARGET_SYSTEM_QEMU_ARM + +config ADK_TARGET_QEMU_ARM_MODEL_SPITZ + boolean "Xscale PXA270 Spitz PDA" + select ADK_KERNEL_ARCH_PXA + select ADK_KERNEL_PXA_SHARPSL + select ADK_KERNEL_MACH_SPITZ + select ADK_KERNEL_SPI_PXA2XX + +config ADK_TARGET_QEMU_ARM_MODEL_VERSATILE + boolean "ARM Ltd. Versatile" + select ADK_KERNEL_ARCH_VERSATILE + select ADK_KERNEL_PCI + select ADK_KERNEL_BLOCK + select ADK_KERNEL_SCSI + select ADK_KERNEL_BLK_DEV_SD + select ADK_KERNEL_SCSI_SYM53C8XX_2 + +endchoice + choice prompt "Foxboard LX Model" depends on ADK_TARGET_SYSTEM_FOXBOARD_LX @@ -148,6 +171,12 @@ config ADK_TARGET_WITH_SATA config ADK_TARGET_WITH_INPUT boolean +config ADK_TARGET_WITH_SOUND + boolean + +config ADK_TARGET_WITH_TOUCHSCREEN + boolean + config ADK_TARGET_WITH_LEDS boolean @@ -157,6 +186,9 @@ config ADK_TARGET_WITH_PP config ADK_TARGET_WITH_CARDBUS boolean +config ADK_TARGET_WITH_PCMCIA + boolean + config ADK_TARGET_WITH_RTC boolean @@ -218,6 +250,19 @@ config ADK_TARGET_CPU_WITH_SSE config ADK_TARGET_CPU_WITH_SSE2 boolean +config ADK_TARGET_CPU_WITH_SSE3 + boolean + +config ADK_TARGET_CPU_WITH_SSSE3 + boolean + +config ADK_TARGET_CPU_WITH_IWMMXT + boolean + +# hyper threading +config ADK_TARGET_CPU_WITH_HT + boolean + config ADK_TARGET_CPU_WITH_3DNOW boolean @@ -225,6 +270,15 @@ config ADK_TARGET_CPU_WITH_3DNOWEXT boolean # cpu configuration +config ADK_CPU_CRIS_V10 + boolean + +config ADK_CPU_CRIS_V32 + boolean + +config ADK_CPU_SH4 + boolean + config ADK_CPU_SPARC_V8 boolean @@ -255,6 +309,9 @@ config ADK_CPU_PPC64 config ADK_CPU_PENTIUM_M boolean +config ADK_CPU_ATOM + boolean + config ADK_CPU_AMDFAM10 select ADK_TARGET_CPU_WITH_VT boolean @@ -265,6 +322,9 @@ config ADK_CPU_LOONGSON2F config ADK_CPU_ARMV5 boolean +config ADK_CPU_XSCALE + boolean + config ADK_TARGET_CPU_ARCH string default "x86_64" if ADK_CPU_X86_64 @@ -273,6 +333,7 @@ config ADK_TARGET_CPU_ARCH default "i686" if ADK_CPU_I686 default "i586" if ADK_CPU_GEODE default "i686" if ADK_CPU_PENTIUM_M + default "i686" if ADK_CPU_ATOM default "mips64" if ADK_LINUX_MIPS && ADK_big && ADK_TARGET_KERNEL64 default "mips64el" if ADK_LINUX_MIPS && ADK_little && ADK_TARGET_KERNEL64 default "mips" if ADK_LINUX_MIPS && ADK_big @@ -281,6 +342,10 @@ config ADK_TARGET_CPU_ARCH default "armeb" if ADK_LINUX_ARM && ADK_big default "avr32" if ADK_LINUX_AVR32 default "sparc" if ADK_LINUX_SPARC + default "sparc64" if ADK_LINUX_SPARC64 + default "sh" if ADK_LINUX_SH + default "cris" if ADK_CPU_CRIS_V10 + default "crisv32" if ADK_CPU_CRIS_V32 default "ppc" if ADK_CPU_PPC default "ppc64" if ADK_CPU_PPC64 @@ -303,13 +368,17 @@ config ADK_TARGET_CFLAGS default "-march=i586" if ADK_CPU_I586 default "-march=i686" if ADK_CPU_I686 default "-march=pentium-m" if ADK_CPU_PENTIUM_M + default "-march=atom" if ADK_CPU_ATOM default "-march=amdfam10" if ADK_CPU_AMDFAM10 default "-mcpu=v8" if ADK_CPU_SPARC_V8 default "-m64 -mcpu=v9" if ADK_CPU_SPARC_V9 - default "-march=loongson2f" if ADK_CPU_LOONGSON2F + default "-march=loongson2f -Wa,-mfix-loongson2f-nop" if ADK_CPU_LOONGSON2F default "-march=mips32" if ADK_CPU_MIPS32 default "-march=mips64" if ADK_CPU_MIPS64 default "-march=armv5te -mtune=arm926ej-s" if ADK_CPU_ARMV5 + default "-march=v32" if ADK_CPU_CRIS_V32 + default "-march=v10" if ADK_CPU_CRIS_V10 + default "-march=armv5te -mtune=iwmmxt" if ADK_CPU_XSCALE config ADK_TARGET_CMDLINE string @@ -318,6 +387,12 @@ 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 console=tty0" if ADK_TARGET_SYSTEM_INTEL_ATOM + default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_QEMU_I686 + default "console=ttyS0,115200 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ + default "console=ttyAMA0 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILE + default "console=ttyS0,115200 console=tty0 fbcon=rotate:1" if ADK_TARGET_SYSTEM_SHARP_ZAURUS + default "console=tty0" if ADK_TARGET_SYSTEM_QEMU_SH 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_FOXBOARD_LX @@ -424,6 +499,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS bool "initramfs filesystem" depends on \ ADK_HARDWARE_QEMU || \ + ADK_LINUX_ARM || \ ADK_LINUX_MIPS64EL || \ ADK_LINUX_PPC || \ ADK_LINUX_SPARC || \ @@ -431,6 +507,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS ADK_LINUX_X86_64 || \ ADK_LINUX_NATIVE select ADK_KERNEL_BLK_DEV_INITRD + select ADK_KERNEL_RD_XZ help create an read-only initramfs system. @@ -439,12 +516,14 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK select ADK_LINUX_INITRAMFS_BUILTIN depends on \ ADK_HARDWARE_QEMU || \ + ADK_LINUX_ARM || \ ADK_LINUX_MIPS64EL || \ ADK_LINUX_PPC || \ ADK_LINUX_SPARC || \ ADK_LINUX_X86 || \ ADK_LINUX_X86_64 || \ ADK_LINUX_NATIVE + select ADK_KERNEL_EXT2_FS help create an read-only initramfs system. @@ -475,6 +554,7 @@ config ADK_TARGET_ROOTFS_NFSROOT select ADK_KERNEL_NFS_COMMON select ADK_KERNEL_IP_PNP select ADK_KERNEL_IP_PNP_DHCP + depends on !ADK_HARDWARE_QEMU help Root filesystem mounted via NFS. (DHCP) diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk index 58bbb6a11..6c7176bf8 100644 --- a/target/config/Config.in.adk +++ b/target/config/Config.in.adk @@ -72,6 +72,13 @@ config ADK_TARGET_IP default "127.0.0.1" help +config ADK_TARGET_PORT + prompt "Set target port for make check" + string + default "2222" if ADK_HARDWARE_QEMU + default "22" + help + choice prompt "Hostsystem (do not change!)" config ADK_HOST_LINUX diff --git a/target/config/Config.in.arch.choice b/target/config/Config.in.arch.choice index 1df37ec5c..fa5646757 100644 --- a/target/config/Config.in.arch.choice +++ b/target/config/Config.in.arch.choice @@ -62,6 +62,12 @@ config ADK_LINUX_SPARC64 help Support for sparc64 systems. +config ADK_LINUX_SH + bool "superh system" + select ADK_sh + help + Support for superh systems. + config ADK_LINUX_X86 bool "x86 system" select ADK_x86 diff --git a/target/config/Config.in.arch.default b/target/config/Config.in.arch.default index 9627d051f..e254964f3 100644 --- a/target/config/Config.in.arch.default +++ b/target/config/Config.in.arch.default @@ -38,6 +38,9 @@ config ADK_sparc config ADK_sparc64 bool +config ADK_sh + bool + config ADK_x86_64 bool @@ -58,6 +61,7 @@ config ADK_TARGET_ARCH default "ppc64" if ADK_ppc64 default "sparc" if ADK_sparc default "sparc64" if ADK_sparc64 + default "sh" if ADK_sh default "x86" if ADK_x86 default "x86_64" if ADK_x86_64 default "native" if ADK_native diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index dec6f3839..2c1ccb1d1 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -3,7 +3,7 @@ config ADK_RUNTIME_HOSTNAME string "hostname for the embedded system" - default "localhost" + default "openadk" help Set your target hostname. @@ -141,3 +141,128 @@ config ADK_BINSH_ZSH Use zsh as system shell. This is probably a bad idea. endchoice + + + + + +config ADK_SIMPLE_NETWORK_CONFIG + prompt "simple network configuration" + boolean + help + Manually change network config + + WWW: http://www.openadk.org + +menu "eth0 Configuration" +depends on ADK_SIMPLE_NETWORK_CONFIG + +choice + prompt "Type" + default SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC + +config SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC + bool "NIC / DHCP" + +config SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC_MANUAL + bool "NIC / manual IP" + +config SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE_IP + bool "Bridge with IP" + +config SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE + bool "Bridge w/o IP" + +config SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NONE + bool "None" +endchoice + +config SIMPLE_NETWORK_CONFIG_ETH0_IP + depends on SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC_MANUAL || SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE_IP + string "eth0 IP Address" + default "192.168.1.2" + +config SIMPLE_NETWORK_CONFIG_ETH0_NM + depends on SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC_MANUAL || SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE_IP + string "eth0 Netmask" + default "255.255.255.0" + +config SIMPLE_NETWORK_CONFIG_ETH0_GW + depends on SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC_MANUAL + string "eth0 Gateway" + default "192.168.1.1" + +config SIMPLE_NETWORK_CONFIG_ETH0_BRIDGE + depends on SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE || SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE_IP + string "Bridge ports" + default "eth0 eth1" + +config SIMPLE_NETWORK_CONFIG_ETH0_BC + depends on SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC_MANUAL || SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE_IP + string "eth0 Broadcast" + default "+" + +endmenu + + + +menu "eth1 Configuration" +depends on ADK_SIMPLE_NETWORK_CONFIG + +choice + prompt "Type" + default SIMPLE_NETWORK_CONFIG_ETH1_TYPE_NONE + +config SIMPLE_NETWORK_CONFIG_ETH1_TYPE_NIC + bool "NIC / DHCP" + +config SIMPLE_NETWORK_CONFIG_ETH1_TYPE_NIC_MANUAL + bool "NIC / manual IP" + +config SIMPLE_NETWORK_CONFIG_ETH1_TYPE_BRIDGE_IP + bool "Bridge with IP" + +config SIMPLE_NETWORK_CONFIG_ETH1_TYPE_BRIDGE + bool "Bridge w/o IP" + +config SIMPLE_NETWORK_CONFIG_ETH1_TYPE_NONE + bool "None" +endchoice + +config SIMPLE_NETWORK_CONFIG_ETH1_IP + depends on SIMPLE_NETWORK_CONFIG_ETH1_TYPE_NIC_MANUAL || SIMPLE_NETWORK_CONFIG_ETH1_TYPE_BRIDGE_IP + string "eth1 IP Address" + default "192.168.1.2" + +config SIMPLE_NETWORK_CONFIG_ETH1_NM + depends on SIMPLE_NETWORK_CONFIG_ETH1_TYPE_NIC_MANUAL || SIMPLE_NETWORK_CONFIG_ETH1_TYPE_BRIDGE_IP + string "eth1 Netmask" + default "255.255.255.0" + +config SIMPLE_NETWORK_CONFIG_ETH1_GW + depends on SIMPLE_NETWORK_CONFIG_ETH1_TYPE_NIC_MANUAL + string "eth1 Gateway" + default "192.168.1.1" + +config SIMPLE_NETWORK_CONFIG_ETH1_BRIDGE + depends on SIMPLE_NETWORK_CONFIG_ETH1_TYPE_BRIDGE || SIMPLE_NETWORK_CONFIG_ETH1_TYPE_BRIDGE_IP + string "Bridge ports" + default "eth1 eth2" + +config SIMPLE_NETWORK_CONFIG_ETH1_BC + depends on SIMPLE_NETWORK_CONFIG_ETH1_TYPE_NIC_MANUAL || SIMPLE_NETWORK_CONFIG_ETH1_TYPE_BRIDGE_IP + string "eth1 Broadcast" + default "+" + +endmenu + + +menu "Resolver Configuration" +depends on ADK_SIMPLE_NETWORK_CONFIG + +config SIMPLE_NETWORK_CONFIG_RESOLV + string "Nameserver" + default "192.168.1.1" + +endmenu + diff --git a/target/config/Config.in.system.choice b/target/config/Config.in.system.choice index 824341983..aab311afb 100644 --- a/target/config/Config.in.system.choice +++ b/target/config/Config.in.system.choice @@ -6,5 +6,6 @@ source "target/ppc/Config.in" source "target/ppc64/Config.in" source "target/sparc/Config.in" source "target/sparc64/Config.in" +source "target/sh/Config.in" source "target/x86/Config.in" source "target/x86_64/Config.in" |