projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Consolidate arch-specific sbrk() implementations
[platform/kernel/u-boot.git]
/
config.mk
diff --git
a/config.mk
b/config.mk
index
8d47a8e
..
8852157
100644
(file)
--- a/
config.mk
+++ b/
config.mk
@@
-83,10
+83,10
@@
RANLIB = $(CROSS_COMPILE)RANLIB
sinclude $(OBJTREE)/include/autoconf.mk
ifdef ARCH
sinclude $(OBJTREE)/include/autoconf.mk
ifdef ARCH
-sinclude $(TOPDIR)/
$(ARCH)_config.mk
# include architecture dependend rules
+sinclude $(TOPDIR)/
lib_$(ARCH)/config.mk
# include architecture dependend rules
endif
ifdef CPU
endif
ifdef CPU
-sinclude $(TOPDIR)/cpu/$(CPU)/config.mk # include CPU specific rules
+sinclude $(TOPDIR)/cpu/$(CPU)/config.mk
# include CPU specific rules
endif
ifdef SOC
sinclude $(TOPDIR)/cpu/$(CPU)/$(SOC)/config.mk # include SoC specific rules
endif
ifdef SOC
sinclude $(TOPDIR)/cpu/$(CPU)/$(SOC)/config.mk # include SoC specific rules
@@
-166,7
+166,7
@@
endif
AFLAGS := $(AFLAGS_DEBUG) -D__ASSEMBLY__ $(CPPFLAGS)
AFLAGS := $(AFLAGS_DEBUG) -D__ASSEMBLY__ $(CPPFLAGS)
-LDFLAGS += -Bstatic -T $(
LDSCRIPT)
$(PLATFORM_LDFLAGS)
+LDFLAGS += -Bstatic -T $(
obj)u-boot.lds
$(PLATFORM_LDFLAGS)
ifneq ($(TEXT_BASE),)
LDFLAGS += -Ttext $(TEXT_BASE)
endif
ifneq ($(TEXT_BASE),)
LDFLAGS += -Ttext $(TEXT_BASE)
endif
@@
-194,23
+194,25
@@
BFD_ROOT_DIR = /opt/powerpc
endif
endif
endif
endif
-ifeq ($(PCI_CLOCK),PCI_66M)
-CFLAGS := $(CFLAGS) -DPCI_66M
-endif
-
#########################################################################
#########################################################################
-export H
PATH H
OSTCC HOSTCFLAGS CROSS_COMPILE \
+export HOSTCC HOSTCFLAGS CROSS_COMPILE \
AS LD CC CPP AR NM STRIP OBJCOPY OBJDUMP MAKE
export TEXT_BASE PLATFORM_CPPFLAGS PLATFORM_RELFLAGS CPPFLAGS CFLAGS AFLAGS
#########################################################################
AS LD CC CPP AR NM STRIP OBJCOPY OBJDUMP MAKE
export TEXT_BASE PLATFORM_CPPFLAGS PLATFORM_RELFLAGS CPPFLAGS CFLAGS AFLAGS
#########################################################################
+# Allow boards to use custom optimize flags on a per dir/file basis
+BCURDIR := $(notdir $(CURDIR))
$(obj)%.s: %.S
$(obj)%.s: %.S
- $(CPP) $(AFLAGS) -o $@ $<
+ $(CPP) $(AFLAGS)
$(AFLAGS_$(@F)) $(AFLAGS_$(BCURDIR))
-o $@ $<
$(obj)%.o: %.S
$(obj)%.o: %.S
- $(CC)
$(AFLAGS) -c -o $@ $<
+ $(CC)
$(AFLAGS) $(AFLAGS_$(@F)) $(AFLAGS_$(BCURDIR)) -o $@ $< -c
$(obj)%.o: %.c
$(obj)%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $<
+ $(CC) $(CFLAGS) $(CFLAGS_$(@F)) $(CFLAGS_$(BCURDIR)) -o $@ $< -c
+$(obj)%.i: %.c
+ $(CPP) $(CFLAGS) $(CFLAGS_$(@F)) $(CFLAGS_$(BCURDIR)) -o $@ $< -c
+$(obj)%.s: %.c
+ $(CC) $(CFLAGS) $(CFLAGS_$(@F)) $(CFLAGS_$(BCURDIR)) -o $@ $< -c -S
#########################################################################
#########################################################################