Merge git://www.denx.de/git/u-boot-imx

[people/ms/u-boot.git] / include / configs / dreamplug.h

diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h
index 252e5f5d1e003679853ef625b5b6cd1e4ecdfa99..7a739e39d72fd0c1163414e3749acd50c0f024a0 100644 (file)
--- a/include/configs/dreamplug.h
+++ b/include/configs/dreamplug.h
@@ -12,19 +12,6 @@
 #ifndef _CONFIG_DREAMPLUG_H
 #define _CONFIG_DREAMPLUG_H
 
-/*
- * FIXME: This belongs in mach-types.h.  However, we only pull mach-types
- * from Linus' kernel.org tree.  This hasn't been updated primarily due to
- * the recent arch/arm reshuffling.  So, in the meantime, we'll place it
- * here.
- */
-#include <asm/mach-types.h>
-#ifdef MACH_TYPE_DREAMPLUG
-#error "MACH_TYPE_DREAMPLUG has been defined properly, please remove this."
-#else
-#define MACH_TYPE_DREAMPLUG            3550
-#endif
-
 /*
  * High Level Configuration Options (easy to change)
  */
@@ -45,10 +32,7 @@
  *  Environment variables configurations
  */
 #ifdef CONFIG_SPI_FLASH
-#define CONFIG_ENV_IS_IN_SPI_FLASH     1
 #define CONFIG_ENV_SECT_SIZE           0x10000 /* 64k */
-#else
-#define CONFIG_ENV_IS_NOWHERE          1       /* if env in SDRAM */
 #endif
 
 #ifdef CONFIG_CMD_SF