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

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

diff --git a/include/configs/u8500_href.h b/include/configs/u8500_href.h
index 45d33a6..5302b1f 100644 (file)
--- a/include/configs/u8500_href.h
+++ b/include/configs/u8500_href.h
@@ -12,7 +12,6 @@
  * (easy to change)
  */
 #define CONFIG_U8500
-#define CONFIG_L2_OFF
 
 #define CONFIG_SYS_MEMTEST_START       0x00000000
 #define CONFIG_SYS_MEMTEST_END 0x1FFFFFFF
@@ -30,7 +29,6 @@
 #define CONFIG_ENV_SIZE                (128*1024)
 #define CONFIG_SYS_MALLOC_LEN  (CONFIG_ENV_SIZE + 256*1024)
 #endif
-#define CONFIG_SYS_GBL_DATA_SIZE       128     /* for initial data */
 
 /*
  * PL011 Configuration
@@ -133,7 +131,6 @@
 #define CONFIG_SYS_MAXARGS     32      /* max number of command args */
 #define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE /* Boot Arg Buffer Size */
 
-#undef CONFIG_SYS_CLKS_IN_HZ           /* everything, incl board info, in Hz */
 #define CONFIG_SYS_LOAD_ADDR           0x00100000 /* default load address */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE