diff options
author | Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de> | 2010-08-02 12:01:58 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2010-08-06 12:55:57 -0400 |
commit | efbd24b5b050c586c059ee68c57c09996e7be886 (patch) | |
tree | 85e0a84deb165323b3ccfc2ab3f96c9e64f2d27e /arch/blackfin | |
parent | f619ddd4fe5e6da3c3e97fe21043a4233aa54aee (diff) |
Blackfin: remove CONFIG_MEM_GENERIC_BOARD
MEM_GENERIC_BOARD depends on GENERIC_BOARD, but this flag was removed
in 4f25eb85d64640bc656e72917113a84701521b99, therefore all references
to it from the source can be removed.
Signed-off-by: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin')
-rw-r--r-- | arch/blackfin/Kconfig | 5 | ||||
-rw-r--r-- | arch/blackfin/include/asm/mem_init.h | 18 |
2 files changed, 0 insertions, 23 deletions
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 10bdd8de0253..57ee40204369 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
@@ -331,11 +331,6 @@ config BF53x | |||
331 | depends on (BF531 || BF532 || BF533 || BF534 || BF536 || BF537) | 331 | depends on (BF531 || BF532 || BF533 || BF534 || BF536 || BF537) |
332 | default y | 332 | default y |
333 | 333 | ||
334 | config MEM_GENERIC_BOARD | ||
335 | bool | ||
336 | depends on GENERIC_BOARD | ||
337 | default y | ||
338 | |||
339 | config MEM_MT48LC64M4A2FB_7E | 334 | config MEM_MT48LC64M4A2FB_7E |
340 | bool | 335 | bool |
341 | depends on (BFIN533_STAMP) | 336 | depends on (BFIN533_STAMP) |
diff --git a/arch/blackfin/include/asm/mem_init.h b/arch/blackfin/include/asm/mem_init.h index 7c8fe834ff22..237579935e29 100644 --- a/arch/blackfin/include/asm/mem_init.h +++ b/arch/blackfin/include/asm/mem_init.h | |||
@@ -10,7 +10,6 @@ | |||
10 | #if defined(CONFIG_MEM_MT48LC16M16A2TG_75) || \ | 10 | #if defined(CONFIG_MEM_MT48LC16M16A2TG_75) || \ |
11 | defined(CONFIG_MEM_MT48LC64M4A2FB_7E) || \ | 11 | defined(CONFIG_MEM_MT48LC64M4A2FB_7E) || \ |
12 | defined(CONFIG_MEM_MT48LC16M8A2TG_75) || \ | 12 | defined(CONFIG_MEM_MT48LC16M8A2TG_75) || \ |
13 | defined(CONFIG_MEM_GENERIC_BOARD) || \ | ||
14 | defined(CONFIG_MEM_MT48LC32M8A2_75) || \ | 13 | defined(CONFIG_MEM_MT48LC32M8A2_75) || \ |
15 | defined(CONFIG_MEM_MT48LC8M32B2B5_7) || \ | 14 | defined(CONFIG_MEM_MT48LC8M32B2B5_7) || \ |
16 | defined(CONFIG_MEM_MT48LC32M16A2TG_75) || \ | 15 | defined(CONFIG_MEM_MT48LC32M16A2TG_75) || \ |
@@ -178,7 +177,6 @@ | |||
178 | 177 | ||
179 | #if defined(CONFIG_MEM_MT48LC32M8A2_75) || \ | 178 | #if defined(CONFIG_MEM_MT48LC32M8A2_75) || \ |
180 | defined(CONFIG_MEM_MT48LC64M4A2FB_7E) || \ | 179 | defined(CONFIG_MEM_MT48LC64M4A2FB_7E) || \ |
181 | defined(CONFIG_MEM_GENERIC_BOARD) || \ | ||
182 | defined(CONFIG_MEM_MT48LC32M16A2TG_75) || \ | 180 | defined(CONFIG_MEM_MT48LC32M16A2TG_75) || \ |
183 | defined(CONFIG_MEM_MT48LC16M16A2TG_75) || \ | 181 | defined(CONFIG_MEM_MT48LC16M16A2TG_75) || \ |
184 | defined(CONFIG_MEM_MT48LC32M8A2_75) | 182 | defined(CONFIG_MEM_MT48LC32M8A2_75) |
@@ -248,22 +246,6 @@ | |||
248 | #define DDR_tWR DDR_TWR(MIN_DDR_SCLK(15)) | 246 | #define DDR_tWR DDR_TWR(MIN_DDR_SCLK(15)) |
249 | #endif | 247 | #endif |
250 | 248 | ||
251 | #if defined(CONFIG_MEM_GENERIC_BOARD) | ||
252 | #define DDR_SIZE DEVSZ_512 | ||
253 | #define DDR_WIDTH DEVWD_16 | ||
254 | #define DDR_MAX_tCK 13 | ||
255 | |||
256 | #define DDR_tRCD DDR_TRCD(3) | ||
257 | #define DDR_tWTR DDR_TWTR(2) | ||
258 | #define DDR_tWR DDR_TWR(2) | ||
259 | #define DDR_tMRD DDR_TMRD(2) | ||
260 | #define DDR_tRP DDR_TRP(3) | ||
261 | #define DDR_tRAS DDR_TRAS(7) | ||
262 | #define DDR_tRC DDR_TRC(10) | ||
263 | #define DDR_tRFC DDR_TRFC(12) | ||
264 | #define DDR_tREFI DDR_TREFI(1288) | ||
265 | #endif | ||
266 | |||
267 | #if (CONFIG_SCLK_HZ < DDR_CLK_HZ(DDR_MAX_tCK)) | 249 | #if (CONFIG_SCLK_HZ < DDR_CLK_HZ(DDR_MAX_tCK)) |
268 | # error "CONFIG_SCLK_HZ is too small (<DDR_CLK_HZ(DDR_MAX_tCK) Hz)." | 250 | # error "CONFIG_SCLK_HZ is too small (<DDR_CLK_HZ(DDR_MAX_tCK) Hz)." |
269 | #elif(CONFIG_SCLK_HZ <= 133333333) | 251 | #elif(CONFIG_SCLK_HZ <= 133333333) |