projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: move bootfile init into eth_initialize
[oweals/u-boot.git]
/
arch
/
x86
/
lib
/
Makefile
diff --git
a/arch/x86/lib/Makefile
b/arch/x86/lib/Makefile
index 71e94f76f37d9e60df3fbd525e3c40bc03d33117..51836dacca5823b4cc64fbdb04c54c9a8d3f8e4e 100644
(file)
--- a/
arch/x86/lib/Makefile
+++ b/
arch/x86/lib/Makefile
@@
-25,23
+25,29
@@
include $(TOPDIR)/config.mk
LIB = $(obj)lib$(ARCH).o
LIB = $(obj)lib$(ARCH).o
-SOBJS-
y
+= bios.o
-SOBJS-
y
+= bios_pci.o
-SOBJS-
y
+= realmode_switch.o
+SOBJS-
$(CONFIG_SYS_PC_BIOS)
+= bios.o
+SOBJS-
$(CONFIG_SYS_PCI_BIOS)
+= bios_pci.o
+SOBJS-
$(CONFIG_SYS_X86_REALMODE)
+= realmode_switch.o
-COBJS-
y
+= bios_setup.o
+COBJS-
$(CONFIG_SYS_PC_BIOS)
+= bios_setup.o
COBJS-y += board.o
COBJS-y += bootm.o
COBJS-y += board.o
COBJS-y += bootm.o
+COBJS-y += cmd_boot.o
+COBJS-y += gcc.o
+COBJS-y += init_helpers.o
+COBJS-y += init_wrappers.o
COBJS-y += interrupts.o
COBJS-$(CONFIG_SYS_PCAT_INTERRUPTS) += pcat_interrupts.o
COBJS-$(CONFIG_SYS_GENERIC_TIMER) += pcat_timer.o
COBJS-$(CONFIG_PCI) += pci.o
COBJS-$(CONFIG_PCI) += pci_type1.o
COBJS-y += interrupts.o
COBJS-$(CONFIG_SYS_PCAT_INTERRUPTS) += pcat_interrupts.o
COBJS-$(CONFIG_SYS_GENERIC_TIMER) += pcat_timer.o
COBJS-$(CONFIG_PCI) += pci.o
COBJS-$(CONFIG_PCI) += pci_type1.o
-COBJS-y += realmode.o
-COBJS-y += timer.o
-COBJS-y += video_bios.o
-COBJS-y += video.o
-COBJS-y += zimage.o
+COBJS-$(CONFIG_SYS_X86_REALMODE) += realmode.o
+COBJS-y += relocate.o
+COBJS-y += string.o
+COBJS-$(CONFIG_SYS_X86_ISR_TIMER) += timer.o
+COBJS-$(CONFIG_VIDEO) += video_bios.o
+COBJS-$(CONFIG_VIDEO) += video.o
+COBJS-$(CONFIG_CMD_ZBOOT) += zimage.o
SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
@@
-49,6
+55,11
@@
OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
$(LIB): $(obj).depend $(OBJS)
$(call cmd_link_o_target, $(OBJS))
$(LIB): $(obj).depend $(OBJS)
$(call cmd_link_o_target, $(OBJS))
+$(PREFIXED_LIBGCC): $(NORMAL_LIBGCC)
+ $(OBJCOPY) $< $@ --prefix-symbols=__normal_
+
+$(LIB): $(PREFIXED_LIBGCC)
+
#########################################################################
# defines $(obj).depend target
#########################################################################
# defines $(obj).depend target