From: Wolfgang Denk <wd@denx.de>
Date: Tue, 3 Aug 2010 22:35:10 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-samsung
X-Git-Tag: v2010.09-rc1~28^2~7
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9efac4a1eb99d9c5539aa6992025eeacab7980c6;hp=-c;p=karo-tx-uboot.git

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

9efac4a1eb99d9c5539aa6992025eeacab7980c6
diff --combined include/configs/s5p_goni.h
index ff0dbd3c21,b2bf96ace6..c8ea8fda82
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@@ -28,7 -28,7 +28,7 @@@
  #define __CONFIG_H
  
  /* High Level Configuration Options */
 -#define CONFIG_ARMCORTEXA8	1	/* This is an ARM V7 CPU core */
 +#define CONFIG_ARMV7		1	/* This is an ARM V7 CPU core */
  #define CONFIG_SAMSUNG		1	/* in a SAMSUNG core */
  #define CONFIG_S5PC1XX		1	/* which is in a S5PC1XX Family */
  #define CONFIG_S5PC110		1	/* which is in a S5PC110 */
@@@ -67,6 -67,11 +67,11 @@@
  #define CONFIG_SERIAL_MULTI		1
  #define CONFIG_BAUDRATE			115200
  
+ /* MMC */
+ #define CONFIG_GENERIC_MMC		1
+ #define CONFIG_MMC			1
+ #define CONFIG_S5P_MMC			1
+ 
  /* It should define before config_cmd_default.h */
  #define CONFIG_SYS_NO_FLASH		1
  
@@@ -82,6 -87,7 +87,7 @@@
  #define CONFIG_CMD_REGINFO
  #define CONFIG_CMD_ONENAND
  #define CONFIG_CMD_MTDPARTS
+ #define CONFIG_CMD_MMC
  
  #define CONFIG_BOOTDELAY		1
  #define CONFIG_ZERO_BOOTDELAY_CHECK