Changeset 10515


Ignore:
Timestamp:
2008-02-21T12:05:13+01:00 (9 years ago)
Author:
florian
Message:

Hopefully fix the PCI resource conflict and upgrade to .24.2

Location:
trunk/target/linux/au1000
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/au1000/Makefile

    r10377 r10515  
    1212FEATURES:=jffs2 usb pci 
    1313 
    14 LINUX_VERSION:=2.6.24 
     14LINUX_VERSION:=2.6.24.2 
    1515 
    1616include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/au1000/patches/015-pci-resource.patch

    r8146 r10515  
    1 --- linux-2.6.22.1.orig/include/asm-mips/mach-au1x00/au1000.h   2007-07-24 18:44:21.598778839 +0200 
    2 +++ linux-2.6.22.1/include/asm-mips/mach-au1x00/au1000.h        2007-07-24 22:08:49.761901610 +0200 
    3 @@ -1680,9 +1680,9 @@ 
    4  #define PCI_LAST_DEVFN  (19<<3) 
     1diff --git a/arch/mips/au1000/common/pci.c b/arch/mips/au1000/common/pci.c 
     2index c93d7a6..6c25e6c 100644 
     3--- a/arch/mips/au1000/common/pci.c 
     4+++ b/arch/mips/au1000/common/pci.c 
     5@@ -39,15 +39,15 @@ 
    56  
    6  #define IOPORT_RESOURCE_START 0x00001000 /* skip legacy probing */ 
    7 -#define IOPORT_RESOURCE_END   0xffffffff 
    8 +#define IOPORT_RESOURCE_END   0xfffffffffULL 
    9  #define IOMEM_RESOURCE_START  0x10000000 
    10 -#define IOMEM_RESOURCE_END    0xffffffff 
    11 +#define IOMEM_RESOURCE_END    0xfffffffffULL 
     7 /* TBD */ 
     8 static struct resource pci_io_resource = { 
     9-       .start  = PCI_IO_START, 
     10-       .end    = PCI_IO_END, 
     11+       .start  = (resource_size_t)PCI_IO_START, 
     12+       .end    = (resource_size_t)PCI_IO_END, 
     13        .name   = "PCI IO space", 
     14        .flags  = IORESOURCE_IO 
     15 }; 
    1216  
    13    /* 
    14     * Borrowed from the PPC arch: 
     17 static struct resource pci_mem_resource = { 
     18-       .start  = PCI_MEM_START, 
     19-       .end    = PCI_MEM_END, 
     20+       .start  = (resource_size_t)PCI_MEM_START, 
     21+       .end    = (resource_size_t)PCI_MEM_END, 
     22        .name   = "PCI memory space", 
     23        .flags  = IORESOURCE_MEM 
     24 }; 
Note: See TracChangeset for help on using the changeset viewer.