diff --git a/arch/Kconfig b/arch/Kconfig index ef6850821f3..0615a53b71e 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -695,6 +695,48 @@ config ARCH_NUSER_INTERRUPTS defines the actual number of valid, mapped interrupts in g_irqmap. This number will be the new size of the OS vector table +# Bring-up debug configuration options. These are only intended for low level +# bring-up and not part of normal platform configuration. They should never be +# selected in a "normal" configuration and, hence, depend on EXPERIMENTAL + +menu "Bring-Up Options" + depends on EXPERIMENTAL + +config SUPPRESS_INTERRUPTS + bool "Suppress all interrupts" + default n + ---help--- + Do not enable interrupts + +config SUPPRESS_TIMER_INTS + bool "No timer" + default n + ---help--- + Do not initialize or enable the system timer + +config SUPPRESS_SERIAL_INTS + bool "Suppress serial interrupts" + default n + ---help--- + Console will poll + +config SUPPRESS_UART_CONFIG + bool "Do no re-configure UART" + default n + ---help--- + Do not re-configure the serial console UART from its start-up state. + This is useful when a boot loader has already initialized the serial + port. + +config DUMP_ON_EXIT + bool "Dump task state" + default n + depends on DEBUG_SCHED_INFO + ---help--- + Dump task state on exit() + +endmenu # Bring-Up Options + comment "Board Settings" config BOARD_LOOPSPERMSEC diff --git a/arch/arm/src/common/up_internal.h b/arch/arm/src/common/up_internal.h index 49879dd9be6..cd15068aaf7 100644 --- a/arch/arm/src/common/up_internal.h +++ b/arch/arm/src/common/up_internal.h @@ -1,7 +1,7 @@ /**************************************************************************** * common/up_internal.h * - * Copyright (C) 2007-2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2015, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -52,21 +52,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* Bring-up debug configurations. These are here (vs defconfig) - * because these should only be controlled during low level - * board bring-up and not part of normal platform configuration. - */ - -#undef CONFIG_SUPPRESS_INTERRUPTS /* DEFINED: Do not enable interrupts */ -#undef CONFIG_SUPPRESS_TIMER_INTS /* DEFINED: No timer */ -#undef CONFIG_SUPPRESS_SERIAL_INTS /* DEFINED: Console will poll */ -#undef CONFIG_SUPPRESS_UART_CONFIG /* DEFINED: Do not reconfig UART */ -#undef CONFIG_DUMP_ON_EXIT /* DEFINED: Dump task state on exit */ - -#ifndef CONFIG_DEBUG_SCHED_INFO -# undef CONFIG_DUMP_ON_EXIT /* Needs CONFIG_DEBUG_SCHED_INFO */ -#endif - /* Determine which (if any) console driver to use. If a console is enabled * and no other console device is specified, then a serial console is * assumed. diff --git a/arch/avr/src/common/up_internal.h b/arch/avr/src/common/up_internal.h index ded50aec534..aed4da811be 100644 --- a/arch/avr/src/common/up_internal.h +++ b/arch/avr/src/common/up_internal.h @@ -1,7 +1,7 @@ /**************************************************************************** * arch/avr/src/common/up_internal.h * - * Copyright (C) 2010-2011, 2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2010-2011, 2015, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -56,21 +56,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* Bring-up debug configurations. These are here (vs defconfig) - * because these should only be controlled during low level - * board bring-up and not part of normal platform configuration. - */ - -#undef CONFIG_SUPPRESS_INTERRUPTS /* DEFINED: Do not enable interrupts */ -#undef CONFIG_SUPPRESS_TIMER_INTS /* DEFINED: No timer */ -#undef CONFIG_SUPPRESS_SERIAL_INTS /* DEFINED: Console will poll */ -#undef CONFIG_SUPPRESS_UART_CONFIG /* DEFINED: Do not reconfig UART */ -#undef CONFIG_DUMP_ON_EXIT /* DEFINED: Dump task state on exit */ - -#ifndef CONFIG_DEBUG_SCHED_INFO -# undef CONFIG_DUMP_ON_EXIT /* Needs CONFIG_DEBUG_SCHED_INFO */ -#endif - /* Check if an interrupt stack size is configured */ #ifndef CONFIG_ARCH_INTERRUPTSTACK diff --git a/arch/hc/src/common/up_internal.h b/arch/hc/src/common/up_internal.h index f6f79a9c42d..6ed1e51b67c 100644 --- a/arch/hc/src/common/up_internal.h +++ b/arch/hc/src/common/up_internal.h @@ -1,7 +1,8 @@ /**************************************************************************** * arch/hc/src/common/up_internal.h * - * Copyright (C) 2009, 2011-2013, 2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2009, 2011-2013, 2015, 2018 Gregory Nutt. All rights + * reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -51,21 +52,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* Bring-up debug configurations. These are here (vs defconfig) - * because these should only be controlled during low level - * board bring-up and not part of normal platform configuration. - */ - -#undef CONFIG_SUPPRESS_INTERRUPTS /* DEFINED: Do not enable interrupts */ -#undef CONFIG_SUPPRESS_TIMER_INTS /* DEFINED: No timer */ -#undef CONFIG_SUPPRESS_SERIAL_INTS /* DEFINED: Console will poll */ -#undef CONFIG_SUPPRESS_UART_CONFIG /* DEFINED: Do not reconfig UART */ -#undef CONFIG_DUMP_ON_EXIT /* DEFINED: Dump task state on exit */ - -#ifndef CONFIG_DEBUG_SCHED_INFO -# undef CONFIG_DUMP_ON_EXIT /* Needs CONFIG_DEBUG_SCHED_INFO */ -#endif - /* Determine which (if any) console driver to use. If a console is enabled * and no other console device is specified, then a serial console is * assumed. diff --git a/arch/mips/src/common/up_internal.h b/arch/mips/src/common/up_internal.h index 39ba820682e..a456e3d72f5 100644 --- a/arch/mips/src/common/up_internal.h +++ b/arch/mips/src/common/up_internal.h @@ -1,7 +1,7 @@ /**************************************************************************** * arch/mips/common/up_internal.h * - * Copyright (C) 2011, 2012, 2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2011, 2012, 2015, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -49,21 +49,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* Bring-up debug configurations. These are here (vs defconfig) - * because these should only be controlled during low level - * board bring-up and not part of normal platform configuration. - */ - -#undef CONFIG_SUPPRESS_INTERRUPTS /* DEFINED: Do not enable interrupts */ -#undef CONFIG_SUPPRESS_TIMER_INTS /* DEFINED: No timer */ -#undef CONFIG_SUPPRESS_SERIAL_INTS /* DEFINED: Console will poll */ -#undef CONFIG_SUPPRESS_UART_CONFIG /* DEFINED: Do not reconfig UART */ -#undef CONFIG_DUMP_ON_EXIT /* DEFINED: Dump task state on exit */ - -#ifndef CONFIG_DEBUG_SCHED_INFO -# undef CONFIG_DUMP_ON_EXIT /* Needs CONFIG_DEBUG_SCHED_INFO */ -#endif - /* Determine which (if any) console driver to use. If a console is enabled * and no other console device is specified, then a serial console is * assumed. diff --git a/arch/or1k/src/common/up_internal.h b/arch/or1k/src/common/up_internal.h index 05a964f8032..c00bcf6fa66 100644 --- a/arch/or1k/src/common/up_internal.h +++ b/arch/or1k/src/common/up_internal.h @@ -52,21 +52,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* Bring-up debug configurations. These are here (vs defconfig) - * because these should only be controlled during low level - * board bring-up and not part of normal platform configuration. - */ - -#undef CONFIG_SUPPRESS_INTERRUPTS /* DEFINED: Do not enable interrupts */ -#undef CONFIG_SUPPRESS_TIMER_INTS /* DEFINED: No timer */ -#undef CONFIG_SUPPRESS_SERIAL_INTS /* DEFINED: Console will poll */ -#undef CONFIG_SUPPRESS_UART_CONFIG /* DEFINED: Do not reconfig UART */ -#undef CONFIG_DUMP_ON_EXIT /* DEFINED: Dump task state on exit */ - -#ifndef CONFIG_DEBUG_SCHED_INFO -# undef CONFIG_DUMP_ON_EXIT /* Needs CONFIG_DEBUG_SCHED_INFO */ -#endif - /* Determine which (if any) console driver to use. If a console is enabled * and no other console device is specified, then a serial console is * assumed. diff --git a/arch/renesas/src/common/up_internal.h b/arch/renesas/src/common/up_internal.h index 99bc1188181..ba9cdeecadf 100644 --- a/arch/renesas/src/common/up_internal.h +++ b/arch/renesas/src/common/up_internal.h @@ -1,7 +1,8 @@ /**************************************************************************** * arch/renesas/src/common/up_internal.h * - * Copyright (C) 2008-2009, 2012-2013, 2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2012-2013, 2015, 2018 Gregory Nutt. All + * rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -51,17 +52,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* Bring-up debug configurations. These are here (vs defconfig) - * because these should only be controlled during low level - * board bring-up and not part of normal platform configuration. - */ - -#undef CONFIG_SUPPRESS_INTERRUPTS /* DEFINED: Do not enable interrupts */ -#undef CONFIG_SUPPRESS_TIMER_INTS /* DEFINED: No timer */ -#undef CONFIG_SUPPRESS_SERIAL_INTS /* DEFINED: Console will poll */ -#undef CONFIG_SUPPRESS_SCI_CONFIG /* DEFINED: Do not reconfig SCI */ -#undef CONFIG_DUMP_ON_EXIT /* DEFINED: Dump task state on exit */ - /* Determine which (if any) console driver to use. NOTE that the naming * implies that the console is a serial driver. That is usually the case, * however, if no UARTs are enabled, the console could als be provided diff --git a/arch/x86/src/common/up_internal.h b/arch/x86/src/common/up_internal.h index 4d1c4bfe3d8..f9bf7a2dfa9 100644 --- a/arch/x86/src/common/up_internal.h +++ b/arch/x86/src/common/up_internal.h @@ -1,7 +1,7 @@ /**************************************************************************** * arch/x86/src/common/up_internal.h * - * Copyright (C) 2011-2013, 2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2011-2013, 2015, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -51,21 +51,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* Bring-up debug configurations. These are here (vs defconfig) because - * these should only be controlled during low level board bring-up and not - * part of normal platform configuration. - */ - -#undef CONFIG_SUPPRESS_INTERRUPTS /* DEFINED: Do not enable interrupts */ -#undef CONFIG_SUPPRESS_TIMER_INTS /* DEFINED: No timer */ -#undef CONFIG_SUPPRESS_SERIAL_INTS /* DEFINED: Console will poll */ -#undef CONFIG_SUPPRESS_UART_CONFIG /* DEFINED: Do not reconfig UART */ -#undef CONFIG_DUMP_ON_EXIT /* DEFINED: Dump task state on exit */ - -#ifndef CONFIG_DEBUG_SCHED_INFO -# undef CONFIG_DUMP_ON_EXIT /* Needs CONFIG_DEBUG_SCHED_INFO */ -#endif - /* Determine which (if any) console driver to use. If a console is enabled * and no other console device is specified, then a serial console is * assumed. diff --git a/arch/xtensa/src/common/xtensa.h b/arch/xtensa/src/common/xtensa.h index 133903d1941..506ac82a7d1 100644 --- a/arch/xtensa/src/common/xtensa.h +++ b/arch/xtensa/src/common/xtensa.h @@ -1,7 +1,7 @@ /**************************************************************************** * arch/xtensa/common/xtensa.h * - * Copyright (C) 2016 Gregory Nutt. All rights reserved. + * Copyright (C) 2016, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -52,22 +52,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* Bring-up debug configurations. These are here (vs Kconfig) - * because these should only be controlled during low level - * board bring-up and not part of normal platform configuration. - */ - -#undef CONFIG_SUPPRESS_INTERRUPTS /* DEFINED: Do not enable interrupts */ -#undef CONFIG_SUPPRESS_TIMER_INTS /* DEFINED: No timer */ -#undef CONFIG_SUPPRESS_SERIAL_INTS /* DEFINED: Console will poll */ -#undef CONFIG_SUPPRESS_UART_CONFIG /* DEFINED: Do not reconfigure UART */ -#define CONFIG_SUPPRESS_CLOCK_CONFIG 1 /* DEFINED: Do not reconfigure clocking */ -#undef CONFIG_DUMP_ON_EXIT /* DEFINED: Dump task state on exit */ - -#ifndef CONFIG_DEBUG_SCHED_INFO -# undef CONFIG_DUMP_ON_EXIT /* Needs CONFIG_DEBUG_SCHED_INFO */ -#endif - /* Determine which (if any) console driver to use. If a console is enabled * and no other console device is specified, then a serial console is * assumed. diff --git a/arch/z16/src/common/up_internal.h b/arch/z16/src/common/up_internal.h index caf7bf826ef..7e547587688 100644 --- a/arch/z16/src/common/up_internal.h +++ b/arch/z16/src/common/up_internal.h @@ -1,7 +1,8 @@ /**************************************************************************** * arch/z16/src/common/up_internal.h * - * Copyright (C) 2008-2009, 2011-2013, 2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011-2013, 2015, 2-18 Gregory Nutt. All + * rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -52,18 +53,9 @@ * board bring-up and not part of normal platform configuration. */ -#undef CONFIG_SUPPRESS_INTERRUPTS /* Do not enable interrupts */ -#undef CONFIG_SUPPRESS_TIMER_INTS /* No timer */ -#undef CONFIG_SUPPRESS_SERIAL_INTS /* Console will poll */ -#undef CONFIG_SUPPRESS_UART_CONFIG /* Do not reconfig UART */ -#undef CONFIG_DUMP_ON_EXIT /* Dump task state on exit */ #undef CONFIG_Z16_LOWPUTC /* Support up_lowputc for debug */ #undef CONFIG_Z16_LOWGETC /* support z16_lowgetc for debug */ -#ifndef CONFIG_DEBUG_SCHED_INFO -# undef CONFIG_DUMP_ON_EXIT /* Needs CONFIG_DEBUG_SCHED_INFO */ -#endif - /* Determine which (if any) console driver to use. If a console is enabled * and no other console device is specified, then a serial console is * assumed. diff --git a/arch/z80/src/common/up_internal.h b/arch/z80/src/common/up_internal.h index 3bfc829da3e..5e19c08a62b 100644 --- a/arch/z80/src/common/up_internal.h +++ b/arch/z80/src/common/up_internal.h @@ -1,7 +1,8 @@ /**************************************************************************** * arch/z80/src/common/up_internal.h * - * Copyright (C) 2007-2009, 2015, 2017 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2015, 2017-2018 Gregory Nutt. All rights + * reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -36,25 +37,6 @@ #ifndef __ARCH_Z80_SRC_COMMON_UP_INTERNAL_H #define __ARCH_Z80_SRC_COMMON_UP_INTERNAL_H -/**************************************************************************** - * Conditional Compilation - ****************************************************************************/ - -/* Bring-up debug configurations. These are here (vs defconfig) - * because these should only be controlled during low level - * board bring-up and not part of normal platform configuration. - */ - -#undef CONFIG_SUPPRESS_INTERRUPTS /* Do not enable interrupts */ -#undef CONFIG_SUPPRESS_TIMER_INTS /* No timer */ -#undef CONFIG_SUPPRESS_SERIAL_INTS /* Console will poll */ -#undef CONFIG_SUPPRESS_UART_CONFIG /* Do not reconfig UART */ -#undef CONFIG_DUMP_ON_EXIT /* Dump task state on exit */ - -#ifndef CONFIG_DEBUG_SCHED_INFO -# undef CONFIG_DUMP_ON_EXIT /* Needs CONFIG_DEBUG_SCHED_INFO */ -#endif - /**************************************************************************** * Included Files ****************************************************************************/ diff --git a/configs/esp32-core/nsh/defconfig b/configs/esp32-core/nsh/defconfig index 69ffc560400..09f55cb114a 100644 --- a/configs/esp32-core/nsh/defconfig +++ b/configs/esp32-core/nsh/defconfig @@ -14,6 +14,7 @@ CONFIG_DISABLE_POLL=y CONFIG_ESP32_UART0=y CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_SYSTEM_NSH=y +CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y @@ -41,5 +42,6 @@ CONFIG_SPI=y CONFIG_START_DAY=6 CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 +CONFIG_SUPPRESS_CLOCK_CONFIG=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/configs/esp32-core/ostest/defconfig b/configs/esp32-core/ostest/defconfig index f93a12a0ad6..3b9c275686e 100644 --- a/configs/esp32-core/ostest/defconfig +++ b/configs/esp32-core/ostest/defconfig @@ -11,6 +11,7 @@ CONFIG_ESP32_UART0=y CONFIG_EXAMPLES_OSTEST_LOOPS=10 CONFIG_EXAMPLES_OSTEST_STACKSIZE=6114 CONFIG_EXAMPLES_OSTEST=y +CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y @@ -36,5 +37,6 @@ CONFIG_START_DAY=6 CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_READLINE=y +CONFIG_SUPPRESS_CLOCK_CONFIG=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="ostest_main" diff --git a/configs/esp32-core/smp/defconfig b/configs/esp32-core/smp/defconfig index 38eb035bf8f..b1ffb00f6ea 100644 --- a/configs/esp32-core/smp/defconfig +++ b/configs/esp32-core/smp/defconfig @@ -12,6 +12,7 @@ CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y CONFIG_ESP32_UART0=y +CONFIG_EXPERIMENTAL=y CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_SYSTEM_NSH=y CONFIG_EXAMPLES_SMP=y @@ -44,5 +45,6 @@ CONFIG_SPI=y CONFIG_START_DAY=6 CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 +CONFIG_SUPPRESS_CLOCK_CONFIG=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main"