Changeset 9416


Ignore:
Timestamp:
2007-10-23T12:46:19+02:00 (10 years ago)
Author:
florian
Message:

The RB513 CF driver is now a module, enable it by default for the RB1xx profile.
Fix the membase of the CF driver.

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/kernel/modules/block.mk

    r9364 r9416  
    183183 
    184184$(eval $(call KernelPackage,nbd)) 
     185 
     186 
     187define KernelPackage/rb153-cf 
     188  SUBMENU:=$(BLOCK_MENU) 
     189  TITLE:=RouterBoard 153 CF Slot 
     190  KCONFIG:=CONFIG_BLK_DEV_CF_MIPS 
     191  FILES:=$(LINUX_DIR)/drivers/block/rb1xx/rb153-cf.$(LINUX_KMOD_SUFFIX) 
     192  AUTOLOAD:=$(call AutoLoad,30,rb153-cf) 
     193endef 
     194 
     195define KernelPackage/rb153-cf/description 
     196  Kernel module for the RouterBoard 153 CF slot 
     197endef 
     198 
     199$(eval $(call KernelPackage,rb153-cf)) 
  • trunk/target/linux/adm5120/files/arch/mips/adm5120/boards/mikrotik.c

    r9403 r9416  
    183183        { 
    184184                .name = "cf_membase", 
     185                .start = ADM5120_EXTIO0_BASE,  
     186                .end = ADM5120_EXTIO0_BASE + ADM5120_MPMC_SIZE-1 , 
    185187                .flags = IORESOURCE_MEM 
    186188        }, { 
    187189                .name = "cf_irq", 
    188                 .start = INTC_IRQ_GPIO4, /* 5 */ 
    189                 .end = INTC_IRQ_GPIO4, 
     190                .start = ADM5120_IRQ_GPIO4, /* 5 */ 
     191                .end = ADM5120_IRQ_GPIO4, 
    190192                .flags = IORESOURCE_IRQ 
    191193        } 
  • trunk/target/linux/adm5120/files/drivers/block/rb1xx/Makefile

    r9403 r9416  
    11## Makefile for the RB1xx CF port 
    2 obj-y           += bdev.o ata.o 
     2obj-$(CONFIG_BLK_DEV_CF_MIPS) += rb153-cf.o 
     3rb153-cf-objs := bdev.o ata.o 
  • trunk/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_defs.h

    r9118 r9416  
    3131#define ADM5120_SRAM1_BASE      0x10000000 
    3232#define ADM5120_NAND_BASE       ADM5120_SRAM1_BASE 
     33#define ADM5120_EXTIO0_BASE     0x10C00000 
    3334#define ADM5120_MPMC_BASE       0x11000000 
    3435#define ADM5120_USBC_BASE       0x11200000 
  • trunk/target/linux/adm5120/patches-2.6.23/120-cf.patch

    r9403 r9416  
    88  
    99+config BLK_DEV_CF_MIPS 
    10 +       bool "CF slot of RB153 board" 
     10+       tristate "CF slot of RB153 board" 
    1111+       depends on MIPS_ADM5120 
    1212+       default y 
     
    3030 obj-$(CONFIG_PS3_DISK)         += ps3disk.o 
    3131 obj-$(CONFIG_ATARI_FLOPPY)     += ataflop.o 
     32diff --git a/fs/partitions/check.c b/fs/partitions/check.c 
     33index 722e12e..60af038 100644 
     34--- a/fs/partitions/check.c 
     35+++ b/fs/partitions/check.c 
     36@@ -526,6 +526,7 @@ exit: 
     37                kobject_uevent(&p->kobj, KOBJ_ADD); 
     38        } 
     39 } 
     40+EXPORT_SYMBOL(register_disk); 
     41 
     42 int rescan_partitions(struct gendisk *disk, struct block_device *bdev) 
     43 { 
  • trunk/target/linux/adm5120/router_le/config-2.6.23

    r9403 r9416  
    1111CONFIG_BINFMT_MISC=m 
    1212CONFIG_BITREVERSE=y 
    13 CONFIG_BLK_DEV_CF_MIPS=y 
     13CONFIG_BLK_DEV_CF_MIPS=m 
    1414CONFIG_CIFS_DEBUG2=y 
    1515CONFIG_CIFS_EXPERIMENTAL=y 
  • trunk/target/linux/adm5120/router_le/profiles/RB1xx.mk

    r8755 r9416  
    88define Profile/RouterBoard 
    99        NAME:=Mikrotik RouterBoard 1xx family 
    10         PACKAGES:=kmod-madwifi 
     10        PACKAGES:=kmod-madwifi kmod-rb153-cf 
    1111endef 
    1212 
Note: See TracChangeset for help on using the changeset viewer.