From d510cab95851721a4568a7641b1f76c4726ef35b Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Sun, 13 Sep 2015 18:35:58 -0400 Subject: [PATCH] arm/x86: update defconfig Use fragments instead of full defconfig Change-Id: I558d3bfa709bbea874ac3362a659252f24aca834 Signed-off-by: Anas Nashif --- arch/arm/defconfig | 171 +++--------------------------------- arch/x86/defconfig | 212 +++------------------------------------------ 2 files changed, 24 insertions(+), 359 deletions(-) diff --git a/arch/arm/defconfig b/arch/arm/defconfig index 02a9568cb87..c85eb6d72e4 100644 --- a/arch/arm/defconfig +++ b/arch/arm/defconfig @@ -1,163 +1,14 @@ -# -# Automatically generated file; DO NOT EDIT. -# Zephyr Kernel/arm Configuration -# -CONFIG_ARM=y -CONFIG_ARCH_DEFCONFIG="arch/arm/defconfig" -# CONFIG_NANOKERNEL is not set CONFIG_MICROKERNEL=y - -# -# General Kernel Options -# -CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 -CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 -CONFIG_SYS_CLOCK_EXISTS=y -# CONFIG_INIT_STACKS is not set -CONFIG_XIP=y -# CONFIG_ENHANCED_SECURITY is not set -# CONFIG_RING_BUFFER is not set -# CONFIG_EVENT_LOGGER is not set -# CONFIG_KERNEL_PROFILER is not set - -# -# Nanokernel Options -# -# CONFIG_BOOT_BANNER is not set -CONFIG_MAIN_STACK_SIZE=1024 -CONFIG_ISR_STACK_SIZE=2048 -# CONFIG_THREAD_CUSTOM_DATA is not set -# CONFIG_NANO_TIMEOUTS is not set -# CONFIG_NANO_TIMERS is not set - -# -# Microkernel Options -# -CONFIG_MICROKERNEL_SERVER_STACK_SIZE=1024 -CONFIG_MICROKERNEL_SERVER_PRIORITY=0 -CONFIG_PRIORITY_CEILING=0 -CONFIG_COMMAND_STACK_SIZE=64 -CONFIG_NUM_COMMAND_PACKETS=16 -CONFIG_NUM_TIMER_PACKETS=10 -CONFIG_NUM_TASK_PRIORITIES=16 -CONFIG_MAX_NUM_TASK_IRQS=0 - -# -# Timer API Options -# -CONFIG_TIMESLICING=y -CONFIG_TIMESLICE_SIZE=0 -CONFIG_TIMESLICE_PRIORITY=0 -# CONFIG_TASK_MONITOR is not set -# CONFIG_OBJECT_MONITOR is not set -# CONFIG_THREAD_MONITOR is not set -# CONFIG_ADVANCED_POWER_MANAGEMENT is not set - -# -# General Setup -# -# CONFIG_EXPERIMENTAL is not set - -# -# Cryptography -# -# CONFIG_TINYCRYPT is not set - -# -# Compile and Link Features -# CONFIG_KERNEL_BIN_NAME="microkernel" -CONFIG_CROSS_COMPILE="" -# CONFIG_GDB_INFO is not set -CONFIG_COMPILER_OPT="" -CONFIG_TOOLCHAIN_VARIANT="" -CONFIG_MINIMAL_LIBC=y -# CONFIG_NEWLIB_LIBC is not set - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_EARLY_CONSOLE is not set -# CONFIG_ASSERT is not set - -# -# Boot Options -# -# CONFIG_BOOTLOADER_UNKNOWN is not set - -# -# General Platform Configuration -# -CONFIG_PLATFORM_FSL_FRDM_K64F=y -# CONFIG_PLATFORM_TI_LM3S6965 is not set -CONFIG_ISA_THUMB2=y -CONFIG_CPU_CORTEX=y -CONFIG_CPU_CORTEX_M=y -CONFIG_CPU_CORTEX_M3_M4=y -CONFIG_CPU_CORTEX_M4=y - -# -# ARM Cortex-M options -# -CONFIG_LDREX_STREX_AVAILABLE=y -CONFIG_DATA_ENDIANNESS_LITTLE=y -CONFIG_STACK_ALIGN_DOUBLE_WORD=y -CONFIG_STACK_GROWS_DOWN=y -CONFIG_NUM_IRQ_PRIO_BITS=4 -# CONFIG_RUNTIME_NMI is not set -CONFIG_FAULT_DUMP=2 -CONFIG_SRAM_SIZE=192 -CONFIG_SRAM_BASE_ADDRESS=0x20000000 -CONFIG_FLASH_SIZE=1024 -CONFIG_FLASH_BASE_ADDRESS=0x00000000 - -# -# ARM Cortex-M3/M4 options -# -CONFIG_SW_ISR_TABLE=y -CONFIG_SW_ISR_TABLE_DYNAMIC=y -CONFIG_IRQ_VECTOR_TABLE_PLATFORM=y -# CONFIG_ZERO_LATENCY_IRQS is not set -CONFIG_ARCH_HAS_TASK_ABORT=y -CONFIG_ARCH_HAS_NANO_FIBER_ABORT=y -CONFIG_PLATFORM="fsl_frdm_k64f" -CONFIG_NUM_IRQS=34 -CONFIG_WDOG_INIT=y - -# -# Device Drivers -# -# CONFIG_UART_SIMPLE is not set -# CONFIG_CONSOLE is not set -# CONFIG_SERIAL is not set -# CONFIG_GPIO is not set - -# -# Interrupt Controllers -# - -# -# Timer Drivers -# +CONFIG_ARM=y +CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=12000000 +CONFIG_PLATFORM_TI_LM3S6965=y +CONFIG_CONSOLE=y +CONFIG_UART_CONSOLE=y +CONFIG_UART_CONSOLE_INDEX=0 +CONFIG_UART_CONSOLE_BAUDRATE=115200 +CONFIG_SERIAL=y CONFIG_CORTEX_M_SYSTICK=y - -# -# Random Generation Configuration -# -# CONFIG_RANDOM_GENERATOR is not set -# CONFIG_TEST_RANDOM_GENERATOR is not set -# CONFIG_SPI is not set - -# -# I2C -# -# CONFIG_I2C is not set -# CONFIG_DW_I2C is not set - -# -# Networking -# -# CONFIG_BLUETOOTH is not set -# CONFIG_NETWORKING is not set -CONFIG_DEFCONFIG_LIST="$ARCH_DEFCONFIG" +CONFIG_FLASH_SIZE=256 +CONFIG_SRAM_SIZE=64 +CONFIG_STELLARIS_UART=y diff --git a/arch/x86/defconfig b/arch/x86/defconfig index 0e54d3050fd..d038e4978e6 100644 --- a/arch/x86/defconfig +++ b/arch/x86/defconfig @@ -1,204 +1,18 @@ -# -# Automatically generated file; DO NOT EDIT. -# Zephyr Kernel/x86 Configuration -# -CONFIG_X86_32=y -CONFIG_ARCH_DEFCONFIG="arch/x86/defconfig" -# CONFIG_NANOKERNEL is not set CONFIG_MICROKERNEL=y - -# -# General Kernel Options -# -CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 -CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 -CONFIG_SYS_CLOCK_EXISTS=y -# CONFIG_INIT_STACKS is not set -# CONFIG_XIP is not set -CONFIG_ENHANCED_SECURITY=y -# CONFIG_RING_BUFFER is not set -# CONFIG_EVENT_LOGGER is not set -# CONFIG_KERNEL_PROFILER is not set - -# -# Security Options -# -# CONFIG_CUSTOM_SECURITY is not set -# CONFIG_STACK_CANARIES is not set - -# -# Nanokernel Options -# -# CONFIG_BOOT_BANNER is not set -CONFIG_MAIN_STACK_SIZE=1024 -CONFIG_ISR_STACK_SIZE=2048 -# CONFIG_THREAD_CUSTOM_DATA is not set -# CONFIG_NANO_TIMEOUTS is not set -# CONFIG_NANO_TIMERS is not set - -# -# Microkernel Options -# -CONFIG_MICROKERNEL_SERVER_STACK_SIZE=1024 -CONFIG_MICROKERNEL_SERVER_PRIORITY=0 -CONFIG_PRIORITY_CEILING=0 -CONFIG_COMMAND_STACK_SIZE=64 -CONFIG_NUM_COMMAND_PACKETS=16 -CONFIG_NUM_TIMER_PACKETS=10 -CONFIG_NUM_TASK_PRIORITIES=16 -CONFIG_MAX_NUM_TASK_IRQS=0 - -# -# Timer API Options -# -CONFIG_TIMESLICING=y -CONFIG_TIMESLICE_SIZE=0 -CONFIG_TIMESLICE_PRIORITY=0 -# CONFIG_TASK_MONITOR is not set -# CONFIG_OBJECT_MONITOR is not set -# CONFIG_THREAD_MONITOR is not set -# CONFIG_ADVANCED_POWER_MANAGEMENT is not set - -# -# General Setup -# -# CONFIG_EXPERIMENTAL is not set - -# -# Cryptography -# -# CONFIG_TINYCRYPT is not set - -# -# Compile and Link Features -# CONFIG_KERNEL_BIN_NAME="microkernel" -CONFIG_CROSS_COMPILE="" -# CONFIG_GDB_INFO is not set -CONFIG_COMPILER_OPT="" -CONFIG_TOOLCHAIN_VARIANT="" -CONFIG_MINIMAL_LIBC=y -# CONFIG_NEWLIB_LIBC is not set - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_EARLY_CONSOLE is not set -# CONFIG_ASSERT is not set - -# -# Boot Options -# -# CONFIG_BOOTLOADER_KEXEC is not set -CONFIG_BOOTLOADER_UNKNOWN=y -# CONFIG_PROT_MODE_SWITCH is not set - -# -# General Platform Configuration -# -CONFIG_PLATFORM_IA32_PCI=y -# CONFIG_PLATFORM_IA32 is not set -# CONFIG_CPU_ATOM is not set +CONFIG_X86_32=y +CONFIG_PLATFORM_IA32=y CONFIG_CPU_MINUTEIA=y -# CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set - -# -# Platform Capabilities -# -# CONFIG_ADVANCED_IDLE_SUPPORTED is not set -# CONFIG_BOI_HANDLER_SUPPORTED is not set -CONFIG_EOI_HANDLER_SUPPORTED=y -# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set -# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set -CONFIG_NUM_DYNAMIC_STUBS=0 -# CONFIG_PIC_DISABLE is not set - -# -# Processor Capabilities -# -CONFIG_ISA_IA32=y -# CONFIG_CMOV is not set -CONFIG_CPU_FLOAT_UNSUPPORTED=y -CONFIG_CPU_SSE_UNSUPPORTED=y -CONFIG_CACHE_LINE_SIZE=0 - -# -# x86 Core Options -# -# CONFIG_NO_ISRS is not set -# CONFIG_NO_NESTED_INTERRUPTS is not set - -# -# Memory Layout Options -# -CONFIG_IDT_NUM_VECTORS=256 -CONFIG_NUM_GDT_SPARE_ENTRIES=0 -CONFIG_PHYS_LOAD_ADDR=0x00100000 -CONFIG_PLATFORM="ia32_pci" -CONFIG_UART_CONSOLE_INDEX=1 - -# -# I2C drivers -# -# CONFIG_DW_I2C0 is not set - -# -# Device Drivers -# -# CONFIG_UART_SIMPLE is not set -# CONFIG_CONSOLE is not set -# CONFIG_SERIAL is not set -# CONFIG_GPIO is not set - -# -# Interrupt Controllers -# -CONFIG_LOAPIC=y -# CONFIG_LOAPIC_DEBUG is not set -CONFIG_LOAPIC_BASE_ADDRESS=0xFEE00000 -CONFIG_IOAPIC=y -# CONFIG_IOAPIC_DEBUG is not set -CONFIG_IOAPIC_BASE_ADDRESS=0xFEC00000 -CONFIG_IOAPIC_NUM_RTES=24 - -# -# Timer Drivers -# CONFIG_HPET_TIMER=y -# CONFIG_HPET_TIMER_LEGACY_EMULATION is not set -CONFIG_HPET_TIMER_BASE_ADDRESS=0xFED00000 -CONFIG_HPET_TIMER_IRQ=20 -CONFIG_HPET_TIMER_IRQ_PRIORITY=4 -CONFIG_HPET_TIMER_FALLING_EDGE=y -# CONFIG_HPET_TIMER_RISING_EDGE is not set -# CONFIG_HPET_TIMER_LEVEL_HIGH is not set -# CONFIG_HPET_TIMER_LEVEL_LOW is not set -# CONFIG_LOAPIC_TIMER is not set +CONFIG_HPET_TIMER_IRQ=2 +CONFIG_HPET_TIMER_LEVEL_LOW=n +CONFIG_HPET_TIMER_LEGACY_EMULATION=y +CONFIG_HPET_TIMER_RISING_EDGE=n +CONFIG_PIC_DISABLE=y +CONFIG_LOAPIC=y +CONFIG_CONSOLE=y +CONFIG_SERIAL=y +CONFIG_NS16550=y +CONFIG_UART_CONSOLE=y +CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 -# -# Random Generation Configuration -# -# CONFIG_RANDOM_GENERATOR is not set -# CONFIG_TEST_RANDOM_GENERATOR is not set - -# -# PCI Settings -# -CONFIG_PCI=y -CONFIG_PCI_ENUMERATION=y -# CONFIG_PCI_DEBUG is not set -# CONFIG_SPI is not set - -# -# I2C -# -# CONFIG_I2C is not set -# CONFIG_DW_I2C is not set - -# -# Networking -# -# CONFIG_BLUETOOTH is not set -# CONFIG_NETWORKING is not set -CONFIG_DEFCONFIG_LIST="$ARCH_DEFCONFIG"