diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2009-03-10 19:59:52 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2009-03-10 19:59:52 -0700 |
| commit | 9e83f3f1b944d83f049a7a842b79ec9bdc9ccf99 (patch) | |
| tree | 7c0c275dabf862a23a646637e6d40e92fc99de20 | |
| parent | 31abc4f83484990470e1fedfecd9d3a2ea9cf3dc (diff) | |
| parent | dce5ca364d51e3f41ed45e8f4da5125bdc684b26 (diff) | |
| download | openembedded-9e83f3f1b944d83f049a7a842b79ec9bdc9ccf99.tar.gz | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
| -rw-r--r-- | packages/linux/linux-2.6.24/oxnas/oxnas-pci-max-size.patch | 21 | ||||
| -rw-r--r-- | packages/linux/linux_2.6.24.bb | 3 |
2 files changed, 23 insertions, 1 deletions
diff --git a/packages/linux/linux-2.6.24/oxnas/oxnas-pci-max-size.patch b/packages/linux/linux-2.6.24/oxnas/oxnas-pci-max-size.patch new file mode 100644 index 0000000000..89af49bd91 --- /dev/null +++ b/packages/linux/linux-2.6.24/oxnas/oxnas-pci-max-size.patch @@ -0,0 +1,21 @@ +diff -Nurd linux-2.6.24.orig//arch/arm/mach-oxnas/pci.c linux-2.6.24/arch/arm/mach-oxnas/pci.c +--- linux-2.6.24.orig//arch/arm/mach-oxnas/pci.c 2009-03-10 20:29:02.000000000 +0100 ++++ linux-2.6.24/arch/arm/mach-oxnas/pci.c 2009-03-10 21:10:47.000000000 +0100 +@@ -78,12 +78,14 @@ + static unsigned long pci_trhfa_timeout = 0; + #endif // CONFIG_OXNAS_PCI_RESET + ++// processor allows up to 8MB PCI address ranges maximum by design ++// we split this up to 4MB prefetchable and 4MB non-prefetchable ++ + #define PCI_BUS_NONMEM_START 0x00000000 +-#define PCI_BUS_NONMEM_SIZE 0x00080000 +- ++#define PCI_BUS_NONMEM_SIZE 0x00400000 + + #define PCI_BUS_PREMEM_START PCI_BUS_NONMEM_START + PCI_BUS_NONMEM_SIZE +-#define PCI_BUS_PREMEM_SIZE 0x00080000 ++#define PCI_BUS_PREMEM_SIZE 0x00400000 + + #define SYNOPSYS_PCI_MEMORY_BASE_ADDRESS PCI_BASE_ADDRESS_0 + #define SYNOPSYS_PCI_DUAL_CYCLE_BASE_ADDRESS PCI_BASE_ADDRESS_2 diff --git a/packages/linux/linux_2.6.24.bb b/packages/linux/linux_2.6.24.bb index be88eab7b1..c74f985d96 100644 --- a/packages/linux/linux_2.6.24.bb +++ b/packages/linux/linux_2.6.24.bb @@ -11,7 +11,7 @@ DEFAULT_PREFERENCE_ts72xx = "1" DEFAULT_PREFERENCE_oxnas = "1" DEFAULT_PREFERENCE_cs-e9302 = "1" -PR = "r24" +PR = "r25" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \ @@ -88,6 +88,7 @@ SRC_URI_append_oxnas = " \ file://oxnas.diff;patch=1 \ file://oxnas-uart.patch;patch=1 \ file://oxnas-pci-config-delay.patch;patch=1 \ + file://oxnas-pci-max-size.patch;patch=1 \ " CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=1 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2" |