From: Wolfgang Denk Date: Tue, 4 Aug 2009 19:54:11 +0000 (+0200) Subject: Merge branch 'next' of git://git.denx.de/u-boot-coldfire X-Git-Tag: v2009.08-rc2~29 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cb32ed1fc298875845f166d326a3f2704a0d5364;hp=-c;p=oweals%2Fu-boot.git Merge branch 'next' of git://git.denx.de/u-boot-coldfire --- cb32ed1fc298875845f166d326a3f2704a0d5364 diff --combined MAKEALL index dd0b761fec,5576c8dfa1..edebaead3c --- a/MAKEALL +++ b/MAKEALL @@@ -184,7 -184,6 +184,7 @@@ LIST_4xx=" canyonlands \ canyonlands_nand \ CMS700 \ + compactcenter \ CPCI2DP \ CPCI405 \ CPCI4052 \ @@@ -195,8 -194,6 +195,8 @@@ csb272 \ csb472 \ DASA_SIM \ + devconcenter \ + dlvision \ DP405 \ DU405 \ DU440 \ @@@ -240,7 -237,6 +240,7 @@@ PIP405 \ PLU405 \ PMC405 \ + PMC405DE \ PMC440 \ PPChameleonEVB \ quad100hd \ @@@ -262,7 -258,7 +262,7 @@@ WUH405 \ xilinx-ppc440-generic \ xilinx-ppc440-generic_flash \ - XPEDITE1K \ + XPEDITE1000 \ yellowstone \ yosemite \ yucca \ @@@ -366,7 -362,6 +366,7 @@@ LIST_83xx=" sbc8349 \ SIMPC8313_LP \ TQM834x \ + vme8349 \ " @@@ -516,7 -511,6 +516,7 @@@ LIST_ARM9=" cp946es \ cp966 \ lpd7a400 \ + mv88f6281gtw_ge \ mx1ads \ mx1fs2 \ netstar \ @@@ -527,10 -521,8 +527,10 @@@ omap1610inn \ omap5912osk \ omap730p2 \ + rd6281a \ sbc2410x \ scb9328 \ + sheevaplug \ smdk2400 \ smdk2410 \ trab \ @@@ -777,6 -769,7 +777,7 @@@ LIST_coldfire=" EB+MCF-EV123 \ EB+MCF-EV123_internal \ idmr \ + M5208EVBE \ M52277EVB \ M5235EVB \ M5249EVB \ diff --combined Makefile index 8096f91f00,ecf7e6d0a5..54c0b67499 --- a/Makefile +++ b/Makefile @@@ -22,9 -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,28 -140,61 +140,28 @@@ endi # 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- +CROSS_COMPILE ?= 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- -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 @@@ -213,6 -246,7 +213,6 @@@ LIBS += drivers/misc/libmisc. 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 @@@ -221,7 -255,6 +221,7 @@@ LIBS += drivers/net/phy/libphy. LIBS += drivers/net/sk98lin/libsk98lin.a LIBS += drivers/pci/libpci.a LIBS += drivers/pcmcia/libpcmcia.a +LIBS += drivers/power/libpower.a LIBS += drivers/spi/libspi.a ifeq ($(CPU),mpc83xx) LIBS += drivers/qe/qe.a @@@ -255,17 -288,7 +255,17 @@@ LIBBOARD = board/$(BOARDDIR)/lib$(BOARD 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 @@@ -405,6 -428,7 +405,6 @@@ TAG_SUBDIRS += drivers/mis 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 @@@ -447,7 -471,7 +447,7 @@@ $(obj)include/autoconf.mk.dep: $(obj)in @$(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 @@@ -458,6 -482,8 +458,6 @@@ sed -n -f tools/scripts/define2mk.sed > $@.tmp && \ mv $@.tmp $@ -sinclude $(obj)include/autoconf.mk.dep - ######################################################################### else # !config.mk all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \ @@@ -671,8 -697,7 +671,8 @@@ o2dnt_config: unconfi pcm030_config \ pcm030_LOWBOOT_config: unconfig - @ >include/config.h + @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 ; \ echo "... with LOWBOOT configuration" ; \ @@@ -1283,14 -1308,6 +1283,14 @@@ CATcenter_33_config: unconfi CMS700_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx cms700 esd +# Compact-Center & DevCon-Center use different U-Boot images +compactcenter_config \ +devconcenter_config: unconfig + @mkdir -p $(obj)include + @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \ + tr '[:lower:]' '[:upper:]')" >$(obj)include/config.h + @$(MKCONFIG) -n $@ -a compactcenter ppc ppc4xx compactcenter gdsys + CPCI2DP_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci2dp esd @@@ -1316,9 -1333,6 +1316,9 @@@ csb472_config: unconfi 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 @@@ -1478,9 -1492,6 +1478,9 @@@ PLU405_config: unconfi 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 @@@ -1629,8 -1640,8 +1629,8 @@@ xilinx-ppc440-generic_config: unconfi >> $(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 @@@ -1993,6 -2004,9 +1993,9 @@@ ZPC1900_config: unconfi ## Coldfire ######################################################################### + M5208EVBE_config : unconfig + @$(MKCONFIG) $(@:_config=) m68k mcf52x2 m5208evbe freescale + M52277EVB_config \ M52277EVB_spansion_config \ M52277EVB_stmicro_config : unconfig @@@ -2097,18 -2111,15 +2100,15 @@@ M5373EVB_config : unconfi @$(MKCONFIG) -a M5373EVB m68k mcf532x m5373evb freescale M54451EVB_config \ - M54451EVB_spansion_config \ M54451EVB_stmicro_config : unconfig @case "$@" in \ - M54451EVB_config) FLASH=SPANSION;; \ - M54451EVB_spansion_config) FLASH=SPANSION;; \ + M54451EVB_config) FLASH=NOR;; \ M54451EVB_stmicro_config) FLASH=STMICRO;; \ esac; \ - if [ "$${FLASH}" = "SPANSION" ] ; then \ - echo "#define CONFIG_SYS_SPANSION_BOOT" >> $(obj)include/config.h ; \ + if [ "$${FLASH}" = "NOR" ] ; then \ echo "TEXT_BASE = 0x00000000" > $(obj)board/freescale/m54451evb/config.tmp ; \ cp $(obj)board/freescale/m54451evb/u-boot.spa $(obj)board/freescale/m54451evb/u-boot.lds ; \ - $(XECHO) "... with SPANSION boot..." ; \ + $(XECHO) "... with NOR boot..." ; \ fi; \ if [ "$${FLASH}" = "STMICRO" ] ; then \ echo "#define CONFIG_CF_SBF" >> $(obj)include/config.h ; \ @@@ -2396,8 -2407,6 +2396,8 @@@ SIMPC8313_SP_config: unconfi TQM834x_config: unconfig @$(MKCONFIG) $(@:_config=) ppc mpc83xx tqm834x tqc +vme8349_config: unconfig + @$(MKCONFIG) $(@:_config=) ppc mpc83xx vme8349 esd ######################################################################### ## MPC85xx Systems @@@ -2883,9 -2892,6 +2883,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 @@@ -2951,18 -2957,12 +2951,18 @@@ omap730p2_cs3boot_config : unconfi 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 @@@ -3207,6 -3207,7 +3207,6 @@@ omap2420h4_config : unconfi qong_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm1136 qong davedenx mx31 - ######################################################################### ## ARM1176 Systems ######################################################################### @@@ -3631,16 -3632,11 +3631,16 @@@ grsim_leon2_config : unconfi ######################################################################### 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 \ @@@ -3657,7 -3653,7 +3657,7 @@@ @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 \ diff --combined lib_m68k/board.c index f73a46ccea,ec7f0186c1..483c9b6df8 --- a/lib_m68k/board.c +++ b/lib_m68k/board.c @@@ -28,7 -28,7 +28,7 @@@ #include #include #include -#include +#include #include @@@ -535,7 -535,7 +535,7 @@@ void board_init_r (gd_t *id, ulong dest */ s = getenv ("flashchecksum"); if (s && (*s == 'y')) { - printf (" CRC: %08lX", + printf (" CRC: %08X", crc32 (0, (const unsigned char *) CONFIG_SYS_FLASH_BASE, flash_size) @@@ -595,8 -595,8 +595,8 @@@ #endif /** leave this here (after malloc(), environment and PCI are working) **/ - /* Initialize devices */ - devices_init (); + /* Initialize stdio devices */ + stdio_init (); /* Initialize the jump table for applications */ jumptable_init ();