diff options
Diffstat (limited to 'target/config')
| -rw-r--r-- | target/config/Config.in | 97 | ||||
| -rw-r--r-- | target/config/Config.in.runtime | 14 |
2 files changed, 64 insertions, 47 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index c3512a71f..ee6aaa695 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -188,9 +188,6 @@ config ADK_TARGET_LIBC_PATH || ADK_LINUX_X86_64 default "lib" - -# submodel support - config ADK_TARGET_KERNEL_MINICONFIG string default "qemu-microblaze-s3adsp1800" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 @@ -222,6 +219,63 @@ config ADK_QEMU_ARGS default "-nographic" if ADK_TARGET_QEMU_WITHOUT_GRAPHIC choice +prompt "Qemu MICROBLAZE Emulation" +depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE || ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL + +config ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 + boolean "Xilinx ml605" + select ADK_TARGET_WITH_MTD + +config ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 + boolean "Xilinx Spartan S3ADSP1800" + +endchoice + +choice +prompt "Qemu ARM Emulation" +depends on ADK_TARGET_SYSTEM_QEMU_ARM || ADK_TARGET_SYSTEM_QEMU_ARMHF + +config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 + boolean "ARM Ltd. Versatile Express for Cortex-A9" + select ADK_CPU_CORTEX_A9 + +config ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB + boolean "ARM Ltd. Versatile/PB" + select ADK_soft_float + select ADK_eabi + select ADK_CPU_ARM926EJ_S + depends on ADK_TARGET_SYSTEM_QEMU_ARM + +config ADK_TARGET_QEMU_ARM_MODEL_SPITZ + boolean "Xscale PXA270 Spitz PDA" + select ADK_soft_float + select ADK_eabi + select ADK_CPU_XSCALE + select ADK_TARGET_WITH_VGA + depends on ADK_TARGET_SYSTEM_QEMU_ARM + +endchoice + +choice +prompt "Qemu Emulation with permanent storage device (disk/flash)" +depends on ADK_HARDWARE_QEMU + +config ADK_TARGET_QEMU_WITHOUT_BLOCK + boolean "disabled" + +config ADK_TARGET_QEMU_WITH_BLOCK + boolean "enabled" + select ADK_KERNEL_SCSI_SYM53C8XX_2 if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB + select ADK_KERNEL_MTD_M25P80 if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 + select ADK_KERNEL_ATA_PIIX if ADK_LINUX_MIPS || ADK_TARGET_SYSTEM_QEMU_I686 + select ADK_KERNEL_PATA_MACIO if ADK_TARGET_SYSTEM_QEMU_PPC + select ADK_KERNEL_SCSI_IBMVSCSI if ADK_TARGET_SYSTEM_QEMU_PPC64 + select ADK_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC + select ADK_KERNEL_PATA_PLATFORM if ADK_LINUX_SH + +endchoice + +choice prompt "Qemu Emulation with graphical output" depends on ADK_HARDWARE_QEMU @@ -265,43 +319,6 @@ config ADK_TARGET_QEMU_WITHOUT_VIRTIO endchoice -choice -prompt "Qemu MICROBLAZE Emulation" -depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE || ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL - -config ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 - boolean "Xilinx ml605" - select ADK_TARGET_WITH_MTD - -config ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 - boolean "Xilinx Spartan S3ADSP1800" - -endchoice - -choice -prompt "Qemu ARM Emulation" -depends on ADK_TARGET_SYSTEM_QEMU_ARM || ADK_TARGET_SYSTEM_QEMU_ARMHF - -config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 - boolean "ARM Ltd. Versatile Express for Cortex-A9" - select ADK_CPU_CORTEX_A9 - -config ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB - boolean "ARM Ltd. Versatile/PB" - select ADK_soft_float - select ADK_eabi - select ADK_CPU_ARM926EJ_S - depends on ADK_TARGET_SYSTEM_QEMU_ARM - -config ADK_TARGET_QEMU_ARM_MODEL_SPITZ - boolean "Xscale PXA270 Spitz PDA" - select ADK_soft_float - select ADK_eabi - select ADK_CPU_XSCALE - select ADK_TARGET_WITH_VGA - depends on ADK_TARGET_SYSTEM_QEMU_ARM - -endchoice choice prompt "Use ARM thumb mode" diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 7848a25ce..cb0929822 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -159,14 +159,14 @@ 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" + default SIMPLE_NETWORK_CONFIG_ETH0_TYPE_MANUAL config SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC_MANUAL bool "NIC / manual IP" +config SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC + bool "NIC / DHCP" + config SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE_IP bool "Bridge with IP" @@ -180,7 +180,7 @@ 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" + default "10.0.2.15" config SIMPLE_NETWORK_CONFIG_ETH0_NM depends on SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC_MANUAL || SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE_IP @@ -190,7 +190,7 @@ config SIMPLE_NETWORK_CONFIG_ETH0_NM config SIMPLE_NETWORK_CONFIG_ETH0_GW depends on SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC_MANUAL string "eth0 Gateway" - default "192.168.1.1" + default "10.0.2.2" config SIMPLE_NETWORK_CONFIG_ETH0_BRIDGE depends on SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE || SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE_IP @@ -282,7 +282,7 @@ depends on ADK_SIMPLE_NETWORK_CONFIG config SIMPLE_NETWORK_CONFIG_RESOLV string "Nameserver" - default "192.168.1.1" + default "10.0.2.3" endmenu |