Merge branch 'u-boot/master' into 'u-boot-arm/master'

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

diff --git a/include/configs/origen.h b/include/configs/origen.h
index da135740e4fdb2ebf1af20a76f0f5ac9dea7710a..f46b833b531583991c3d57ce7ac04863c8afcb02 100644 (file)
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -22,8 +22,6 @@
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_BOARD_EARLY_INIT_F
 
-/* Keep L2 Cache Disabled */
-#define CONFIG_L2_OFF                  1
 #define CONFIG_SYS_DCACHE_OFF          1
 
 #define CONFIG_SYS_SDRAM_BASE          0x40000000
@@ -102,8 +100,6 @@
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_SDRAM_BASE + 0x6000000)
 #define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + 0x3E00000)
 
-#define CONFIG_SYS_HZ                  1000
-
 /* ORIGEN has 4 bank of DRAM */
 #define CONFIG_NR_DRAM_BANKS   4
 #define SDRAM_BANK_SIZE                (256UL << 20UL) /* 256 MB */