X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Makefile;h=ef535ed881587b30759715888733355876a33bfd;hb=4ce5a72851ff2960543b125866c6132e0094e1ee;hp=9ff846e6810f62128210d2746f4a3da7827e9515;hpb=0a87dd90a75d034301496285026fbd8106c7c6d5;p=u-boot diff --git a/Makefile b/Makefile index 9ff846e681..ef535ed881 100644 --- a/Makefile +++ b/Makefile @@ -22,9 +22,9 @@ # VERSION = 2009 -PATCHLEVEL = 06 +PATCHLEVEL = 08 SUBLEVEL = -EXTRAVERSION = +EXTRAVERSION = -rc1 ifneq "$(SUBLEVEL)" "" U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) else @@ -140,61 +140,28 @@ endif # The "tools" are needed early, so put this first # Don't include stuff already done in $(LIBS) SUBDIRS = tools \ - examples \ - api_examples + examples/standalone \ + examples/api .PHONY : $(SUBDIRS) ifeq ($(obj)include/config.mk,$(wildcard $(obj)include/config.mk)) +# Include autoconf.mk before config.mk so that the config options are available +# to all top level build files. We need the dummy all: target to prevent the +# dependency target in autoconf.mk.dep from being the default. +all: +sinclude $(obj)include/autoconf.mk.dep +sinclude $(obj)include/autoconf.mk + # load ARCH, BOARD, and CPU configuration include $(obj)include/config.mk export ARCH CPU BOARD VENDOR SOC -ifndef CROSS_COMPILE +# set default to nothing for native builds ifeq ($(HOSTARCH),$(ARCH)) -CROSS_COMPILE = -else -ifeq ($(ARCH),ppc) -CROSS_COMPILE = ppc_8xx- -endif -ifeq ($(ARCH),arm) -CROSS_COMPILE = arm-linux- -endif -ifeq ($(ARCH),i386) -CROSS_COMPILE = i386-linux- -endif -ifeq ($(ARCH),mips) -CROSS_COMPILE = mips_4KC- -endif -ifeq ($(ARCH),nios) -CROSS_COMPILE = nios-elf- -endif -ifeq ($(ARCH),nios2) -CROSS_COMPILE = nios2-elf- -endif -ifeq ($(ARCH),m68k) -CROSS_COMPILE = m68k-elf- -endif -ifeq ($(ARCH),microblaze) -CROSS_COMPILE = mb- -endif -ifeq ($(ARCH),blackfin) -CROSS_COMPILE = bfin-uclinux- -endif -ifeq ($(ARCH),avr32) -CROSS_COMPILE = avr32-linux- -endif -ifeq ($(ARCH),sh) -CROSS_COMPILE = sh4-linux- +CROSS_COMPILE ?= endif -ifeq ($(ARCH),sparc) -CROSS_COMPILE = sparc-elf- -endif # sparc -endif # HOSTARCH,ARCH -endif # CROSS_COMPILE - -export CROSS_COMPILE # load other configuration include $(TOPDIR)/config.mk @@ -246,7 +213,6 @@ LIBS += drivers/misc/libmisc.a LIBS += drivers/mmc/libmmc.a LIBS += drivers/mtd/libmtd.a LIBS += drivers/mtd/nand/libnand.a -LIBS += drivers/mtd/nand_legacy/libnand_legacy.a LIBS += drivers/mtd/onenand/libonenand.a LIBS += drivers/mtd/ubi/libubi.a LIBS += drivers/mtd/spi/libspi_flash.a @@ -288,7 +254,17 @@ LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).a LIBBOARD := $(addprefix $(obj),$(LIBBOARD)) # Add GCC lib -PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc +ifdef USE_PRIVATE_LIBGCC +ifeq ("$(USE_PRIVATE_LIBGCC)", "yes") +PLATFORM_LIBGCC = -L $(OBJTREE)/lib_$(ARCH) -lgcc +else +PLATFORM_LIBGCC = -L $(USE_PRIVATE_LIBGCC) -lgcc +endif +else +PLATFORM_LIBGCC = -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc +endif +PLATFORM_LIBS += $(PLATFORM_LIBGCC) +export PLATFORM_LIBS ifeq ($(CONFIG_NAND_U_BOOT),y) NAND_SPL = nand_spl @@ -428,7 +404,6 @@ TAG_SUBDIRS += drivers/misc TAG_SUBDIRS += drivers/mmc TAG_SUBDIRS += drivers/mtd TAG_SUBDIRS += drivers/mtd/nand -TAG_SUBDIRS += drivers/mtd/nand_legacy TAG_SUBDIRS += drivers/mtd/onenand TAG_SUBDIRS += drivers/mtd/spi TAG_SUBDIRS += drivers/net @@ -471,7 +446,7 @@ $(obj)include/autoconf.mk.dep: $(obj)include/config.h include/common.h @$(XECHO) Generating $@ ; \ set -e ; \ : Generate the dependancies ; \ - $(CC) -x c -DDO_DEPS_ONLY -M $(HOST_CFLAGS) $(CPPFLAGS) \ + $(CC) -x c -DDO_DEPS_ONLY -M $(HOSTCFLAGS) $(CPPFLAGS) \ -MQ $(obj)include/autoconf.mk include/common.h > $@ $(obj)include/autoconf.mk: $(obj)include/config.h @@ -482,9 +457,6 @@ $(obj)include/autoconf.mk: $(obj)include/config.h sed -n -f tools/scripts/define2mk.sed > $@.tmp && \ mv $@.tmp $@ -sinclude $(obj)include/autoconf.mk.dep -sinclude $(obj)include/autoconf.mk - ######################################################################### else # !config.mk all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \ @@ -698,6 +670,7 @@ o2dnt_config: unconfig pcm030_config \ pcm030_LOWBOOT_config: unconfig + @mkdir -p $(obj)include $(obj)board/phytec/pcm030 @ >$(obj)include/config.h @[ -z "$(findstring LOWBOOT_,$@)" ] || \ { echo "TEXT_BASE = 0xFF000000" >$(obj)board/phytec/pcm030/config.tmp ; \ @@ -1334,6 +1307,9 @@ csb472_config: unconfig DASA_SIM_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx dasa_sim esd +dlvision_config: unconfig + @$(MKCONFIG) $(@:_config=) ppc ppc4xx dlvision gdsys + DP405_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx dp405 esd @@ -1493,6 +1469,9 @@ PLU405_config: unconfig PMC405_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx pmc405 esd +PMC405DE_config: unconfig + @$(MKCONFIG) $(@:_config=) ppc ppc4xx pmc405de esd + PMC440_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx pmc440 esd @@ -1641,8 +1620,8 @@ xilinx-ppc440-generic_config: unconfig >> $(obj)board/xilinx/ppc440-generic/config.tmp @$(MKCONFIG) xilinx-ppc440-generic ppc ppc4xx ppc440-generic xilinx -XPEDITE1K_config: unconfig - @$(MKCONFIG) $(@:_config=) ppc ppc4xx xpedite1k +XPEDITE1000_config: unconfig + @$(MKCONFIG) $(@:_config=) ppc ppc4xx xpedite1000 xes yosemite_config \ yellowstone_config: unconfig @@ -2893,6 +2872,9 @@ lpd7a400_config \ lpd7a404_config: unconfig @$(MKCONFIG) $(@:_config=) arm lh7a40x lpd7a40x +mv88f6281gtw_ge_config: unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) Marvell kirkwood + mx1ads_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t mx1ads NULL imx @@ -2958,12 +2940,18 @@ omap730p2_cs3boot_config : unconfig fi; @$(MKCONFIG) -a $(call xtract_omap730p2,$@) arm arm926ejs omap730p2 NULL omap +rd6281a_config: unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) Marvell kirkwood + sbc2410x_config: unconfig @$(MKCONFIG) $(@:_config=) arm arm920t sbc2410x NULL s3c24x0 scb9328_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t scb9328 NULL imx +sheevaplug_config: unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) Marvell kirkwood + smdk2400_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t smdk2400 samsung s3c24x0 @@ -3208,7 +3196,6 @@ omap2420h4_config : unconfig qong_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm1136 qong davedenx mx31 - ######################################################################### ## ARM1176 Systems ######################################################################### @@ -3633,11 +3620,16 @@ grsim_leon2_config : unconfig ######################################################################### clean: - @rm -f $(obj)examples/82559_eeprom $(obj)examples/eepro100_eeprom \ - $(obj)examples/hello_world $(obj)examples/interrupt \ - $(obj)examples/mem_to_mem_idma2intr \ - $(obj)examples/sched $(obj)examples/smc91111_eeprom \ - $(obj)examples/test_burst $(obj)examples/timer + @rm -f $(obj)examples/standalone/82559_eeprom \ + $(obj)examples/standalone/eepro100_eeprom \ + $(obj)examples/standalone/hello_world \ + $(obj)examples/standalone/interrupt \ + $(obj)examples/standalone/mem_to_mem_idma2intr \ + $(obj)examples/standalone/sched \ + $(obj)examples/standalone/smc91111_eeprom \ + $(obj)examples/standalone/test_burst \ + $(obj)examples/standalone/timer + @rm -f $(obj)examples/api/demo{,.bin} @rm -f $(obj)tools/bmp_logo $(obj)tools/easylogo/easylogo \ $(obj)tools/env/{fw_printenv,fw_setenv} \ $(obj)tools/envcrc \ @@ -3654,7 +3646,7 @@ clean: @rm -f $(obj)include/bmp_logo.h @rm -f $(obj)nand_spl/{u-boot-spl,u-boot-spl.map,System.map} @rm -f $(obj)onenand_ipl/onenand-{ipl,ipl.bin,ipl-2k.bin,ipl-4k.bin,ipl.map} - @rm -f $(obj)api_examples/demo $(TIMESTAMP_FILE) $(VERSION_FILE) + @rm -f $(TIMESTAMP_FILE) $(VERSION_FILE) @find $(OBJTREE) -type f \ \( -name 'core' -o -name '*.bak' -o -name '*~' \ -o -name '*.o' -o -name '*.a' -o -name '*.exe' \) -print \