From fcc1c1e113a98896ed1e0416090ae19f68d01586 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Tue, 26 May 2015 10:45:32 -0400 Subject: [PATCH] changed defconfig for generic_pc and x86 Change-Id: I65cc5b6fa1471e8441f3826e324dfb29783bb812 Signed-off-by: Anas Nashif --- arch/x86/configs/micro_generic_pc_defconfig | 95 +++++++++------------ arch/x86/configs/nano_generic_pc_defconfig | 79 +++++++++-------- arch/x86/defconfig | 88 ++++++++----------- 3 files changed, 121 insertions(+), 141 deletions(-) diff --git a/arch/x86/configs/micro_generic_pc_defconfig b/arch/x86/configs/micro_generic_pc_defconfig index e1b52f8dbf2..e1e82a9c20a 100644 --- a/arch/x86/configs/micro_generic_pc_defconfig +++ b/arch/x86/configs/micro_generic_pc_defconfig @@ -1,7 +1,9 @@ # # Automatically generated file; DO NOT EDIT. -# Tiny Mountain Build Options +# Tiny Mountain/x86 Configuration # +CONFIG_X86_32=y +CONFIG_ARCH_DEFCONFIG="arch/x86/defconfig" # CONFIG_NANOKERNEL is not set CONFIG_MICROKERNEL=y @@ -32,10 +34,6 @@ CONFIG_ISR_STACK_SIZE=2048 # # Microkernel Options # - -# -# Core Microkernel Options -# CONFIG_MICROKERNEL_SERVER_STACK_SIZE=1024 CONFIG_MICROKERNEL_SERVER_PRIORITY=0 CONFIG_PRIORITY_CEILING=0 @@ -43,18 +41,7 @@ CONFIG_COMMAND_STACK_SIZE=64 CONFIG_NUM_COMMAND_PACKETS=16 CONFIG_NUM_TIMER_PACKETS=10 CONFIG_NUM_TASK_PRIORITIES=16 -CONFIG_API_MEMMAP=y -CONFIG_API_MEMPOOL=y -CONFIG_API_TASKIRQ=y CONFIG_MAX_NUM_TASK_IRQS=0 -CONFIG_API_DONOTHING=y -CONFIG_API_OFFLD2FIBER=y -CONFIG_API_EVENTS=y -CONFIG_API_MAILBOX=y -CONFIG_API_MUTEX=y -CONFIG_API_FIFO=y -CONFIG_API_SEMAPHORES=y -CONFIG_API_TIMER=y # # Timer API Options @@ -62,11 +49,32 @@ CONFIG_API_TIMER=y CONFIG_TIMESLICING=y CONFIG_TIMESLICE_SIZE=0 CONFIG_TIMESLICE_PRIORITY=0 -CONFIG_API_CHANNEL=y # CONFIG_TASK_MONITOR is not set # CONFIG_ADVANCED_POWER_MANAGEMENT is not set CONFIG_PRINTK=y +# +# General Setup +# +# CONFIG_EXPERIMENTAL is not set +CONFIG_CROSS_COMPILE="" + +# +# Compile and Link Features +# +CONFIG_COMPILER_OPT="" +CONFIG_MINIMAL_LIBC=y + +# +# Debugging Options +# +# CONFIG_STDOUT_CONSOLE is not set +# CONFIG_ASSERT is not set + +# +# System Monitoring Options +# + # # x86 Core Options # @@ -87,10 +95,6 @@ CONFIG_EOI_HANDLER_SUPPORTED=y # CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set -# -# Floating Point Options -# - # # BSP General Configuration # @@ -124,10 +128,6 @@ CONFIG_CACHE_LINE_SIZE=64 # CONFIG_DYNAMIC_INT_STUBS is not set # CONFIG_PROT_MODE_SWITCH_PROMPT is not set # CONFIG_ADVANCED_IDLE_SUPPORTED is not set - -# -# Boot Sequence Options -# CONFIG_BOOTLOADER_UNKNOWN=y CONFIG_PIC=y @@ -135,6 +135,7 @@ CONFIG_PIC=y # Floating Point Options # # CONFIG_FLOAT is not set +# CONFIG_PCI is not set # CONFIG_CUSTOM_RANDOM_GENERATOR is not set CONFIG_BSP_DIR="generic_pc" @@ -155,34 +156,22 @@ CONFIG_EXTRA_SERIAL_PORT=y # CONFIG_LOAPIC is not set # -# General Setup +# Device Drivers # -CONFIG_CROSS_COMPILE="" - -# -# Debugging Options -# -# CONFIG_STDOUT_CONSOLE is not set -# CONFIG_ASSERT is not set - -# -# System Monitoring Options -# - -# -# Compile and Link Features -# -CONFIG_COMPILER_OPT="" -CONFIG_DRV_CONSOLE=y -# CONFIG_UART_INTERRUPT_DRIVEN is not set # CONFIG_CONSOLE_HANDLER is not set -CONFIG_DRV_SERIAL=y -CONFIG_DRV_NS16550=y -# CONFIG_DRV_K20_UART is not set -# CONFIG_DRV_STELLARIS_UART is not set -CONFIG_DRV_TIMER=y + +# +# Serial Drivers +# +CONFIG_NS16550=y +# CONFIG_K20_UART is not set +# CONFIG_STELLARIS_UART is not set +# CONFIG_UART_INTERRUPT_DRIVEN is not set CONFIG_PIT=y -CONFIG_DRV_INTCTL=y -# CONFIG_DRV_PCI is not set -# CONFIG_DRV_RANDOM is not set -# CONFIG_EXPERIMENTAL is not set + +# +# Random Generation Configuration +# +# CONFIG_TEST_RANDOM_GENERATOR is not set +# CONFIG_BLUETOOTH is not set +CONFIG_DEFCONFIG_LIST="$ARCH_DEFCONFIG" diff --git a/arch/x86/configs/nano_generic_pc_defconfig b/arch/x86/configs/nano_generic_pc_defconfig index 5aa3e0e0f57..54aec0127e3 100644 --- a/arch/x86/configs/nano_generic_pc_defconfig +++ b/arch/x86/configs/nano_generic_pc_defconfig @@ -1,7 +1,9 @@ # # Automatically generated file; DO NOT EDIT. -# Tiny Mountain Build Options +# Tiny Mountain/x86 Configuration # +CONFIG_X86_32=y +CONFIG_ARCH_DEFCONFIG="arch/x86/defconfig" CONFIG_NANOKERNEL=y # CONFIG_MICROKERNEL is not set @@ -30,6 +32,28 @@ CONFIG_ISR_STACK_SIZE=2048 # CONFIG_CONTEXT_CUSTOM_DATA is not set CONFIG_PRINTK=y +# +# General Setup +# +# CONFIG_EXPERIMENTAL is not set +CONFIG_CROSS_COMPILE="" + +# +# Compile and Link Features +# +CONFIG_COMPILER_OPT="" +CONFIG_MINIMAL_LIBC=y + +# +# Debugging Options +# +# CONFIG_STDOUT_CONSOLE is not set +# CONFIG_ASSERT is not set + +# +# System Monitoring Options +# + # # x86 Core Options # @@ -50,10 +74,6 @@ CONFIG_EOI_HANDLER_SUPPORTED=y # CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set -# -# Floating Point Options -# - # # BSP General Configuration # @@ -87,10 +107,6 @@ CONFIG_CACHE_LINE_SIZE=64 # CONFIG_DYNAMIC_INT_STUBS is not set # CONFIG_PROT_MODE_SWITCH_PROMPT is not set # CONFIG_ADVANCED_IDLE_SUPPORTED is not set - -# -# Boot Sequence Options -# CONFIG_BOOTLOADER_UNKNOWN=y CONFIG_PIC=y @@ -98,6 +114,7 @@ CONFIG_PIC=y # Floating Point Options # # CONFIG_FLOAT is not set +# CONFIG_PCI is not set # CONFIG_CUSTOM_RANDOM_GENERATOR is not set CONFIG_BSP_DIR="generic_pc" @@ -118,34 +135,22 @@ CONFIG_EXTRA_SERIAL_PORT=y # CONFIG_LOAPIC is not set # -# General Setup +# Device Drivers # -CONFIG_CROSS_COMPILE="" - -# -# Debugging Options -# -# CONFIG_STDOUT_CONSOLE is not set -# CONFIG_ASSERT is not set - -# -# System Monitoring Options -# - -# -# Compile and Link Features -# -CONFIG_COMPILER_OPT="" -CONFIG_DRV_CONSOLE=y -# CONFIG_UART_INTERRUPT_DRIVEN is not set # CONFIG_CONSOLE_HANDLER is not set -CONFIG_DRV_SERIAL=y -CONFIG_DRV_NS16550=y -# CONFIG_DRV_K20_UART is not set -# CONFIG_DRV_STELLARIS_UART is not set -CONFIG_DRV_TIMER=y + +# +# Serial Drivers +# +CONFIG_NS16550=y +# CONFIG_K20_UART is not set +# CONFIG_STELLARIS_UART is not set +# CONFIG_UART_INTERRUPT_DRIVEN is not set CONFIG_PIT=y -CONFIG_DRV_INTCTL=y -# CONFIG_DRV_PCI is not set -# CONFIG_DRV_RANDOM is not set -# CONFIG_EXPERIMENTAL is not set + +# +# Random Generation Configuration +# +# CONFIG_TEST_RANDOM_GENERATOR is not set +# CONFIG_BLUETOOTH is not set +CONFIG_DEFCONFIG_LIST="$ARCH_DEFCONFIG" diff --git a/arch/x86/defconfig b/arch/x86/defconfig index eb5ff78bf4d..e1e82a9c20a 100644 --- a/arch/x86/defconfig +++ b/arch/x86/defconfig @@ -1,7 +1,9 @@ # # Automatically generated file; DO NOT EDIT. -# Tiny Mountain Build Options +# Tiny Mountain/x86 Configuration # +CONFIG_X86_32=y +CONFIG_ARCH_DEFCONFIG="arch/x86/defconfig" # CONFIG_NANOKERNEL is not set CONFIG_MICROKERNEL=y @@ -39,18 +41,7 @@ CONFIG_COMMAND_STACK_SIZE=64 CONFIG_NUM_COMMAND_PACKETS=16 CONFIG_NUM_TIMER_PACKETS=10 CONFIG_NUM_TASK_PRIORITIES=16 -CONFIG_API_MEMMAP=y -CONFIG_API_MEMPOOL=y -CONFIG_API_TASKIRQ=y CONFIG_MAX_NUM_TASK_IRQS=0 -CONFIG_API_DONOTHING=y -CONFIG_API_OFFLD2FIBER=y -CONFIG_API_EVENTS=y -CONFIG_API_MAILBOX=y -CONFIG_API_MUTEX=y -CONFIG_API_FIFO=y -CONFIG_API_SEMAPHORES=y -CONFIG_API_TIMER=y # # Timer API Options @@ -58,11 +49,32 @@ CONFIG_API_TIMER=y CONFIG_TIMESLICING=y CONFIG_TIMESLICE_SIZE=0 CONFIG_TIMESLICE_PRIORITY=0 -CONFIG_API_CHANNEL=y # CONFIG_TASK_MONITOR is not set # CONFIG_ADVANCED_POWER_MANAGEMENT is not set CONFIG_PRINTK=y +# +# General Setup +# +# CONFIG_EXPERIMENTAL is not set +CONFIG_CROSS_COMPILE="" + +# +# Compile and Link Features +# +CONFIG_COMPILER_OPT="" +CONFIG_MINIMAL_LIBC=y + +# +# Debugging Options +# +# CONFIG_STDOUT_CONSOLE is not set +# CONFIG_ASSERT is not set + +# +# System Monitoring Options +# + # # x86 Core Options # @@ -83,10 +95,6 @@ CONFIG_EOI_HANDLER_SUPPORTED=y # CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set -# -# Floating Point Options -# - # # BSP General Configuration # @@ -120,10 +128,6 @@ CONFIG_CACHE_LINE_SIZE=64 # CONFIG_DYNAMIC_INT_STUBS is not set # CONFIG_PROT_MODE_SWITCH_PROMPT is not set # CONFIG_ADVANCED_IDLE_SUPPORTED is not set - -# -# Boot Sequence Options -# CONFIG_BOOTLOADER_UNKNOWN=y CONFIG_PIC=y @@ -131,6 +135,7 @@ CONFIG_PIC=y # Floating Point Options # # CONFIG_FLOAT is not set +# CONFIG_PCI is not set # CONFIG_CUSTOM_RANDOM_GENERATOR is not set CONFIG_BSP_DIR="generic_pc" @@ -151,41 +156,22 @@ CONFIG_EXTRA_SERIAL_PORT=y # CONFIG_LOAPIC is not set # -# General Setup +# Device Drivers # -CONFIG_CROSS_COMPILE="" -CONFIG_MINIMAL_LIBC=y - -# -# Debugging Options -# -# CONFIG_STDOUT_CONSOLE is not set -# CONFIG_ASSERT is not set - -# -# System Monitoring Options -# - -# -# Compile and Link Features -# -CONFIG_COMPILER_OPT="" -# CONFIG_BLUETOOTH is not set -CONFIG_DRV_CONSOLE=y -# CONFIG_UART_INTERRUPT_DRIVEN is not set # CONFIG_CONSOLE_HANDLER is not set -CONFIG_DRV_SERIAL=y -CONFIG_DRV_NS16550=y -# CONFIG_DRV_K20_UART is not set -# CONFIG_DRV_STELLARIS_UART is not set -CONFIG_DRV_TIMER=y + +# +# Serial Drivers +# +CONFIG_NS16550=y +# CONFIG_K20_UART is not set +# CONFIG_STELLARIS_UART is not set +# CONFIG_UART_INTERRUPT_DRIVEN is not set CONFIG_PIT=y -CONFIG_DRV_INTCTL=y -# CONFIG_DRV_PCI is not set -# CONFIG_DRV_RANDOM is not set # # Random Generation Configuration # # CONFIG_TEST_RANDOM_GENERATOR is not set -# CONFIG_EXPERIMENTAL is not set +# CONFIG_BLUETOOTH is not set +CONFIG_DEFCONFIG_LIST="$ARCH_DEFCONFIG"