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

diff --cc Makefile
index bf3826e,0b61d05..ce3e1eb
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -3126,36 -3152,27 +3153,39 @@@ SMN42_config :       unconfi
  ## ARM CORTEX Systems
  #########################################################################
  
+ devkit8000_config :   unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 devkit8000 timll omap3
+ 
  omap3_beagle_config : unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 beagle omap3 omap3
+       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 beagle ti omap3
  
  omap3_overo_config :  unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 overo omap3 omap3
+       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 overo NULL omap3
  
  omap3_evm_config :    unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 evm omap3 omap3
+       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 evm ti omap3
  
  omap3_pandora_config :        unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 pandora omap3 omap3
+       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 pandora NULL omap3
  
  omap3_zoom1_config :  unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom1 omap3 omap3
+       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom1 logicpd omap3
  
  omap3_zoom2_config :  unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom2 omap3 omap3
+       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom2 logicpd omap3
  
 +s5pc100_universal_config:     unconfig
 +      @echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h
 +      @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 universal samsung s5pc1xx
 +      @echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk
 +      @echo "ONENAND_BIN = $(obj)onenand_ipl/onenand-ipl-16k.bin" >> $(obj)include/config.mk
 +
 +smdkc100_config:      unconfig
 +      @echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h
 +      @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 smdkc100 samsung s5pc1xx
 +      @echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk
 +      @echo "ONENAND_BIN = $(obj)onenand_ipl/onenand-ipl-16k.bin" >> $(obj)include/config.mk
 +
  #########################################################################
  ## XScale Systems
  #########################################################################