mirror of
https://github.com/apache/nuttx.git
synced 2026-06-05 15:22:18 +08:00
Rename CONFIG_DEBUG to CONFIG_DEBUG_FEATURES
This commit is contained in:
+1
-1
@@ -86,7 +86,7 @@ EXTERN FAR struct binfmt_s *g_binfmts;
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_BINFMT)
|
||||
#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_BINFMT)
|
||||
int dump_module(FAR const struct binary_s *bin);
|
||||
#else
|
||||
# define dump_module(bin)
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
|
||||
#include "binfmt.h"
|
||||
|
||||
#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_BINFMT) && !defined(CONFIG_BINFMT_DISABLE)
|
||||
#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_BINFMT) && !defined(CONFIG_BINFMT_DISABLE)
|
||||
|
||||
/****************************************************************************
|
||||
* Pre-processor Definitions
|
||||
|
||||
@@ -147,7 +147,7 @@ int exec_module(FAR const struct binary_s *binp)
|
||||
|
||||
/* Sanity checking */
|
||||
|
||||
#ifdef CONFIG_DEBUG
|
||||
#ifdef CONFIG_DEBUG_FEATURES
|
||||
if (!binp || !binp->entrypt || binp->stacksize <= 0)
|
||||
{
|
||||
err = EINVAL;
|
||||
|
||||
@@ -180,7 +180,7 @@ int load_module(FAR struct binary_s *bin)
|
||||
|
||||
/* Verify that we were provided something to work with */
|
||||
|
||||
#ifdef CONFIG_DEBUG
|
||||
#ifdef CONFIG_DEBUG_FEATURES
|
||||
if (bin && bin->filename)
|
||||
#endif
|
||||
{
|
||||
|
||||
+3
-3
@@ -60,7 +60,7 @@
|
||||
* Pre-processor Definitions
|
||||
****************************************************************************/
|
||||
|
||||
/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
|
||||
/* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
|
||||
* defined or CONFIG_ELF_DUMPBUFFER does nothing.
|
||||
*/
|
||||
|
||||
@@ -87,7 +87,7 @@
|
||||
****************************************************************************/
|
||||
|
||||
static int elf_loadbinary(FAR struct binary_s *binp);
|
||||
#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_BINFMT)
|
||||
#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_BINFMT)
|
||||
static void elf_dumploadinfo(FAR struct elf_loadinfo_s *loadinfo);
|
||||
#endif
|
||||
|
||||
@@ -110,7 +110,7 @@ static struct binfmt_s g_elfbinfmt =
|
||||
* Name: elf_dumploadinfo
|
||||
****************************************************************************/
|
||||
|
||||
#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_BINFMT)
|
||||
#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_BINFMT)
|
||||
static void elf_dumploadinfo(FAR struct elf_loadinfo_s *loadinfo)
|
||||
{
|
||||
int i;
|
||||
|
||||
@@ -35,7 +35,7 @@ config ELF_BUFFERINCR
|
||||
config ELF_DUMPBUFFER
|
||||
bool "Dump ELF buffers"
|
||||
default n
|
||||
depends on DEBUG && CONFIG_DEBUG_INFO
|
||||
depends on DEBUG_FEATURES && CONFIG_DEBUG_INFO
|
||||
---help---
|
||||
Dump various ELF buffers for debug purposes
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
* Pre-processor Definitions
|
||||
****************************************************************************/
|
||||
|
||||
/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
|
||||
/* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
|
||||
* defined or CONFIG_ELF_DUMPBUFFER does nothing.
|
||||
*/
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
* Pre-processor Definitions
|
||||
****************************************************************************/
|
||||
|
||||
/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
|
||||
/* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
|
||||
* defined or CONFIG_ELF_DUMPBUFFER does nothing.
|
||||
*/
|
||||
|
||||
|
||||
@@ -6,4 +6,4 @@
|
||||
config NXFLAT_DUMPBUFFER
|
||||
bool "Dump NXFLAT buffers"
|
||||
default n
|
||||
depends on DEBUG && CONFIG_DEBUG_INFO
|
||||
depends on DEBUG_FEATURES && CONFIG_DEBUG_INFO
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
* Pre-processor Definitions
|
||||
****************************************************************************/
|
||||
|
||||
/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
|
||||
/* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
|
||||
* defined or CONFIG_NXFLAT_DUMPBUFFER does nothing.
|
||||
*/
|
||||
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
* Pre-processor Definitions
|
||||
****************************************************************************/
|
||||
|
||||
/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
|
||||
/* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
|
||||
* defined or CONFIG_NXFLAT_DUMPBUFFER does nothing.
|
||||
*/
|
||||
|
||||
|
||||
@@ -64,6 +64,6 @@ endif # PCODE_TEST_FS
|
||||
config PCODE_DUMPBUFFER
|
||||
bool "Dump P-code buffers"
|
||||
default n
|
||||
depends on DEBUG && CONFIG_DEBUG_INFO
|
||||
depends on DEBUG_FEATURES && CONFIG_DEBUG_INFO
|
||||
---help---
|
||||
Dump various P-code buffers for debug purposes
|
||||
|
||||
@@ -96,7 +96,7 @@ Here is a simple test configuration using the NuttX simulator:
|
||||
|
||||
Debug options can also be enabled with:
|
||||
|
||||
CONFIG_DEBUG=y
|
||||
CONFIG_DEBUG_FEATURES=y
|
||||
CONFIG_DEBUG_BINFMT=y
|
||||
CONFIG_DEBUG_INFO=y
|
||||
|
||||
|
||||
+3
-3
@@ -56,7 +56,7 @@
|
||||
* Pre-processor Definitions
|
||||
****************************************************************************/
|
||||
|
||||
/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
|
||||
/* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
|
||||
* defined or CONFIG_NXFLAT_DUMPBUFFER does nothing.
|
||||
*/
|
||||
|
||||
@@ -79,7 +79,7 @@
|
||||
****************************************************************************/
|
||||
|
||||
static int nxflat_loadbinary(struct binary_s *binp);
|
||||
#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_BINFMT)
|
||||
#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_BINFMT)
|
||||
static void nxflat_dumploadinfo(struct nxflat_loadinfo_s *loadinfo);
|
||||
#endif
|
||||
|
||||
@@ -102,7 +102,7 @@ static struct binfmt_s g_nxflatbinfmt =
|
||||
* Name: nxflat_dumploadinfo
|
||||
****************************************************************************/
|
||||
|
||||
#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_BINFMT)
|
||||
#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_BINFMT)
|
||||
static void nxflat_dumploadinfo(struct nxflat_loadinfo_s *loadinfo)
|
||||
{
|
||||
unsigned long dsize = loadinfo->datasize + loadinfo->bsssize;
|
||||
|
||||
Reference in New Issue
Block a user