Merge branch '080131_artila' of git://linux-arm.org/u-boot-armdev

diff --combined CREDITS
index 350c332,b3c55ae..7fdb8b3
--- 1/CREDITS
--- 2/CREDITS
+++ b/CREDITS
@@@ -391,10 -391,6 +391,10 @@@ E: dan.poirot@windriver.co
  D: Support for the Wind River sbc405, sbc8240 board
  W: http://www.windriver.com
  
 +N: Stelian Pop
 +E: stelian.pop@leadtechdesign.com
 +D: Atmel AT91CAP9ADK support
 +
  N: Stefan Roese
  E: sr@denx.de
  D: AMCC PPC4xx Support
@@@ -513,3 -509,19 +513,19 @@@ N: Nobuhiro Iwamats
  E: iwamatsu@nigauri.org
  D: Support for SuperH, MS7750SE01 and  MS7722SE01 boards.
  W: http://www.nigauri.org/~iwamatsu/
+ 
+ N: Alan Lu
+ E: alnalu001@gmail.com
+ D: Support for Artila M-501 starter kit
+ W: http://www.artila.com/
+ 
+ N: Kimmo Leppala
+ E: kimmo.leppala@sysart.fi
+ D: Support for Artila M-501 starter kit
+ W: http://www.sysart.fi/
+ 
+ N: Timo Tuunainen
+ E: timo.tuunainen@sysart.fi
+ D: Support for Artila M-501 starter kit
+ W: http://www.sysart.fi/
+ 

diff --combined MAKEALL
index 8f53b5a,655e100..0e1c0cb
--- 1/MAKEALL
--- 2/MAKEALL
+++ b/MAKEALL
@@@ -446,7 -446,6 +446,7 @@@ LIST_ARM7="                
  #########################################################################
  
  LIST_ARM9="                   \
 +      at91cap9adk             \
        at91rm9200dk            \
        cmc_pu2                 \
        ap920t                  \
@@@ -460,6 -459,7 +460,7 @@@
        cp946es                 \
        cp966                   \
        lpd7a400                \
+       m501sk                  \
        mp2usb                  \
        mx1ads                  \
        mx1fs2                  \
@@@ -722,7 -722,7 +723,7 @@@ build_target() 
        ${MAKE} ${JOBS} all 2>&1 >${LOG_DIR}/$target.MAKELOG \
                                | tee ${LOG_DIR}/$target.ERR
  
 -      ${CROSS_COMPILE:-ppc_8xx-}size ${BUILD_DIR}/u-boot \
 +      ${CROSS_COMPILE}size ${BUILD_DIR}/u-boot \
                                | tee -a ${LOG_DIR}/$target.MAKELOG
  }
  

diff --combined Makefile
index 1b13fe8,1effd6e..326c33c
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -23,8 -23,8 +23,8 @@@
  
  VERSION = 1
  PATCHLEVEL = 3
 -SUBLEVEL = 1
 -EXTRAVERSION =
 +SUBLEVEL = 2
 +EXTRAVERSION = -rc1
  U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
  VERSION_FILE = $(obj)include/version_autogenerated.h
  
@@@ -185,6 -185,18 +185,6 @@@ endi
  ifeq ($(CPU),mpc85xx)
  OBJS += cpu/$(CPU)/resetvec.o
  endif
 -ifeq ($(CPU),bf533)
 -OBJS += cpu/$(CPU)/start1.o   cpu/$(CPU)/interrupt.o  cpu/$(CPU)/cache.o
 -OBJS += cpu/$(CPU)/flush.o    cpu/$(CPU)/init_sdram.o
 -endif
 -ifeq ($(CPU),bf537)
 -OBJS += cpu/$(CPU)/start1.o   cpu/$(CPU)/interrupt.o  cpu/$(CPU)/cache.o
 -OBJS += cpu/$(CPU)/flush.o    cpu/$(CPU)/init_sdram.o
 -endif
 -ifeq ($(CPU),bf561)
 -OBJS += cpu/$(CPU)/start1.o   cpu/$(CPU)/interrupt.o  cpu/$(CPU)/cache.o
 -OBJS += cpu/$(CPU)/flush.o    cpu/$(CPU)/init_sdram.o
 -endif
  
  OBJS := $(addprefix $(obj),$(OBJS))
  
@@@ -262,21 -274,13 +262,21 @@@ NAND_SPL = nand_sp
  U_BOOT_NAND = $(obj)u-boot-nand.bin
  endif
  
 +ifeq ($(CONFIG_ONENAND_U_BOOT),y)
 +ONENAND_IPL = onenand_ipl
 +U_BOOT_ONENAND = $(obj)u-boot-onenand.bin
 +endif
 +
  __OBJS := $(subst $(obj),,$(OBJS))
  __LIBS := $(subst $(obj),,$(LIBS))
  
  #########################################################################
  #########################################################################
  
 -ALL += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map $(U_BOOT_NAND)
 +ALL += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map $(U_BOOT_NAND) $(U_BOOT_ONENAND)
 +ifeq ($(ARCH),blackfin)
 +ALL += $(obj)u-boot.ldr
 +endif
  
  all:          $(ALL)
  
@@@ -289,15 -293,6 +289,15 @@@ $(obj)u-boot.srec:       $(obj)u-boo
  $(obj)u-boot.bin:     $(obj)u-boot
                $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@
  
 +$(obj)u-boot.ldr:     $(obj)u-boot
 +              $(LDR) -T $(CONFIG_BFIN_CPU) -f -c $@ $< $(LDR_FLAGS)
 +
 +$(obj)u-boot.ldr.hex: $(obj)u-boot.ldr
 +              $(OBJCOPY) ${OBJCFLAGS} -O ihex $< $@ -I binary
 +
 +$(obj)u-boot.ldr.srec:        $(obj)u-boot.ldr
 +              $(OBJCOPY) ${OBJCFLAGS} -O srec $< $@ -I binary
 +
  $(obj)u-boot.img:     $(obj)u-boot.bin
                ./tools/mkimage -A $(ARCH) -T firmware -C none \
                -a $(TEXT_BASE) -e 0 \
@@@ -312,7 -307,7 +312,7 @@@ $(obj)u-boot.dis:  $(obj)u-boo
                $(OBJDUMP) -d $< > $@
  
  $(obj)u-boot:         depend $(SUBDIRS) $(OBJS) $(LIBS) $(LDSCRIPT)
 -              UNDEF_SYM=`$(OBJDUMP) -x $(LIBS) |sed  -n -e 's/.*\(__u_boot_cmd_.*\)/-u\1/p'|sort|uniq`;\
 +              UNDEF_SYM=`$(OBJDUMP) -x $(LIBS) |sed  -n -e 's/.*\($(SYM_PREFIX)__u_boot_cmd_.*\)/-u\1/p'|sort|uniq`;\
                cd $(LNDIR) && $(LD) $(LDFLAGS) $$UNDEF_SYM $(__OBJS) \
                        --start-group $(__LIBS) --end-group $(PLATFORM_LIBS) \
                        -Map u-boot.map -o u-boot
@@@ -332,19 -327,12 +332,19 @@@ $(NAND_SPL):    $(VERSION_FILE) $(obj)incl
  $(U_BOOT_NAND):       $(NAND_SPL) $(obj)u-boot.bin $(obj)include/autoconf.mk
                cat $(obj)nand_spl/u-boot-spl-16k.bin $(obj)u-boot.bin > $(obj)u-boot-nand.bin
  
 +$(ONENAND_IPL):       $(VERSION_FILE) $(obj)include/autoconf.mk
 +              $(MAKE) -C onenand_ipl/board/$(BOARDDIR) all
 +
 +$(U_BOOT_ONENAND):    $(ONENAND_IPL) $(obj)u-boot.bin $(obj)include/autoconf.mk
 +              cat $(obj)onenand_ipl/onenand-ipl-2k.bin $(obj)u-boot.bin > $(obj)u-boot-onenand.bin
 +
  $(VERSION_FILE):
                @( echo -n "#define U_BOOT_VERSION \"U-Boot " ; \
                echo -n "$(U_BOOT_VERSION)" ; \
                echo -n $(shell $(CONFIG_SHELL) $(TOPDIR)/tools/setlocalversion \
                         $(TOPDIR)) ; \
 -              echo "\"" ) > $(VERSION_FILE)
 +              echo "\"" ) > $@.tmp
 +              @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@
  
  gdbtools:
                $(MAKE) -C tools/gdb all || exit 1
@@@ -1232,11 -1220,9 +1232,11 @@@ G2000_config: unconfi
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx g2000
  
  hcu4_config:  unconfig
 +      @mkdir -p $(obj)board/netstal/common
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx hcu4 netstal
  
  hcu5_config:  unconfig
 +      @mkdir -p $(obj)board/netstal/common
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx hcu5 netstal
  
  HH405_config: unconfig
@@@ -2310,9 -2296,6 +2310,9 @@@ xtract_omap1610xxx = $(subst _cs0boot,,
  
  xtract_omap730p2 = $(subst _cs0boot,,$(subst _cs3boot,, $(subst _config,,$1)))
  
 +at91cap9adk_config    :       unconfig
 +      @$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk atmel at91cap9
 +
  at91rm9200dk_config   :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk NULL at91rm9200
  
@@@ -2325,6 -2308,8 +2325,8 @@@ csb637_config   :       unconfi
  mp2usb_config :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t mp2usb NULL at91rm9200
  
+ m501sk_config :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm920t m501sk NULL at91rm9200
  
  ########################################################################
  ## ARM Integrator boards - see doc/README-integrator for more info.
@@@ -2365,8 -2350,17 +2367,8 @@@ mx1ads_config  :       unconfi
  mx1fs2_config :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t mx1fs2 NULL imx
  
 -netstar_32_config     \
  netstar_config:               unconfig
 -      @mkdir -p $(obj)include
 -      @if [ "$(findstring _32_,$@)" ] ; then \
 -              $(XECHO) "... 32MB SDRAM" ; \
 -              echo "#define PHYS_SDRAM_1_SIZE SZ_32M" >>$(obj)include/config.h ; \
 -      else \
 -              $(XECHO) "... 64MB SDRAM" ; \
 -              echo "#define PHYS_SDRAM_1_SIZE SZ_64M" >>$(obj)include/config.h ; \
 -      fi
 -      @$(MKCONFIG) -a netstar arm arm925t netstar
 +      @$(MKCONFIG) $(@:_config=) arm arm925t netstar
  
  omap1510inn_config :  unconfig
        @$(MKCONFIG) $(@:_config=) arm arm925t omap1510inn
@@@ -2605,9 -2599,7 +2607,9 @@@ omap2420h4_config       : unconfi
        @$(MKCONFIG) $(@:_config=) arm arm1136 omap2420h4
  
  apollon_config                : unconfig
 +      @echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h
        @$(MKCONFIG) $(@:_config=) arm arm1136 apollon
 +      @echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk
  
  #========================================================================
  # i386
@@@ -2820,19 -2812,20 +2822,19 @@@ xupv2p_config:       unconfi
        @echo "#define CONFIG_XUPV2P 1" >> $(obj)include/config.h
        @$(MKCONFIG) -a $(@:_config=) microblaze microblaze xupv2p xilinx
  
 -#########################################################################
 -## Blackfin
 -#########################################################################
 -bf533-ezkit_config:   unconfig
 -      @$(MKCONFIG) $(@:_config=) blackfin bf533 bf533-ezkit
 +#========================================================================
 +# Blackfin
 +#========================================================================
  
 -bf533-stamp_config:   unconfig
 -      @$(MKCONFIG) $(@:_config=) blackfin bf533 bf533-stamp
 +# Analog Devices boards
 +BFIN_BOARDS = bf533-ezkit bf533-stamp bf537-stamp bf561-ezkit
  
 -bf537-stamp_config:   unconfig
 -      @$(MKCONFIG) $(@:_config=) blackfin bf537 bf537-stamp
 +$(BFIN_BOARDS:%=%_config)     : unconfig
 +      @$(MKCONFIG) $(@:_config=) blackfin $(firstword $(subst -, ,$@)) $(@:_config=)
  
 -bf561-ezkit_config:   unconfig
 -      @$(MKCONFIG) $(@:_config=) blackfin bf561 bf561-ezkit
 +$(BFIN_BOARDS):
 +      $(MAKE) $@_config
 +      $(MAKE)
  
  #========================================================================
  # AVR32
@@@ -2907,8 -2900,6 +2909,8 @@@ clean
        @rm -f $(obj)board/bf537-stamp/u-boot.lds $(obj)board/bf561-ezkit/u-boot.lds
        @rm -f $(obj)include/bmp_logo.h
        @rm -f $(obj)nand_spl/u-boot-spl $(obj)nand_spl/u-boot-spl.map
 +      @rm -f $(obj)onenand_ipl/onenand-ipl $(obj)onenand_ipl/onenand-ipl.bin \
 +              $(obj)onenand_ipl/onenand-ipl-2k.bin $(obj)onenand_ipl/onenand-ipl.map
        @rm -f $(obj)api_examples/demo $(VERSION_FILE)
  
  clobber:      clean
@@@ -2923,7 -2914,6 +2925,7 @@@
        @rm -f $(obj)tools/inca-swap-bytes $(obj)cpu/mpc824x/bedbug_603e.c
        @rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
        @[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -lname "*" -print | xargs rm -f
 +      @[ ! -d $(obj)onenand_ipl ] || find $(obj)onenand_ipl -lname "*" -print | xargs rm -f
        @[ ! -d $(obj)api_examples ] || find $(obj)api_examples -lname "*" -print | xargs rm -f
  
  ifeq ($(OBJTREE),$(SRCTREE))

diff --combined lib_arm/armlinux.c
index 62185f0,c1e1d12..42098fc
--- 1/lib_arm/armlinux.c
--- 2/lib_arm/armlinux.c
+++ b/lib_arm/armlinux.c
@@@ -78,8 -78,6 +78,8 @@@ void do_bootm_linux (cmd_tbl_t *cmdtp, 
        void (*theKernel)(int zero, int arch, uint params);
        image_header_t *hdr = &header;
        bd_t *bd = gd->bd;
 +      int machid = bd->bi_arch_number;
 +      char *s;
  
  #ifdef CONFIG_CMDLINE_TAG
        char *commandline = getenv ("bootargs");
@@@ -87,12 -85,6 +87,12 @@@
  
        theKernel = (void (*)(int, int, uint))ntohl(hdr->ih_ep);
  
 +      s = getenv ("machid");
 +      if (s) {
 +              machid = simple_strtoul (s, NULL, 16);
 +              printf ("Using machid 0x%x from environment\n", machid);
 +      }
 +
        /*
         * Check if there is an initrd image
         */
@@@ -168,7 -160,8 +168,8 @@@
                        do_reset (cmdtp, flag, argc, argv);
                }
  
- #if defined(CONFIG_B2) || defined(CONFIG_EVB4510) || defined(CONFIG_ARMADILLO)
+ #if defined(CONFIG_B2) || defined(CONFIG_EVB4510) ||  \
+               defined(CONFIG_ARMADILLO) || defined(CONFIG_M501SK)
                /*
                 *we need to copy the ramdisk to SRAM to let Linux boot
                 */
@@@ -268,7 -261,7 +269,7 @@@
  
        cleanup_before_linux ();
  
 -      theKernel (0, bd->bi_arch_number, bd->bi_boot_params);
 +      theKernel (0, machid, bd->bi_boot_params);
  }