Merge branch 'next'

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

diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h
index c8c28bb..64dce52 100644 (file)
--- a/include/configs/hsdk.h
+++ b/include/configs/hsdk.h
@@ -19,7 +19,6 @@
 /*
  * Memory configuration
  */
-#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
 
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000
 #define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
@@ -100,11 +99,6 @@ setenv core_iccm_1 0x6; setenv core_dccm_1 0x6; \
 setenv core_iccm_2 0x10; setenv core_dccm_2 0x10; \
 setenv core_iccm_3 0x6; setenv core_dccm_3 0x6;\0"
 
-/*
- * Environment configuration
- */
-#define CONFIG_BOOTFILE                        "uImage"
-
 /* Cli configuration */
 #define CONFIG_SYS_CBSIZE              SZ_2K