Remove the "#undef DEBUG" and other DEBUG_xxx lines from all board header files. The inclusion of this line makes it impossible to enable debug code in other source files, because "#define DEBUG" typically needs to be defined before any header files are included.

Signed-off-by: Timur Tabi timur@freescale.com --- include/configs/AP1000.h | 2 -- include/configs/BAB7xx.h | 1 - include/configs/EB+MCF-EV123.h | 1 - include/configs/ELPPC.h | 1 - include/configs/IP860.h | 1 - include/configs/IPHASE4539.h | 2 -- include/configs/M5235EVB.h | 2 -- include/configs/M5271EVB.h | 2 -- include/configs/M5329EVB.h | 2 -- include/configs/M54455EVB.h | 2 -- include/configs/MPC8323ERDB.h | 2 -- include/configs/MPC832XEMDS.h | 2 -- include/configs/MPC8349EMDS.h | 2 -- include/configs/MPC8360EMDS.h | 2 -- include/configs/MPC8360ERDK.h | 2 -- include/configs/MPC837XEMDS.h | 2 -- include/configs/MPC8540EVAL.h | 2 -- include/configs/MVBLUE.h | 2 -- include/configs/QS823.h | 4 ---- include/configs/QS850.h | 4 ---- include/configs/QS860T.h | 4 ---- include/configs/Rattler.h | 2 -- include/configs/ads5121.h | 1 - include/configs/assabet.h | 2 -- include/configs/ep8248.h | 2 -- include/configs/ep82xxm.h | 2 -- include/configs/gcplus.h | 2 -- include/configs/gw8260.h | 4 ---- include/configs/mgcoge.h | 2 -- include/configs/mpc7448hpc2.h | 2 -- include/configs/ms7722se.h | 1 - include/configs/ms7750se.h | 1 - include/configs/ppmc7xx.h | 1 - include/configs/pxa255_idp.h | 7 ------- include/configs/sacsng.h | 4 ---- include/configs/sbc8260.h | 4 ---- include/configs/sbc8349.h | 2 -- 37 files changed, 0 insertions(+), 83 deletions(-)

diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h index d490b33..baa9741 100644 --- a/include/configs/AP1000.h +++ b/include/configs/AP1000.h @@ -22,8 +22,6 @@ * (easy to change) */

-#undef DEBUG - #define CONFIG_405 1 /* This is a PPC405 CPU */ #define CONFIG_4xx 1 /* ...member of PPC4xx family */

diff --git a/include/configs/BAB7xx.h b/include/configs/BAB7xx.h index c11e9c9..8ec70aa 100644 --- a/include/configs/BAB7xx.h +++ b/include/configs/BAB7xx.h @@ -28,7 +28,6 @@ #ifndef __CONFIG_H #define __CONFIG_H

-#undef DEBUG #define GTREGREAD(x) 0xffffffff /* needed for debug */

/* diff --git a/include/configs/EB+MCF-EV123.h b/include/configs/EB+MCF-EV123.h index dae5295..6e0269b 100644 --- a/include/configs/EB+MCF-EV123.h +++ b/include/configs/EB+MCF-EV123.h @@ -27,7 +27,6 @@

#define CONFIG_EB_MCF_EV123

-#undef DEBUG #undef CFG_HALT_BEFOR_RAM_JUMP #undef ET_DEBUG

diff --git a/include/configs/ELPPC.h b/include/configs/ELPPC.h index bb77188..c64537f 100644 --- a/include/configs/ELPPC.h +++ b/include/configs/ELPPC.h @@ -28,7 +28,6 @@ #ifndef __CONFIG_H #define __CONFIG_H

-#undef DEBUG #define GTREGREAD(x) 0xffffffff /* needed for debug */

/* diff --git a/include/configs/IP860.h b/include/configs/IP860.h index bd961d8..d2c2ee5 100644 --- a/include/configs/IP860.h +++ b/include/configs/IP860.h @@ -189,7 +189,6 @@ #undef CFG_ENV_IS_IN_FLASH #undef CFG_ENV_IS_IN_NVRAM #undef CFG_ENV_IS_IN_NVRAM -#undef DEBUG_I2C #define CFG_ENV_IS_IN_EEPROM

#ifdef CFG_ENV_IS_IN_NVRAM diff --git a/include/configs/IPHASE4539.h b/include/configs/IPHASE4539.h index 6fee455..bb2c96a 100644 --- a/include/configs/IPHASE4539.h +++ b/include/configs/IPHASE4539.h @@ -30,8 +30,6 @@ #ifndef __CONFIG_H #define __CONFIG_H

-#undef DEBUG /* General debug */ - /*----------------------------------------------------------------------- * High Level Configuration Options * (easy to change) diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index 7f544c8..3b4bff3 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -37,8 +37,6 @@ #define CONFIG_MCF523x /* define processor family */ #define CONFIG_M5235 /* define processor type */

-#undef DEBUG - #define CONFIG_MCFUART #define CFG_UART_PORT (0) #define CONFIG_BAUDRATE 115200 diff --git a/include/configs/M5271EVB.h b/include/configs/M5271EVB.h index 798ec0c..47e1e03 100644 --- a/include/configs/M5271EVB.h +++ b/include/configs/M5271EVB.h @@ -31,8 +31,6 @@ #ifndef _M5271EVB_H #define _M5271EVB_H

-#undef DEBUG - /* * High Level Configuration Options (easy to change) */ diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 47d74a3..914ef38 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -37,8 +37,6 @@ #define CONFIG_MCF532x /* define processor family */ #define CONFIG_M5329 /* define processor type */

-#undef DEBUG - #define CONFIG_MCFUART #define CFG_UART_PORT (0) #define CONFIG_BAUDRATE 115200 diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index 211f11d..6697fb5 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -38,8 +38,6 @@ #define CONFIG_M54455 /* define processor type */ #define CONFIG_M54455EVB /* M54455EVB board */

-#undef DEBUG - #define CONFIG_MCFUART #define CFG_UART_PORT (0) #define CONFIG_BAUDRATE 115200 diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index 4ea8709..0e33fce 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_H #define __CONFIG_H

-#undef DEBUG - /* * High Level Configuration Options */ diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index 25ac58c..8cf0a5b 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -20,8 +20,6 @@ #ifndef __CONFIG_H #define __CONFIG_H

-#undef DEBUG - /* * High Level Configuration Options */ diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 437a9a5..2c6534c 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -29,8 +29,6 @@ #ifndef __CONFIG_H #define __CONFIG_H

-#undef DEBUG - /* * High Level Configuration Options */ diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h index fdacb90..310d03f 100644 --- a/include/configs/MPC8360EMDS.h +++ b/include/configs/MPC8360EMDS.h @@ -22,8 +22,6 @@ #ifndef __CONFIG_H #define __CONFIG_H

-#undef DEBUG - /* * High Level Configuration Options */ diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h index 0f6f8f1..72d36c1 100644 --- a/include/configs/MPC8360ERDK.h +++ b/include/configs/MPC8360ERDK.h @@ -17,8 +17,6 @@ #ifndef __CONFIG_H #define __CONFIG_H

-#undef DEBUG - /* * High Level Configuration Options */ diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 2b84e9c..61de084 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -21,8 +21,6 @@ #ifndef __CONFIG_H #define __CONFIG_H

-#undef DEBUG - /* * High Level Configuration Options */ diff --git a/include/configs/MPC8540EVAL.h b/include/configs/MPC8540EVAL.h index 2868dcb..330615a 100644 --- a/include/configs/MPC8540EVAL.h +++ b/include/configs/MPC8540EVAL.h @@ -238,8 +238,6 @@ #define INTEL_LXT971_PHY 1 #endif

-#undef DEBUG - /* Environment */ #ifndef CFG_RAMBOOT #if defined(CONFIG_RAM_AS_FLASH) diff --git a/include/configs/MVBLUE.h b/include/configs/MVBLUE.h index 0defafe..d799f54 100644 --- a/include/configs/MVBLUE.h +++ b/include/configs/MVBLUE.h @@ -53,8 +53,6 @@ #define ERR_LED(code) #endif

-#undef DEBUG - #define CONFIG_MPC824X 1 #define CONFIG_MPC8245 1 #define CONFIG_MVBLUE 1 diff --git a/include/configs/QS823.h b/include/configs/QS823.h index 3657fea..fdf0e01 100644 --- a/include/configs/QS823.h +++ b/include/configs/QS823.h @@ -38,10 +38,6 @@ #undef CFG_DEVICE_NULLDEV /* null device */ #undef CONFIG_SILENT_CONSOLE /* silent console */ #undef CFG_CONSOLE_INFO_QUIET /* silent console ? */ -#undef DEBUG /* debug output code */ -#undef DEBUG_FLASH /* debug flash code */ -#undef FLASH_DEBUG /* debug fash code */ -#undef DEBUG_ENV /* debug environment code */

#define CFG_DIRECT_FLASH_TFTP 1 /* allow direct tftp to flash */ #define CONFIG_ENV_OVERWRITE 1 /* allow overwrite MAC address */ diff --git a/include/configs/QS850.h b/include/configs/QS850.h index 3db539f..4e7eea1 100644 --- a/include/configs/QS850.h +++ b/include/configs/QS850.h @@ -38,10 +38,6 @@ #undef CFG_DEVICE_NULLDEV /* null device */ #undef CONFIG_SILENT_CONSOLE /* silent console */ #undef CFG_CONSOLE_INFO_QUIET /* silent console ? */ -#undef DEBUG /* debug output code */ -#undef DEBUG_FLASH /* debug flash code */ -#undef FLASH_DEBUG /* debug fash code */ -#undef DEBUG_ENV /* debug environment code */

#define CFG_DIRECT_FLASH_TFTP 1 /* allow direct tftp to flash */ #define CONFIG_ENV_OVERWRITE 1 /* allow overwrite MAC address */ diff --git a/include/configs/QS860T.h b/include/configs/QS860T.h index b3442de..ff2e39e 100644 --- a/include/configs/QS860T.h +++ b/include/configs/QS860T.h @@ -38,10 +38,6 @@ #undef CFG_DEVICE_NULLDEV /* null device */ #undef CONFIG_SILENT_CONSOLE /* silent console */ #undef CFG_CONSOLE_INFO_QUIET /* silent console ? */ -#undef DEBUG /* debug output code */ -#undef DEBUG_FLASH /* debug flash code */ -#undef FLASH_DEBUG /* debug fash code */ -#undef DEBUG_ENV /* debug environment code */

#define CFG_DIRECT_FLASH_TFTP 1 /* allow direct tftp to flash */ #define CONFIG_ENV_OVERWRITE 1 /* allow overwrite MAC address */ diff --git a/include/configs/Rattler.h b/include/configs/Rattler.h index d7652fa..428c0c2 100644 --- a/include/configs/Rattler.h +++ b/include/configs/Rattler.h @@ -37,8 +37,6 @@

#define CONFIG_RATTLER /* Analogue&Micro Rattler board */

-#undef DEBUG - /* Allow serial number (serial#) and MAC address (ethaddr) to be overwritten */ #define CONFIG_ENV_OVERWRITE

diff --git a/include/configs/ads5121.h b/include/configs/ads5121.h index a4de552..681b81b 100644 --- a/include/configs/ads5121.h +++ b/include/configs/ads5121.h @@ -28,7 +28,6 @@ #define __CONFIG_H

#define DEBUG -#undef DEBUG

/* * Memory map for the ADS5121 board: diff --git a/include/configs/assabet.h b/include/configs/assabet.h index 226ad54..d10f092 100644 --- a/include/configs/assabet.h +++ b/include/configs/assabet.h @@ -29,8 +29,6 @@ #ifndef __CONFIG_H #define __CONFIG_H

-#undef DEBUG - /* * High Level Configuration Options * (easy to change) diff --git a/include/configs/ep8248.h b/include/configs/ep8248.h index 85ad70a..cebe849 100644 --- a/include/configs/ep8248.h +++ b/include/configs/ep8248.h @@ -31,8 +31,6 @@

#define CONFIG_EP8248 /* Embedded Planet EP8248 board */

-#undef DEBUG - #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */

/* Allow serial number (serial#) and MAC address (ethaddr) to be overwritten */ diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h index 4febd32..8e5d6e5 100644 --- a/include/configs/ep82xxm.h +++ b/include/configs/ep82xxm.h @@ -31,8 +31,6 @@ #define CONFIG_EP82XXM /* Embedded Planet EP82xxM H 1.0 board */ /* 256MB SDRAM / 64MB FLASH */

-#undef DEBUG - #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */

/* Allow serial number (serial#) and MAC address (ethaddr) to be overwritten */ diff --git a/include/configs/gcplus.h b/include/configs/gcplus.h index e11ce4c..3b1b4ab 100644 --- a/include/configs/gcplus.h +++ b/include/configs/gcplus.h @@ -29,8 +29,6 @@ #ifndef __CONFIG_H #define __CONFIG_H

-#undef DEBUG - /* * The ADS GCPlus Linux boot ROM loads U-Boot into RAM at 0xc0200000. * We don't actually init RAM in this case since we're using U-Boot as diff --git a/include/configs/gw8260.h b/include/configs/gw8260.h index ff57240..401b5cf 100644 --- a/include/configs/gw8260.h +++ b/include/configs/gw8260.h @@ -50,10 +50,6 @@ #ifndef __CONFIG_H #define __CONFIG_H

-/* Enable debug prints */ -#undef DEBUG /* General debug */ -#undef DEBUG_BOOTP_EXT /* Debug received vendor fields */ - /* What is the oscillator's (UX2) frequency in Hz? */ #define CONFIG_8260_CLKIN (66 * 1000 * 1000)

diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h index 3de2466..f4a1cc0 100644 --- a/include/configs/mgcoge.h +++ b/include/configs/mgcoge.h @@ -35,8 +35,6 @@

#define CONFIG_CPM2 1 /* Has a CPM2 */

-#undef DEBUG - /* * Select serial console configuration * diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h index bd3107a..c7216c9 100644 --- a/include/configs/mpc7448hpc2.h +++ b/include/configs/mpc7448hpc2.h @@ -33,8 +33,6 @@ #ifndef __CONFIG_H #define __CONFIG_H

-#undef DEBUG - /* Board Configuration Definitions */ /* MPC7448HPC2 (High-Performance Computing II) (Taiga) board */

diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h index ae0d018..8538037 100644 --- a/include/configs/ms7722se.h +++ b/include/configs/ms7722se.h @@ -25,7 +25,6 @@ #ifndef __MS7722SE_H #define __MS7722SE_H

-#undef DEBUG #define CONFIG_SH 1 #define CONFIG_SH4 1 #define CONFIG_CPU_SH7722 1 diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h index 3668156..a25364d 100644 --- a/include/configs/ms7750se.h +++ b/include/configs/ms7750se.h @@ -25,7 +25,6 @@ #ifndef __MS7750SE_H #define __MS7750SE_H

-#undef DEBUG #define CONFIG_SH 1 #define CONFIG_SH4 1 #define CONFIG_CPU_SH7750 1 diff --git a/include/configs/ppmc7xx.h b/include/configs/ppmc7xx.h index fe7de7b..1d2d38b 100644 --- a/include/configs/ppmc7xx.h +++ b/include/configs/ppmc7xx.h @@ -30,7 +30,6 @@ * do_bdinfo - Required to build with debug */

-#undef DEBUG #ifdef DEBUG #define GTREGREAD(x) 0xFFFFFFFF #define do_bdinfo(a,b,c,d) diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h index 4a9cadb..56a9b35 100644 --- a/include/configs/pxa255_idp.h +++ b/include/configs/pxa255_idp.h @@ -45,13 +45,6 @@ #undef CONFIG_SKIP_RELOCATE_UBOOT /* define for developing */

/* - * define the following to enable debug blinks. A debug blink function - * must be defined in memsetup.S - */ -#undef DEBUG_BLINK_ENABLE -#undef DEBUG_BLINKC_ENABLE - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h index c474acd..4a64b2e 100644 --- a/include/configs/sacsng.h +++ b/include/configs/sacsng.h @@ -35,9 +35,6 @@ #ifndef __CONFIG_H #define __CONFIG_H

-#undef DEBUG /* General debug */ -#undef DEBUG_BOOTP_EXT /* Debug received vendor fields */ - #undef CONFIG_LOGBUFFER /* External logbuffer support */

/***************************************************************************** @@ -257,7 +254,6 @@ */ #define CONFIG_SOFT_SPI /* Enable SPI driver */ #define MAX_SPI_BYTES 4 /* Maximum number of bytes we can handle */ -#undef DEBUG_SPI /* Disable SPI debugging */

/* * Software (bit-bang) SPI driver configuration diff --git a/include/configs/sbc8260.h b/include/configs/sbc8260.h index b1d41a6..9739b3a 100644 --- a/include/configs/sbc8260.h +++ b/include/configs/sbc8260.h @@ -35,10 +35,6 @@ #ifndef __CONFIG_H #define __CONFIG_H

-/* Enable debug prints */ -#undef DEBUG /* General debug */ -#undef DEBUG_BOOTP_EXT /* Debug received vendor fields */ - /***************************************************************************** * * These settings must match the way _your_ board is set up diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index 4cc4ff1..2498b3e 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -31,8 +31,6 @@ #ifndef __CONFIG_H #define __CONFIG_H

-#undef DEBUG - /* * High Level Configuration Options */