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

[platform/kernel/u-boot.git] / include / configs / malta.h

diff --git a/include/configs/malta.h b/include/configs/malta.h
index 363a2a6..d41b80c 100644 (file)
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -16,11 +16,8 @@
 #define CONFIG_PCI_GT64120
 #define CONFIG_PCI_MSC01
 #define CONFIG_PCNET
-#define CONFIG_PCNET_79C973
 #define PCNET_HAS_PROM
 
-#define CONFIG_MISC_INIT_R
-#define CONFIG_RTC_MC146818
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS 0
 
 /*
@@ -66,17 +63,10 @@
 #endif
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
 #define CONFIG_SYS_MAX_FLASH_SECT      128
-#define CONFIG_SYS_FLASH_CFI
-#define CONFIG_FLASH_CFI_DRIVER
-#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 
 /*
  * Environment
  */
-#define CONFIG_ENV_SECT_SIZE           0x20000
-#define CONFIG_ENV_SIZE                        CONFIG_ENV_SECT_SIZE
-#define CONFIG_ENV_ADDR \
-       (CONFIG_SYS_FLASH_BASE + (4 << 20) - CONFIG_ENV_SIZE)
 
 /*
  * IDE/ATA