Commit d963e84c authored by Wolfgang Denk's avatar Wolfgang Denk

Merge branch 'master' of /home/wd/git/u-boot/master

parents 66fca016 0c0892be
...@@ -40,6 +40,9 @@ ...@@ -40,6 +40,9 @@
/errlog /errlog
/reloc_off /reloc_off
/include/generated/
/lib/asm-offsets.s
# stgit generated dirs # stgit generated dirs
patches-* patches-*
.stgit-edit.txt .stgit-edit.txt
......
...@@ -144,6 +144,8 @@ Dirk Eibach <eibach@gdsys.de> ...@@ -144,6 +144,8 @@ Dirk Eibach <eibach@gdsys.de>
dlvision PPC405EP dlvision PPC405EP
gdppc440etx PPC440EP/GR gdppc440etx PPC440EP/GR
intip PPC460EX intip PPC460EX
io PPC405EP
iocon PPC405EP
neo PPC405EP neo PPC405EP
Dave Ellis <DGE@sixnetio.com> Dave Ellis <DGE@sixnetio.com>
...@@ -462,10 +464,11 @@ Rune Torgersen <runet@innovsys.com> ...@@ -462,10 +464,11 @@ Rune Torgersen <runet@innovsys.com>
Peter Tyser <ptyser@xes-inc.com> Peter Tyser <ptyser@xes-inc.com>
XPEDITE1000 PPC440GX xpedite1000 PPC440GX
XPEDITE5170 MPC8640 xpedite5170 MPC8640
XPEDITE5200 MPC8548 xpedite5200 MPC8548
XPEDITE5370 MPC8572 xpedite5370 MPC8572
xpedite5500 P2020
David Updegraff <dave@cray.com> David Updegraff <dave@cray.com>
......
...@@ -56,7 +56,7 @@ LONG_OPTS="arch:,cpu:,vendor:,soc:" ...@@ -56,7 +56,7 @@ LONG_OPTS="arch:,cpu:,vendor:,soc:"
# Option processing based on util-linux-2.13/getopt-parse.bash # Option processing based on util-linux-2.13/getopt-parse.bash
# Note that we use `"$@"' to let each command-line parameter expand to a # Note that we use `"$@"' to let each command-line parameter expand to a
# separate word. The quotes around `$@' are essential! # separate word. The quotes around `$@' are essential!
# We need TEMP as the `eval set --' would nuke the return value of # We need TEMP as the `eval set --' would nuke the return value of
# getopt. # getopt.
...@@ -554,9 +554,7 @@ LIST_mips_el=" \ ...@@ -554,9 +554,7 @@ LIST_mips_el=" \
## i386 Systems ## i386 Systems
######################################################################### #########################################################################
LIST_x86="$(boards_by_arch i386) LIST_x86="$(boards_by_arch i386)"
sc520_eNET \
"
######################################################################### #########################################################################
## Nios-II Systems ## Nios-II Systems
...@@ -601,39 +599,17 @@ LIST_avr32="$(boards_by_arch avr32)" ...@@ -601,39 +599,17 @@ LIST_avr32="$(boards_by_arch avr32)"
## Blackfin Systems ## Blackfin Systems
######################################################################### #########################################################################
LIST_blackfin="$(boards_by_arch blackfin) LIST_blackfin="$(boards_by_arch blackfin)"
bf527-ezkit-v2
"
######################################################################### #########################################################################
## SH Systems ## SH Systems
######################################################################### #########################################################################
LIST_sh2=" \ LIST_sh2="$(boards_by_cpu sh2)"
rsk7203 \ LIST_sh3="$(boards_by_cpu sh3)"
" LIST_sh4="$(boards_by_cpu sh4)"
LIST_sh3=" \
mpr2 \
ms7720se \
"
LIST_sh4=" \ LIST_sh="$(boards_by_arch sh)"
ms7750se \
ms7722se \
MigoR \
r7780mp \
r2dplus \
sh7763rdp \
sh7785lcr \
ap325rxa \
espt \
"
LIST_sh=" \
${LIST_sh2} \
${LIST_sh3} \
${LIST_sh4} \
"
######################################################################### #########################################################################
## SPARC Systems ## SPARC Systems
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
# #
VERSION = 2010 VERSION = 2010
PATCHLEVEL = 09 PATCHLEVEL = 12
SUBLEVEL = SUBLEVEL =
EXTRAVERSION = EXTRAVERSION = -rc1
ifneq "$(SUBLEVEL)" "" ifneq "$(SUBLEVEL)" ""
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
else else
...@@ -357,7 +357,7 @@ $(obj)u-boot.imx: $(obj)u-boot.bin ...@@ -357,7 +357,7 @@ $(obj)u-boot.imx: $(obj)u-boot.bin
-e $(CONFIG_SYS_TEXT_BASE) -d $< $@ -e $(CONFIG_SYS_TEXT_BASE) -d $< $@
$(obj)u-boot.kwb: $(obj)u-boot.bin $(obj)u-boot.kwb: $(obj)u-boot.bin
$(obj)tools/mkimage -n $(KWD_CONFIG) -T kwbimage \ $(obj)tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \
-a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $< $@ -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $< $@
$(obj)u-boot.sha1: $(obj)u-boot.bin $(obj)u-boot.sha1: $(obj)u-boot.bin
...@@ -372,7 +372,8 @@ GEN_UBOOT = \ ...@@ -372,7 +372,8 @@ GEN_UBOOT = \
cd $(LNDIR) && $(LD) $(LDFLAGS) $$UNDEF_SYM $(__OBJS) \ cd $(LNDIR) && $(LD) $(LDFLAGS) $$UNDEF_SYM $(__OBJS) \
--start-group $(__LIBS) --end-group $(PLATFORM_LIBS) \ --start-group $(__LIBS) --end-group $(PLATFORM_LIBS) \
-Map u-boot.map -o u-boot -Map u-boot.map -o u-boot
$(obj)u-boot: depend $(SUBDIRS) $(OBJS) $(LIBBOARD) $(LIBS) $(LDSCRIPT) $(obj)u-boot.lds $(obj)u-boot: depend \
$(SUBDIRS) $(OBJS) $(LIBBOARD) $(LIBS) $(LDSCRIPT) $(obj)u-boot.lds
$(GEN_UBOOT) $(GEN_UBOOT)
ifeq ($(CONFIG_KALLSYMS),y) ifeq ($(CONFIG_KALLSYMS),y)
smap=`$(call SYSTEM_MAP,u-boot) | \ smap=`$(call SYSTEM_MAP,u-boot) | \
...@@ -400,7 +401,7 @@ $(LDSCRIPT): depend ...@@ -400,7 +401,7 @@ $(LDSCRIPT): depend
$(obj)u-boot.lds: $(LDSCRIPT) $(obj)u-boot.lds: $(LDSCRIPT)
$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@ $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@
$(NAND_SPL): $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk $(NAND_SPL): $(TIMESTAMP_FILE) $(VERSION_FILE) depend
$(MAKE) -C nand_spl/board/$(BOARDDIR) all $(MAKE) -C nand_spl/board/$(BOARDDIR) all
$(U_BOOT_NAND): $(NAND_SPL) $(obj)u-boot.bin $(U_BOOT_NAND): $(NAND_SPL) $(obj)u-boot.bin
...@@ -426,7 +427,9 @@ updater: ...@@ -426,7 +427,9 @@ updater:
# Explicitly make _depend in subdirs containing multiple targets to prevent # Explicitly make _depend in subdirs containing multiple targets to prevent
# parallel sub-makes creating .depend files simultaneously. # parallel sub-makes creating .depend files simultaneously.
depend dep: $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk depend dep: $(TIMESTAMP_FILE) $(VERSION_FILE) \
$(obj)include/autoconf.mk \
$(obj)include/generated/generic-asm-offsets.h
for dir in $(SUBDIRS) $(CPUDIR) $(dir $(LDSCRIPT)) ; do \ for dir in $(SUBDIRS) $(CPUDIR) $(dir $(LDSCRIPT)) ; do \
$(MAKE) -C $$dir _depend ; done $(MAKE) -C $$dir _depend ; done
...@@ -473,6 +476,18 @@ $(obj)include/autoconf.mk: $(obj)include/config.h ...@@ -473,6 +476,18 @@ $(obj)include/autoconf.mk: $(obj)include/config.h
sed -n -f tools/scripts/define2mk.sed > $@.tmp && \ sed -n -f tools/scripts/define2mk.sed > $@.tmp && \
mv $@.tmp $@ mv $@.tmp $@
$(obj)include/generated/generic-asm-offsets.h: $(obj)include/autoconf.mk.dep \
$(obj)lib/asm-offsets.s
@$(XECHO) Generating $@
tools/scripts/make-asm-offsets $(obj)lib/asm-offsets.s $@
$(obj)lib/asm-offsets.s: $(obj)include/autoconf.mk.dep \
$(src)lib/asm-offsets.c
@mkdir -p $(obj)lib
$(CC) -DDO_DEPS_ONLY \
$(CFLAGS) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \
-o $@ $(src)lib/asm-offsets.c -c -S
######################################################################### #########################################################################
else # !config.mk else # !config.mk
all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \ all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \
...@@ -1052,7 +1067,6 @@ mx31pdk_nand_config : unconfig ...@@ -1052,7 +1067,6 @@ mx31pdk_nand_config : unconfig
echo "#define CONFIG_NAND_U_BOOT" >> $(obj)include/config.h; \ echo "#define CONFIG_NAND_U_BOOT" >> $(obj)include/config.h; \
else \ else \
echo "#define CONFIG_SKIP_LOWLEVEL_INIT" >> $(obj)include/config.h; \ echo "#define CONFIG_SKIP_LOWLEVEL_INIT" >> $(obj)include/config.h; \
echo "#define CONFIG_SKIP_RELOCATE_UBOOT" >> $(obj)include/config.h; \
fi fi
@$(MKCONFIG) -n $@ -a mx31pdk arm arm1136 mx31pdk freescale mx31 @$(MKCONFIG) -n $@ -a mx31pdk arm arm1136 mx31pdk freescale mx31
...@@ -1176,96 +1190,6 @@ NIOS2_GENERIC = nios2-generic ...@@ -1176,96 +1190,6 @@ NIOS2_GENERIC = nios2-generic
$(NIOS2_GENERIC:%=%_config) : unconfig $(NIOS2_GENERIC:%=%_config) : unconfig
@$(MKCONFIG) $@ nios2 nios2 nios2-generic altera @$(MKCONFIG) $@ nios2 nios2 nios2-generic altera
#========================================================================
# Blackfin
#========================================================================
bf527-ezkit-v2_config : unconfig
@$(MKCONFIG) -t BF527_EZKIT_REV_2_1 \
bf527-ezkit blackfin blackfin bf527-ezkit
#========================================================================
# SH3 (SuperH)
#========================================================================
#########################################################################
## sh2 (Renesas SuperH)
#########################################################################
rsk7203_config: unconfig
@mkdir -p $(obj)include
@echo "#define CONFIG_RSK7203 1" > $(obj)include/config.h
@$(MKCONFIG) -a $@ sh sh2 rsk7203 renesas
#########################################################################
## sh3 (Renesas SuperH)
#########################################################################
mpr2_config: unconfig
@mkdir -p $(obj)include
@echo "#define CONFIG_MPR2 1" > $(obj)include/config.h
@$(MKCONFIG) -a $@ sh sh3 mpr2
ms7720se_config: unconfig
@mkdir -p $(obj)include
@echo "#define CONFIG_MS7720SE 1" > $(obj)include/config.h
@$(MKCONFIG) -a $@ sh sh3 ms7720se
#########################################################################
## sh4 (Renesas SuperH)
#########################################################################
MigoR_config : unconfig
@mkdir -p $(obj)include
@echo "#define CONFIG_MIGO_R 1" > $(obj)include/config.h
@$(MKCONFIG) -a $@ sh sh4 MigoR renesas
ms7750se_config: unconfig
@mkdir -p $(obj)include
@echo "#define CONFIG_MS7750SE 1" > $(obj)include/config.h
@$(MKCONFIG) -a $@ sh sh4 ms7750se
ms7722se_config : unconfig
@mkdir -p $(obj)include
@echo "#define CONFIG_MS7722SE 1" > $(obj)include/config.h
@$(MKCONFIG) -a $@ sh sh4 ms7722se
r2dplus_config : unconfig
@mkdir -p $(obj)include
@echo "#define CONFIG_R2DPLUS 1" > $(obj)include/config.h
@$(MKCONFIG) -a $@ sh sh4 r2dplus renesas
r7780mp_config: unconfig
@mkdir -p $(obj)include
@echo "#define CONFIG_R7780MP 1" > $(obj)include/config.h
@$(MKCONFIG) -a $@ sh sh4 r7780mp renesas
sh7763rdp_config : unconfig
@mkdir -p $(obj)include
@echo "#define CONFIG_SH7763RDP 1" > $(obj)include/config.h
@$(MKCONFIG) -a $@ sh sh4 sh7763rdp renesas
sh7785lcr_32bit_config \
sh7785lcr_config : unconfig
@mkdir -p $(obj)include
@mkdir -p $(obj)board/renesas/sh7785lcr
@echo "#define CONFIG_SH7785LCR 1" > $(obj)include/config.h
@if [ "$(findstring 32bit, $@)" ] ; then \
echo "#define CONFIG_SH_32BIT 1" >> $(obj)include/config.h ; \
echo "CONFIG_SYS_TEXT_BASE = 0x8ff80000" > \
$(obj)board/renesas/sh7785lcr/config.tmp ; \
fi
@$(MKCONFIG) -n $@ -a sh7785lcr sh sh4 sh7785lcr renesas
ap325rxa_config : unconfig
@mkdir -p $(obj)include
@echo "#define CONFIG_AP325RXA 1" > $(obj)include/config.h
@$(MKCONFIG) -a $@ sh sh4 ap325rxa renesas
espt_config : unconfig
@mkdir -p $(obj)include
@echo "#define CONFIG_ESPT 1" > $(obj)include/config.h
@$(MKCONFIG) -a $@ sh sh4 espt
######################################################################### #########################################################################
######################################################################### #########################################################################
...@@ -1296,6 +1220,7 @@ clean: ...@@ -1296,6 +1220,7 @@ clean:
$(obj)u-boot.lds \ $(obj)u-boot.lds \
$(obj)arch/blackfin/cpu/bootrom-asm-offsets.[chs] $(obj)arch/blackfin/cpu/bootrom-asm-offsets.[chs]
@rm -f $(obj)include/bmp_logo.h @rm -f $(obj)include/bmp_logo.h
@rm -f $(obj)lib/asm-offsets.s
@rm -f $(obj)nand_spl/{u-boot.lds,u-boot-spl,u-boot-spl.map,System.map} @rm -f $(obj)nand_spl/{u-boot.lds,u-boot-spl,u-boot-spl.map,System.map}
@rm -f $(obj)onenand_ipl/onenand-{ipl,ipl.bin,ipl.map} @rm -f $(obj)onenand_ipl/onenand-{ipl,ipl.bin,ipl.map}
@rm -f $(ONENAND_BIN) @rm -f $(ONENAND_BIN)
...@@ -1319,6 +1244,7 @@ clobber: clean ...@@ -1319,6 +1244,7 @@ clobber: clean
@rm -f $(obj)tools/{env/crc32.c,inca-swap-bytes} @rm -f $(obj)tools/{env/crc32.c,inca-swap-bytes}
@rm -f $(obj)arch/powerpc/cpu/mpc824x/bedbug_603e.c @rm -f $(obj)arch/powerpc/cpu/mpc824x/bedbug_603e.c
@rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm @rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
@rm -fr $(obj)include/generated
@[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -name "*" -type l -print | xargs rm -f @[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -name "*" -type l -print | xargs rm -f
@[ ! -d $(obj)onenand_ipl ] || find $(obj)onenand_ipl -name "*" -type l -print | xargs rm -f @[ ! -d $(obj)onenand_ipl ] || find $(obj)onenand_ipl -name "*" -type l -print | xargs rm -f
......
...@@ -2364,11 +2364,11 @@ Configuration Settings: ...@@ -2364,11 +2364,11 @@ Configuration Settings:
- CONFIG_ENV_MAX_ENTRIES