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

[u-boot] / include / configs / kc1.h

diff --git a/include/configs/kc1.h b/include/configs/kc1.h
index f8078eff942d22fb03f476db1043bc446a649090..85bc0e3fb77fc1b18602f4a342cf558ee4cdf911 100644 (file)
--- a/include/configs/kc1.h
+++ b/include/configs/kc1.h
@@ -16,8 +16,6 @@
  * Build
  */
 
-#define CONFIG_SYS_THUMB_BUILD
-
 /*
  * CPU
  */
@@ -31,7 +29,6 @@
 
 #define CONFIG_OMAP
 #define CONFIG_OMAP4430
-#define CONFIG_OMAP_COMMON
 
 /*
  * Board
@@ -79,20 +76,6 @@
 #define CONFIG_SYS_I2C_OMAP24XX
 #define CONFIG_I2C_MULTI_BUS
 
-/*
- * Flash
- */
-
-#define CONFIG_SYS_NO_FLASH
-
-/*
- * MMC
- */
-
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_OMAP_HSMMC
-
 /*
  * Power
  */
@@ -105,13 +88,6 @@
 
 #define CONFIG_TWL6030_INPUT
 
-/*
- * Partitions
- */
-
-#define CONFIG_PARTITION_UUIDS
-#define CONFIG_CMD_PART
-
 /*
  * SPL
  */
@@ -126,11 +102,9 @@
 #define CONFIG_SYS_SPL_MALLOC_START    0x80208000
 #define CONFIG_SYS_SPL_MALLOC_SIZE     (1024 * 1024)
 
-#define CONFIG_SPL_LDSCRIPT            "$(CPUDIR)/omap-common/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT            "arch/arm/mach-omap2/u-boot-spl.lds"
 #define CONFIG_SPL_BOARD_INIT
 
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION     2
-
 /*
  * Console
  */
@@ -154,7 +128,6 @@
 #define CONFIG_SYS_NS16550_COM3                UART3_BASE
 #define CONFIG_CONS_INDEX              3
 
-#define CONFIG_BAUDRATE                        115200
 #define CONFIG_SYS_BAUDRATE_TABLE      { 4800, 9600, 19200, 38400, 57600, \
                                          115200 }