[kbuild] change architecture Makefiles not to overwrite
CFLAGS, instead append them to the existing CFLAGS. Also, remove all double CFLAGS
This commit is contained in:
parent
dabec3a7a1
commit
878f38de8f
|
@ -20,7 +20,7 @@ cpu-$(CONFIG_ARM926EJS) := arm926ejs
|
||||||
TEXT_BASE = $(CONFIG_TEXT_BASE)
|
TEXT_BASE = $(CONFIG_TEXT_BASE)
|
||||||
|
|
||||||
CPPFLAGS += -mabi=apcs-gnu -DTEXT_BASE=$(TEXT_BASE) -P
|
CPPFLAGS += -mabi=apcs-gnu -DTEXT_BASE=$(TEXT_BASE) -P
|
||||||
CFLAGS := -fno-common -msoft-float -Os
|
CFLAGS += -msoft-float -Os
|
||||||
|
|
||||||
# Add cleanup flags
|
# Add cleanup flags
|
||||||
CPPFLAGS += -fdata-sections -ffunction-sections
|
CPPFLAGS += -fdata-sections -ffunction-sections
|
||||||
|
|
|
@ -9,7 +9,7 @@ cpu-$(CONFIG_BF561) := bf561
|
||||||
TEXT_BASE = $(CONFIG_TEXT_BASE)
|
TEXT_BASE = $(CONFIG_TEXT_BASE)
|
||||||
|
|
||||||
CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -P
|
CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -P
|
||||||
CFLAGS := -fno-common -Os -D__blackfin__
|
CFLAGS += -Os -D__blackfin__
|
||||||
# -Ttext $(TEXT_BASE)
|
# -Ttext $(TEXT_BASE)
|
||||||
KALLSYMS += --symbol-prefix=_
|
KALLSYMS += --symbol-prefix=_
|
||||||
|
|
||||||
|
|
|
@ -41,9 +41,8 @@ TEXT_BASE = $(CONFIG_TEXT_BASE)
|
||||||
CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -P
|
CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -P
|
||||||
AFLAGS += -gdwarf-2 -save-temps
|
AFLAGS += -gdwarf-2 -save-temps
|
||||||
# FIXME - remove overide
|
# FIXME - remove overide
|
||||||
CFLAGS := -Wall -Wundef -Wstrict-prototypes \
|
CFLAGS += -msoft-float -mcfv4e -gdwarf-2 -feliminate-unused-debug-types \
|
||||||
-msoft-float -mcfv4e -gdwarf-2 -feliminate-unused-debug-types \
|
-fmerge-all-constants -Os
|
||||||
-fmerge-all-constants -Os
|
|
||||||
# Incompatible code in U-Boot for -std=c99
|
# Incompatible code in U-Boot for -std=c99
|
||||||
LDFLAGS_uboot :=-L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
|
LDFLAGS_uboot :=-L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
|
||||||
# --verbose --stats
|
# --verbose --stats
|
||||||
|
|
|
@ -15,7 +15,7 @@ cpu-$(CONFIG_ARCH_MPC5200) := mpc5xxx
|
||||||
TEXT_BASE = $(CONFIG_TEXT_BASE)
|
TEXT_BASE = $(CONFIG_TEXT_BASE)
|
||||||
|
|
||||||
CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -P
|
CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -P
|
||||||
CFLAGS := -fno-common -Os
|
CFLAGS += -Os
|
||||||
|
|
||||||
ifeq ($(incdir-y),)
|
ifeq ($(incdir-y),)
|
||||||
incdir-y := $(machine-y)
|
incdir-y := $(machine-y)
|
||||||
|
|
|
@ -11,7 +11,7 @@ lds-y := arch/sandbox/lib/u-boot.lds
|
||||||
TEXT_BASE = $(CONFIG_TEXT_BASE)
|
TEXT_BASE = $(CONFIG_TEXT_BASE)
|
||||||
|
|
||||||
CPPFLAGS += -P
|
CPPFLAGS += -P
|
||||||
CFLAGS := -fno-common -Os -Dmalloc=u_boot_malloc \
|
CFLAGS += -Os -Dmalloc=u_boot_malloc \
|
||||||
-Dfree=u_boot_free -Drealloc=u_boot_realloc \
|
-Dfree=u_boot_free -Drealloc=u_boot_realloc \
|
||||||
-Dread=u_boot_read -Dwrite=u_boot_write \
|
-Dread=u_boot_read -Dwrite=u_boot_write \
|
||||||
-Dopen=u_boot_open -Dclose=u_boot_close \
|
-Dopen=u_boot_open -Dclose=u_boot_close \
|
||||||
|
|
Loading…
Reference in New Issue