mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6x

[karo-tx-uboot.git] / include / configs / atstk1004.h

diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h
index cc00a0a665f7cf5dd571addd89209c3ff390a60d..a1d593b5cf562150c0b5b88b8b654f14ea29d546 100644 (file)
--- a/include/configs/atstk1004.h
+++ b/include/configs/atstk1004.h
@@ -32,8 +32,6 @@
 #define CONFIG_ATSTK1004
 #define CONFIG_ATSTK1000
 
-#define CONFIG_ATSTK1000_EXT_FLASH
-
 /*
  * Timer clock frequency. We're using the CPU-internal COUNT register
  * for this, so this is equivalent to the CPU core clock frequency
@@ -102,7 +100,7 @@
        "console=ttyS0 root=/dev/mmcblk0p1 rootwait"
 
 #define CONFIG_BOOTCOMMAND                                             \
-       "mmcinit; ext2load mmc 0:1 0x10200000 /boot/uImage; bootm"
+       "mmc rescan; ext2load mmc 0:1 0x10200000 /boot/uImage; bootm"
 
 /*
  * Only interrupt autoboot if <space> is pressed. Otherwise, garbage
@@ -137,18 +135,16 @@
 #define CONFIG_PORTMUX_PIO
 #define CONFIG_SYS_HSDRAMC
 #define CONFIG_MMC
-#define CONFIG_ATMEL_MCI
+#define CONFIG_GENERIC_ATMEL_MCI
+#define CONFIG_GENERIC_MMC
 
 #define CONFIG_SYS_DCACHE_LINESZ               32
 #define CONFIG_SYS_ICACHE_LINESZ               32
 
 #define CONFIG_NR_DRAM_BANKS           1
 
-/* External flash on STK1000 */
-#if 0
-#define CONFIG_SYS_FLASH_CFI                   1
-#define CONFIG_FLASH_CFI_DRIVER                1
-#endif
+#define CONFIG_SYS_FLASH_CFI
+#define CONFIG_FLASH_CFI_DRIVER
 
 #define CONFIG_SYS_FLASH_BASE                  0x00000000
 #define CONFIG_SYS_FLASH_SIZE                  0x800000