From 7681d868badf6f5775256ded3d2ec8593221a5c9 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Tue, 3 Jun 2008 12:26:51 +0200
Subject: [kbuild] move -Os flag from architecture Makefiles to toplevel       
   Makefile

---
 arch/arm/Makefile      | 2 +-
 arch/blackfin/Makefile | 2 +-
 arch/m68k/Makefile     | 2 +-
 arch/ppc/Makefile      | 1 -
 arch/sandbox/Makefile  | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'arch')

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 211100c6dd..4280fe0c61 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -20,7 +20,7 @@ cpu-$(CONFIG_ARM926EJS)            := arm926ejs
 TEXT_BASE = $(CONFIG_TEXT_BASE)
 
 CPPFLAGS += -mabi=apcs-gnu -DTEXT_BASE=$(TEXT_BASE) -P
-CFLAGS += -msoft-float -Os
+CFLAGS += -msoft-float
 
 # Add cleanup flags
 CPPFLAGS += -fdata-sections -ffunction-sections
diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile
index f84d76643d..a8b23ed00e 100644
--- a/arch/blackfin/Makefile
+++ b/arch/blackfin/Makefile
@@ -9,7 +9,7 @@ cpu-$(CONFIG_BF561)		:= bf561
 TEXT_BASE = $(CONFIG_TEXT_BASE)
 
 CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -P
-CFLAGS += -Os -D__blackfin__
+CFLAGS += -D__blackfin__
 # -Ttext $(TEXT_BASE)
 KALLSYMS         += --symbol-prefix=_
 
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 995c160ee8..f568a8b26c 100644
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -42,7 +42,7 @@ CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -P
 AFLAGS += -gdwarf-2 -save-temps
 # FIXME - remove overide
 CFLAGS += -msoft-float -mcfv4e -gdwarf-2 -feliminate-unused-debug-types \
-	-fmerge-all-constants -Os
+	-fmerge-all-constants
 # Incompatible code in U-Boot for -std=c99
 LDFLAGS_uboot  :=-L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
 #  --verbose --stats
diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index 230d4146de..99dafb21c8 100644
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -15,7 +15,6 @@ cpu-$(CONFIG_ARCH_MPC5200)			:= mpc5xxx
 TEXT_BASE = $(CONFIG_TEXT_BASE)
 
 CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -P
-CFLAGS += -Os
 
 ifeq ($(incdir-y),)
 incdir-y := $(machine-y)
diff --git a/arch/sandbox/Makefile b/arch/sandbox/Makefile
index b1ed283745..19a41fd7aa 100644
--- a/arch/sandbox/Makefile
+++ b/arch/sandbox/Makefile
@@ -11,7 +11,7 @@ lds-y   := arch/sandbox/lib/u-boot.lds
 TEXT_BASE = $(CONFIG_TEXT_BASE)
 
 CPPFLAGS += -P
-CFLAGS += -Os -Dmalloc=u_boot_malloc \
+CFLAGS += -Dmalloc=u_boot_malloc \
 		-Dfree=u_boot_free -Drealloc=u_boot_realloc \
 		-Dread=u_boot_read -Dwrite=u_boot_write \
 		-Dopen=u_boot_open -Dclose=u_boot_close \
-- 
cgit v1.2.3