summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@atlas.denx.de>2006-03-07 00:22:36 +0100
committerWolfgang Denk <wd@atlas.denx.de>2006-03-07 00:22:36 +0100
commit0be248fa9a32667d29b0eb1bad77bbd372903e61 (patch)
tree8e32a9e044f0e8a9a39436936b304ac1a2786cc1
parent951a954b77ef30df1f5c1b7b9b4312e783b2cbb4 (diff)
Cleanup (get rid of debug code that sneaked in)
-rwxr-xr-xMAKEALL6
-rw-r--r--Makefile9
-rw-r--r--config.mk9
-rw-r--r--cpu/pxa/config.mk1
-rw-r--r--drivers/smc91111.c2
-rw-r--r--include/asm-arm/global_data.h7
-rw-r--r--lib_arm/board.c2
7 files changed, 8 insertions, 28 deletions
diff --git a/MAKEALL b/MAKEALL
index 65b1761ee47..582357c71fb 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 67eb0dc0bbc..4192856a6fe 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 aef099ec866..d85ac36b5e6 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 f30a1fe1ad8..fb810ca7c26 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 7941244f17a..060da8ff2aa 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 0b6c8171edc..c2d52915a85 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 0f3a999d140..c73cf0c38fb 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>