From 0be248fa9a32667d29b0eb1bad77bbd372903e61 Mon Sep 17 00:00:00 2001
From: Wolfgang Denk <wd@atlas.denx.de>
Date: Tue, 7 Mar 2006 00:22:36 +0100
Subject: [PATCH] Cleanup (get rid of debug code that sneaked in)

---
 MAKEALL                       | 6 +++---
 Makefile                      | 9 +++------
 config.mk                     | 9 ---------
 cpu/pxa/config.mk             | 1 -
 drivers/smc91111.c            | 2 +-
 include/asm-arm/global_data.h | 7 +------
 lib_arm/board.c               | 2 --
 7 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/MAKEALL b/MAKEALL
index 65b1761ee4..582357c71f 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -203,9 +203,9 @@ LIST_ARM11="	\
 
 LIST_pxa="	\
 	adsvix		cerf250		cradle		csb226		\
-	innokom		lubbock		pxa255_idp	wepep250	\
-	xaeniax		xm250		xsengine	zylonite	\
-	delta
+	delta		innokom		lubbock		pxa255_idp	\
+	wepep250	xaeniax		xm250		xsengine	\
+	zylonite							\
 "
 
 LIST_ixp="ixdp425"
diff --git a/Makefile b/Makefile
index 67eb0dc0bb..4192856a6f 100644
--- a/Makefile
+++ b/Makefile
@@ -208,9 +208,6 @@ etags:
 				net disk rtc dtt drivers drivers/sk98lin common \
 			\( -name CVS -prune \) -o \( -name '*.[ch]' -print \)`
 
-ctags:
-		ctags -Re
-
 System.map:	u-boot
 		@$(NM) $< | \
 		grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \
@@ -1644,12 +1641,12 @@ cerf250_config :	unconfig
 cradle_config	:	unconfig
 	@./mkconfig $(@:_config=) arm pxa cradle
 
-delta_config :
-	@./mkconfig $(@:_config=) arm pxa delta
-
 csb226_config	:	unconfig
 	@./mkconfig $(@:_config=) arm pxa csb226
 
+delta_config :
+	@./mkconfig $(@:_config=) arm pxa delta
+
 innokom_config	:	unconfig
 	@./mkconfig $(@:_config=) arm pxa innokom
 
diff --git a/config.mk b/config.mk
index aef099ec86..d85ac36b5e 100644
--- a/config.mk
+++ b/config.mk
@@ -131,15 +131,6 @@ else
 CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes
 endif
 
-ifdef WILD_WILD_WEST
-CFLAGS := $(CPPFLAGS) -Werror
-endif
-
-ifdef NO_JUMP
-CFLAGS := $(CPPFLAGS) -fno-schedule-insns -fno-schedule-insns2
-endif
-
-
 # avoid trigraph warnings while parsing pci.h (produced by NIOS gcc-2.9)
 # this option have to be placed behind -Wall -- that's why it is here
 ifeq ($(ARCH),nios)
diff --git a/cpu/pxa/config.mk b/cpu/pxa/config.mk
index f30a1fe1ad..fb810ca7c2 100644
--- a/cpu/pxa/config.mk
+++ b/cpu/pxa/config.mk
@@ -33,5 +33,4 @@ PLATFORM_CPPFLAGS += -march=armv5 -mtune=xscale
 #
 # ========================================================================
 PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu)
-# for gcc-3x: PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32)
 PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,))
diff --git a/drivers/smc91111.c b/drivers/smc91111.c
index 7941244f17..060da8ff2a 100644
--- a/drivers/smc91111.c
+++ b/drivers/smc91111.c
@@ -72,7 +72,7 @@
 
 #define NO_AUTOPROBE
 
-#define SMC_DEBUG 3
+#define SMC_DEBUG 0
 
 #if SMC_DEBUG > 1
 static const char version[] =
diff --git a/include/asm-arm/global_data.h b/include/asm-arm/global_data.h
index 0b6c8171ed..c2d52915a8 100644
--- a/include/asm-arm/global_data.h
+++ b/include/asm-arm/global_data.h
@@ -61,11 +61,6 @@ typedef	struct	global_data {
 #define	GD_FLG_DEVINIT	0x00002		/* Devices have been initialized	*/
 #define	GD_FLG_SILENT	0x00004		/* Silent mode				*/
 
-#undef GCC_4_SCREW_GDP
-#ifdef GCC_4_SCREW_GDP
-# define DECLARE_GLOBAL_DATA_PTR     register gd_t* volatile gd asm ("r8");
-#else
-# define DECLARE_GLOBAL_DATA_PTR     register volatile gd_t *gd asm ("r8")
-#endif
+#define DECLARE_GLOBAL_DATA_PTR     register volatile gd_t *gd asm ("r8")
 
 #endif /* __ASM_GBL_DATA_H */
diff --git a/lib_arm/board.c b/lib_arm/board.c
index 0f3a999d14..c73cf0c38f 100644
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -38,8 +38,6 @@
  * FIQ Stack: 00ebef7c
  */
 
-#define DEBUG 1
-
 #include <common.h>
 #include <command.h>
 #include <malloc.h>
-- 
2.39.5