EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

backward compatible code, if ssb is not enabled

Browse Source 
SVN-Revision: 6632
This commit is contained in:
Florian Fainelli 2007-03-21 21:29:30 +00:00
parent 86b6dab84d
commit 28c4689e06
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
target/linux/brcm47xx-2.6/files/drivers/mtd/maps/bcm47xx-flash.c
View File

@ -49,7 +49,9 @@
#include <linux/squashfs_fs.h> #include <linux/squashfs_fs.h>
#include <linux/jffs2.h> #include <linux/jffs2.h>
#include <linux/crc32.h> #include <linux/crc32.h>
#ifdef CONFIG_SSB
#include <linux/ssb/ssb.h> #include <linux/ssb/ssb.h>
#endif
#include <asm/io.h> #include <asm/io.h>
@ -74,7 +76,9 @@ struct trx_header {
#define WINDOW_SIZE 0x400000 #define WINDOW_SIZE 0x400000
#define BUSWIDTH 2 #define BUSWIDTH 2
#ifdef CONFIG_SSB
extern struct ssb_bus ssb; extern struct ssb_bus ssb;
#endif
static struct mtd_info *bcm947xx_mtd; static struct mtd_info *bcm947xx_mtd;
static struct map_info bcm947xx_map = { static struct map_info bcm947xx_map = {
@ -385,13 +389,17 @@ init_mtd_partitions(struct mtd_info *mtd, size_t size)
int __init init_bcm947xx_map(void) int __init init_bcm947xx_map(void)
{ {
#ifdef CONFIG_SSB
struct ssb_mipscore *mcore = &ssb.mipscore; struct ssb_mipscore *mcore = &ssb.mipscore;
#endif
size_t size; size_t size;
int ret = 0; int ret = 0;
#ifdef CONFIG_MTD_PARTITIONS #ifdef CONFIG_MTD_PARTITIONS
struct mtd_partition *parts; struct mtd_partition *parts;
int i; int i;
#endif #endif
#ifdef CONFIG_SSB
u32 window = mcore->flash_window; u32 window = mcore->flash_window;
u32 window_size = mcore->flash_window_size; u32 window_size = mcore->flash_window_size;
@ -399,6 +407,10 @@ int __init init_bcm947xx_map(void)
bcm947xx_map.phys = window; bcm947xx_map.phys = window;
bcm947xx_map.size = window_size; bcm947xx_map.size = window_size;
bcm947xx_map.virt = ioremap_nocache(window, window_size); bcm947xx_map.virt = ioremap_nocache(window, window_size);
#else
printk("flash init: 0x%08x 0x%08x\n", WINDOW_ADDR, WINDOW_SIZE);
bcm947xx_map.virt = ioremap_nocache(WINDOW_ADDR, WINDOW_SIZE);
#endif
if (!bcm947xx_map.virt) { if (!bcm947xx_map.virt) {
printk("Failed to ioremap\n"); printk("Failed to ioremap\n");