Merge branch 'at91' of git://git.denx.de/u-boot-atmel

diff --combined Makefile
index 332c79a2bcf55219f0c0df605a67223eae76307d,f9e0eb9e9154312697258ed70e63eadf22ef61a1..44cd35754dcb758ba87bda28193b4a4681164c57
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -253,13 -253,6 +253,13 @@@ ifeq ($(SOC),omap4
  LIBS += $(CPUDIR)/omap-common/libomap-common.a
  endif
  
 +ifeq ($(SOC),s5pc1xx)
 +LIBS += $(CPUDIR)/s5p-common/libs5p-common.a
 +endif
 +ifeq ($(SOC),s5pc2xx)
 +LIBS += $(CPUDIR)/s5p-common/libs5p-common.a
 +endif
 +
  LIBS := $(addprefix $(obj),$(LIBS))
  .PHONY : $(LIBS) $(TIMESTAMP_FILE) $(VERSION_FILE)
  
@@@ -1890,7 -1883,7 +1890,7 @@@ CPUAT91_RAM_config 
  CPUAT91_config        :       unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_$(@:_config=) 1"  >$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a cpuat91 arm arm920t cpuat91 eukrea at91rm9200
+       @$(MKCONFIG) -n $@ -a cpuat91 arm arm920t cpuat91 eukrea at91
  
  #########################################################################
  ## ARM926EJ-S Systems