summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-12-13 00:26:19 +0100
committerWolfgang Denk <wd@denx.de>2008-12-13 00:26:19 +0100
commitf6704e49d6221fa650434e75faa5a3e2d7002f1b (patch)
treeea8c82808cf1bb8397d41b0c293c318d90c3cf9e /include
parent8e9c63b40059e81b870685b54d99589152c5b750 (diff)
parentd8bbc51c7ba9b737a20984333d19fe28a3526431 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-sh
Diffstat (limited to 'include')
-rw-r--r--include/asm-sh/cpu_sh4.h7
-rw-r--r--include/configs/ms7722se.h3
2 files changed, 10 insertions, 0 deletions
diff --git a/include/asm-sh/cpu_sh4.h b/include/asm-sh/cpu_sh4.h
index b6cc6cfbd..d2dbfcd14 100644
--- a/include/asm-sh/cpu_sh4.h
+++ b/include/asm-sh/cpu_sh4.h
@@ -26,8 +26,15 @@
#define CCR_CACHE_ICI 0x00000800
#define CACHE_OC_ADDRESS_ARRAY 0xf4000000
+
+#if defined (CONFIG_CPU_SH7750) || \
+ defined(CONFIG_CPU_SH7751)
#define CACHE_OC_WAY_SHIFT 14
#define CACHE_OC_NUM_ENTRIES 512
+#else
+#define CACHE_OC_WAY_SHIFT 13
+#define CACHE_OC_NUM_ENTRIES 256
+#endif
#define CACHE_OC_ENTRY_SHIFT 5
#if defined (CONFIG_CPU_SH7750) || \
diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index 9997c9b01..52020047d 100644
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -31,10 +31,13 @@
#define CONFIG_MS7722SE 1
#define CONFIG_CMD_FLASH
+#define CONFIG_CMD_JFFS2
#define CONFIG_CMD_NET
+#define CONFIG_CMD_NFS
#define CONFIG_CMD_PING
#define CONFIG_CMD_DFL
#define CONFIG_CMD_SDRAM
+#define CONFIG_CMD_MEMORY
#define CONFIG_CMD_ENV
#define CONFIG_BAUDRATE 115200