diff options
author | Jan Luebbe <jlu@pengutronix.de> | 2012-08-27 22:33:21 +0200 |
---|---|---|
committer | Jan Luebbe <jlu@pengutronix.de> | 2012-08-27 22:33:21 +0200 |
commit | d3fe3d965ab6ff726595e09d7c260e00fcb637f0 (patch) | |
tree | e32f9413f9baff5decf22a14b1e422a8999b772c | |
parent | fcdcf20dd90b367045f6b1242f0dedcee720caa6 (diff) | |
download | platform-pengutronix-versatilepb-d3fe3d965ab6ff726595e09d7c260e00fcb637f0.tar.gz platform-pengutronix-versatilepb-d3fe3d965ab6ff726595e09d7c260e00fcb637f0.tar.xz |
versatilepb: update to kernel version 3.5.3
The patch has been merged into mainline.
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
-rw-r--r-- | kernelconfig-3.5.3 (renamed from kernelconfig-3.4.2) | 171 | ||||
-rw-r--r-- | patches/linux-3.4.2/0001-fix-versatile.patch | 209 | ||||
-rw-r--r-- | patches/linux-3.4.2/series.pengutronix-versatilepb | 1 | ||||
-rw-r--r-- | platformconfig | 31 |
4 files changed, 164 insertions, 248 deletions
diff --git a/kernelconfig-3.4.2 b/kernelconfig-3.5.3 index cac545e..047d7b6 100644 --- a/kernelconfig-3.4.2 +++ b/kernelconfig-3.5.3 @@ -1,23 +1,17 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.4.2 Kernel Configuration +# Linux/arm 3.5.3 Kernel Configuration # CONFIG_ARM=y CONFIG_MIGHT_HAVE_PCI=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_GENERIC_GPIO=y -# CONFIG_ARCH_USES_GETTIMEOFFSET is not set -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_KTIME_SCALAR=y CONFIG_HAVE_PROC_CPU=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_TRACE_IRQFLAGS_SUPPORT=y -CONFIG_HARDIRQS_SW_RESEND=y -CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y -CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_NEED_DMA_MAP_STATE=y @@ -61,9 +55,20 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y # IRQ subsystem # CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_HARDIRQS_SW_RESEND=y CONFIG_IRQ_DOMAIN=y # CONFIG_IRQ_DOMAIN_DEBUG is not set +CONFIG_KTIME_SCALAR=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y + +# +# Timers subsystem +# +# CONFIG_NO_HZ is not set +# CONFIG_HIGH_RES_TIMERS is not set # # RCU Subsystem @@ -124,7 +129,6 @@ CONFIG_PERF_USE_VMALLOC=y # Kernel Performance Events And Counters # # CONFIG_PERF_EVENTS is not set -# CONFIG_PERF_COUNTERS is not set CONFIG_VM_EVENT_COUNTERS=y CONFIG_PCI_QUIRKS=y CONFIG_COMPAT_BRK=y @@ -137,6 +141,9 @@ CONFIG_HAVE_OPROFILE=y # CONFIG_JUMP_LABEL is not set CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_CLK=y CONFIG_HAVE_DMA_API_DEBUG=y @@ -248,8 +255,6 @@ CONFIG_ARCH_VERSATILE=y # CONFIG_ARCH_IOP13XX is not set # CONFIG_ARCH_IOP32X is not set # CONFIG_ARCH_IOP33X is not set -# CONFIG_ARCH_IXP23XX is not set -# CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_DOVE is not set # CONFIG_ARCH_KIRKWOOD is not set @@ -284,10 +289,6 @@ CONFIG_ARCH_VERSATILE=y # CONFIG_ARCH_ZYNQ is not set # -# System MMU -# - -# # Versatile platform type # CONFIG_ARCH_VERSATILE_PB=y @@ -295,6 +296,7 @@ CONFIG_ARCH_VERSATILE_PB=y CONFIG_MACH_VERSATILE_DT=y CONFIG_PLAT_VERSATILE_CLCD=y CONFIG_PLAT_VERSATILE_FPGA_IRQ=y +CONFIG_PLAT_VERSATILE_FPGA_IRQ_NR=4 CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y CONFIG_PLAT_VERSATILE=y CONFIG_ARM_TIMER_SP804=y @@ -349,9 +351,6 @@ CONFIG_PCI_PRI=y # # Kernel Features # -# CONFIG_NO_HZ is not set -# CONFIG_HIGH_RES_TIMERS is not set -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_VMSPLIT_3G=y # CONFIG_VMSPLIT_2G is not set # CONFIG_VMSPLIT_1G is not set @@ -380,8 +379,10 @@ CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y # CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +# CONFIG_CROSS_MEMORY_ATTACH is not set CONFIG_NEED_PER_CPU_KM=y # CONFIG_CLEANCACHE is not set +# CONFIG_FRONTSWAP is not set CONFIG_FORCE_MAX_ZONEORDER=11 # CONFIG_LEDS is not set CONFIG_ALIGNMENT_TRAP=y @@ -436,6 +437,8 @@ CONFIG_BINFMT_MISC=y CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y CONFIG_PM_SLEEP=y +# CONFIG_PM_AUTOSLEEP is not set +# CONFIG_PM_WAKELOCKS is not set # CONFIG_PM_RUNTIME is not set CONFIG_PM=y # CONFIG_PM_DEBUG is not set @@ -452,6 +455,7 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y # CONFIG_UNIX_DIAG is not set +# CONFIG_XFRM_USER is not set # CONFIG_NET_KEY is not set CONFIG_INET=y # CONFIG_IP_MULTICAST is not set @@ -511,7 +515,6 @@ CONFIG_IPV6=y # CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set -# CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set # CONFIG_PHONET is not set # CONFIG_IEEE802154 is not set @@ -521,7 +524,6 @@ CONFIG_IPV6=y # CONFIG_OPENVSWITCH is not set # CONFIG_NETPRIO_CGROUP is not set CONFIG_BQL=y -CONFIG_HAVE_BPF_JIT=y # CONFIG_BPF_JIT is not set # @@ -536,10 +538,13 @@ CONFIG_HAVE_BPF_JIT=y # CONFIG_WIRELESS is not set # CONFIG_WIMAX is not set # CONFIG_RFKILL is not set -# CONFIG_NET_9P is not set +CONFIG_NET_9P=y +CONFIG_NET_9P_VIRTIO=y +CONFIG_NET_9P_DEBUG=y # CONFIG_CAIF is not set # CONFIG_CEPH_LIB is not set # CONFIG_NFC is not set +CONFIG_HAVE_BPF_JIT=y # # Device Drivers @@ -656,7 +661,6 @@ CONFIG_OF_EARLY_FLATTREE=y CONFIG_OF_ADDRESS=y CONFIG_OF_IRQ=y CONFIG_OF_DEVICE=y -CONFIG_OF_GPIO=y CONFIG_OF_NET=y CONFIG_OF_PCI=y CONFIG_OF_PCI_IRQ=y @@ -681,6 +685,7 @@ CONFIG_BLK_DEV=y # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set # CONFIG_MG_DISK is not set +CONFIG_VIRTIO_BLK=y # CONFIG_BLK_DEV_RBD is not set # @@ -805,6 +810,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y # CONFIG_SCSI_PM8001 is not set # CONFIG_SCSI_SRP is not set # CONFIG_SCSI_BFA_FC is not set +CONFIG_SCSI_VIRTIO=m # CONFIG_SCSI_DH is not set # CONFIG_SCSI_OSD_INITIATOR is not set # CONFIG_ATA is not set @@ -832,6 +838,7 @@ CONFIG_MII=y # CONFIG_NET_POLL_CONTROLLER is not set # CONFIG_TUN is not set # CONFIG_VETH is not set +CONFIG_VIRTIO_NET=m # CONFIG_ARCNET is not set # @@ -877,18 +884,23 @@ CONFIG_ETHERNET=y # CONFIG_NET_VENDOR_SILAN is not set # CONFIG_NET_VENDOR_SIS is not set # CONFIG_SFC is not set -# CONFIG_NET_VENDOR_SMSC is not set +CONFIG_NET_VENDOR_SMSC=y +CONFIG_SMC91X=y +# CONFIG_EPIC100 is not set +# CONFIG_SMC911X is not set +# CONFIG_SMSC911X is not set +# CONFIG_SMSC9420 is not set # CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_SUN is not set # CONFIG_NET_VENDOR_TEHUTI is not set # CONFIG_NET_VENDOR_TI is not set # CONFIG_NET_VENDOR_VIA is not set +# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set # CONFIG_PHYLIB is not set # CONFIG_PPP is not set # CONFIG_SLIP is not set -# CONFIG_TR is not set # CONFIG_WLAN is not set # @@ -905,6 +917,7 @@ CONFIG_INPUT=y # CONFIG_INPUT_FF_MEMLESS is not set # CONFIG_INPUT_POLLDEV is not set # CONFIG_INPUT_SPARSEKMAP is not set +# CONFIG_INPUT_MATRIXKMAP is not set # # Userland interfaces @@ -968,6 +981,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_XILINX_PS_UART is not set # CONFIG_TTY_PRINTK is not set # CONFIG_HVC_DCC is not set +# CONFIG_VIRTIO_CONSOLE is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set # CONFIG_R3964 is not set @@ -975,7 +989,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set CONFIG_DEVPORT=y -# CONFIG_RAMOOPS is not set # CONFIG_I2C is not set # CONFIG_SPI is not set # CONFIG_HSI is not set @@ -996,8 +1009,10 @@ CONFIG_DEVPORT=y # # Enable Device Drivers -> PPS to see the PTP clock options. # +CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_GPIOLIB=y +CONFIG_OF_GPIO=y # CONFIG_DEBUG_GPIO is not set CONFIG_GPIO_SYSFS=y @@ -1005,6 +1020,7 @@ CONFIG_GPIO_SYSFS=y # Memory mapped GPIO drivers: # # CONFIG_GPIO_GENERIC_PLATFORM is not set +# CONFIG_GPIO_EM is not set # CONFIG_GPIO_PL061 is not set # CONFIG_GPIO_VX855 is not set @@ -1063,6 +1079,7 @@ CONFIG_BCMA_POSSIBLE=y # CONFIG_ABX500_CORE is not set # CONFIG_MFD_TIMBERDALE is not set # CONFIG_LPC_SCH is not set +# CONFIG_LPC_ICH is not set # CONFIG_MFD_RDC321X is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_VX855 is not set @@ -1077,7 +1094,60 @@ CONFIG_BCMA_POSSIBLE=y # CONFIG_STUB_POULSBO is not set # CONFIG_VGASTATE is not set # CONFIG_VIDEO_OUTPUT_CONTROL is not set -# CONFIG_FB is not set +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set +# CONFIG_FB_SYS_FOPS is not set +# CONFIG_FB_WMT_GE_ROPS is not set +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +CONFIG_FB_ARMCLCD=y +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +# CONFIG_FB_I740 is not set +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +# CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_CARMINE is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +# CONFIG_FB_AUO_K190X is not set # CONFIG_EXYNOS_VIDEO is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set @@ -1085,8 +1155,23 @@ CONFIG_BCMA_POSSIBLE=y # Console display driver support # CONFIG_DUMMY_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE is not set +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y # CONFIG_SOUND is not set -# CONFIG_HID_SUPPORT is not set + +# +# HID support +# +CONFIG_HID=y +# CONFIG_HIDRAW is not set +CONFIG_HID_GENERIC=y + +# +# Special HID drivers +# CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB_ARCH_HAS_XHCI=y @@ -1141,11 +1226,13 @@ CONFIG_RTC_DRV_PL031=y # CONFIG_DMADEVICES is not set # CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set +CONFIG_VIRTIO=y +CONFIG_VIRTIO_RING=y # # Virtio drivers # -# CONFIG_VIRTIO_PCI is not set +CONFIG_VIRTIO_PCI=y # CONFIG_VIRTIO_BALLOON is not set # CONFIG_VIRTIO_MMIO is not set @@ -1171,6 +1258,10 @@ CONFIG_CLKSRC_MMIO=y # CONFIG_VIRT_DRIVERS=y # CONFIG_PM_DEVFREQ is not set +# CONFIG_EXTCON is not set +# CONFIG_MEMORY is not set +# CONFIG_IIO is not set +# CONFIG_VME_BUS is not set # # File systems @@ -1227,7 +1318,16 @@ CONFIG_TMPFS=y # CONFIG_HUGETLB_PAGE is not set # CONFIG_CONFIGFS_FS is not set # CONFIG_MISC_FILESYSTEMS is not set -# CONFIG_NETWORK_FILESYSTEMS is not set +CONFIG_NETWORK_FILESYSTEMS=y +# CONFIG_NFS_FS is not set +# CONFIG_NFSD is not set +# CONFIG_CEPH_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +CONFIG_9P_FS=y +# CONFIG_9P_FS_POSIX_ACL is not set CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-15" # CONFIG_NLS_CODEPAGE_437 is not set @@ -1267,6 +1367,17 @@ CONFIG_NLS_ISO8859_1=m CONFIG_NLS_ISO8859_15=y # CONFIG_NLS_KOI8_R is not set # CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_MAC_ROMAN is not set +# CONFIG_NLS_MAC_CELTIC is not set +# CONFIG_NLS_MAC_CENTEURO is not set +# CONFIG_NLS_MAC_CROATIAN is not set +# CONFIG_NLS_MAC_CYRILLIC is not set +# CONFIG_NLS_MAC_GAELIC is not set +# CONFIG_NLS_MAC_GREEK is not set +# CONFIG_NLS_MAC_ICELAND is not set +# CONFIG_NLS_MAC_INUIT is not set +# CONFIG_NLS_MAC_ROMANIAN is not set +# CONFIG_NLS_MAC_TURKISH is not set # CONFIG_NLS_UTF8 is not set # @@ -1279,6 +1390,7 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_FRAME_WARN=1024 # CONFIG_MAGIC_SYSRQ is not set CONFIG_STRIP_ASM_SYMS=y +# CONFIG_READABLE_ASM is not set # CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set @@ -1287,6 +1399,8 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_SHIRQ is not set # CONFIG_LOCKUP_DETECTOR is not set # CONFIG_HARDLOCKUP_DETECTOR is not set +# CONFIG_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_VALUE=0 # CONFIG_DETECT_HUNG_TASK is not set # CONFIG_SCHED_DEBUG is not set # CONFIG_SCHEDSTATS is not set @@ -1388,3 +1502,4 @@ CONFIG_NLATTR=y CONFIG_GENERIC_ATOMIC64=y # CONFIG_AVERAGE is not set # CONFIG_CORDIC is not set +# CONFIG_DDR is not set diff --git a/patches/linux-3.4.2/0001-fix-versatile.patch b/patches/linux-3.4.2/0001-fix-versatile.patch deleted file mode 100644 index 1b66f23..0000000 --- a/patches/linux-3.4.2/0001-fix-versatile.patch +++ /dev/null @@ -1,209 +0,0 @@ -From: Arnd Bergmann <arnd@arndb.de> - -With commit 4d5fc58dbe34b (ARM: remove bunch of now unused -mach/io.h files), the I/O space setup was completely broken on -versatile. This patch fixes that and prepares for further -I/O space clean-up. - -I/O space handling on the versatile platform is currently -broken in multiple ways. Most importantly, the ports do -not get mapped into the virtual address space at all. - -Also, there is some amount of confusion between PCI I/O -space and other statically mapped MMIO registers in the -platform code: - -* The __io_address() macro that is used to access the - platform register maps to the same __io macro that gets - used for I/O space. - -* The IO_SPACE_LIMIT is set to a value that is much larger - than the total available space. - -* The I/O resource of the PCI bus is set to the physical - address of the mapping, which is way outside of the - actual I/O space limit as well as the address range that - gets decoded by traditional PCI cards. - -* No attempt is made to stay outside of the ISA port range - that some device drivers try access. - -* No resource gets requested as a child of ioport_resource, - but an IORESOURCE_IO type mapping gets requested - as a child of iomem_resource. - -This patch attempts to correct all of the above. This makes -it possible to use virtio-pci based virtual devices as well -as actual PCI cards including those with legacy ISA port -ranges like VGA. - -Some of the issues seem to be duplicated on other platforms. - -Signed-off-by: Arnd Bergmann <arnd@arndb.de> -[rob: update to 3.5-rc2 and io.h cleanup related changes] -Signed-off-by: Rob Herring <rob.herring@calxeda.com> ---- -Arnd, Olof, - -This should be applied for 3.5. There is a more simple fix to just -restore IO_RESOURCE_LIMIT to 0xffffffff, but I think that moves in -the wrong direction. This patch is needed to unify the I/O space -mapping. - -Rob - - arch/arm/Kconfig | 1 - arch/arm/mach-versatile/core.c | 19 ++-------------- - arch/arm/mach-versatile/include/mach/hardware.h | 3 +- - arch/arm/mach-versatile/include/mach/io.h | 27 ++++++++++++++++++++++++ - arch/arm/mach-versatile/pci.c | 18 ++++++++++++++-- - 5 files changed, 49 insertions(+), 19 deletions(-) - create mode 100644 arch/arm/mach-versatile/include/mach/io.h - -Index: linux-3.4.2/arch/arm/Kconfig -=================================================================== ---- linux-3.4.2.orig/arch/arm/Kconfig -+++ linux-3.4.2/arch/arm/Kconfig -@@ -308,6 +308,7 @@ config ARCH_VERSATILE - select ICST - select GENERIC_CLOCKEVENTS - select ARCH_WANT_OPTIONAL_GPIOLIB -+ select NEED_MACH_IO_H if PCI - select PLAT_VERSATILE - select PLAT_VERSATILE_CLCD - select PLAT_VERSATILE_FPGA_IRQ -Index: linux-3.4.2/arch/arm/mach-versatile/core.c -=================================================================== ---- linux-3.4.2.orig/arch/arm/mach-versatile/core.c -+++ linux-3.4.2/arch/arm/mach-versatile/core.c -@@ -172,26 +172,13 @@ static struct map_desc versatile_io_desc - .pfn = __phys_to_pfn(VERSATILE_PCI_CFG_BASE), - .length = VERSATILE_PCI_CFG_BASE_SIZE, - .type = MT_DEVICE -- }, --#if 0 -- { -- .virtual = VERSATILE_PCI_VIRT_MEM_BASE0, -- .pfn = __phys_to_pfn(VERSATILE_PCI_MEM_BASE0), -- .length = SZ_16M, -- .type = MT_DEVICE - }, { -- .virtual = VERSATILE_PCI_VIRT_MEM_BASE1, -- .pfn = __phys_to_pfn(VERSATILE_PCI_MEM_BASE1), -- .length = SZ_16M, -- .type = MT_DEVICE -- }, { -- .virtual = VERSATILE_PCI_VIRT_MEM_BASE2, -- .pfn = __phys_to_pfn(VERSATILE_PCI_MEM_BASE2), -- .length = SZ_16M, -+ .virtual = (unsigned long)VERSATILE_PCI_VIRT_MEM_BASE0, -+ .pfn = __phys_to_pfn(VERSATILE_PCI_MEM_BASE0), -+ .length = IO_SPACE_LIMIT, - .type = MT_DEVICE - }, - #endif --#endif - }; - - void __init versatile_map_io(void) -Index: linux-3.4.2/arch/arm/mach-versatile/include/mach/hardware.h -=================================================================== ---- linux-3.4.2.orig/arch/arm/mach-versatile/include/mach/hardware.h -+++ linux-3.4.2/arch/arm/mach-versatile/include/mach/hardware.h -@@ -29,8 +29,9 @@ - */ - #define VERSATILE_PCI_VIRT_BASE (void __iomem *)0xe8000000ul - #define VERSATILE_PCI_CFG_VIRT_BASE (void __iomem *)0xe9000000ul -+#define VERSATILE_PCI_VIRT_MEM_BASE0 (void __iomem *)PCIO_BASE - --/* macro to get at IO space when running virtually */ -+/* macro to get at MMIO space when running virtually */ - #define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000) - - #define __io_address(n) ((void __iomem __force *)IO_ADDRESS(n)) -Index: linux-3.4.2/arch/arm/mach-versatile/include/mach/io.h -=================================================================== ---- /dev/null -+++ linux-3.4.2/arch/arm/mach-versatile/include/mach/io.h -@@ -0,0 +1,27 @@ -+/* -+ * arch/arm/mach-versatile/include/mach/io.h -+ * -+ * Copyright (C) 2003 ARM Limited -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ */ -+#ifndef __ASM_ARM_ARCH_IO_H -+#define __ASM_ARM_ARCH_IO_H -+ -+#define PCIO_BASE 0xeb000000ul -+ -+#define __io(a) ((a) + PCIO_BASE) -+ -+#endif -Index: linux-3.4.2/arch/arm/mach-versatile/pci.c -=================================================================== ---- linux-3.4.2.orig/arch/arm/mach-versatile/pci.c -+++ linux-3.4.2/arch/arm/mach-versatile/pci.c -@@ -169,11 +169,18 @@ static struct pci_ops pci_versatile_ops - .write = versatile_write_config, - }; - -+static struct resource io_port = { -+ .name = "PCI", -+ .start = 0, -+ .end = IO_SPACE_LIMIT, -+ .flags = IORESOURCE_IO, -+}; -+ - static struct resource io_mem = { - .name = "PCI I/O space", - .start = VERSATILE_PCI_MEM_BASE0, - .end = VERSATILE_PCI_MEM_BASE0+VERSATILE_PCI_MEM_BASE0_SIZE-1, -- .flags = IORESOURCE_IO, -+ .flags = IORESOURCE_MEM, - }; - - static struct resource non_mem = { -@@ -200,6 +207,12 @@ static int __init pci_versatile_setup_re - "memory region (%d)\n", ret); - goto out; - } -+ ret = request_resource(&ioport_resource, &io_port); -+ if (ret) { -+ printk(KERN_ERR "PCI: unable to allocate I/O " -+ "port region (%d)\n", ret); -+ goto out; -+ } - ret = request_resource(&iomem_resource, &non_mem); - if (ret) { - printk(KERN_ERR "PCI: unable to allocate non-prefetchable " -@@ -218,7 +231,7 @@ static int __init pci_versatile_setup_re - * the mem resource for this bus - * the prefetch mem resource for this bus - */ -- pci_add_resource_offset(&sys->resources, &io_mem, sys->io_offset); -+ pci_add_resource_offset(&sys->resources, &io_port, sys->io_offset); - pci_add_resource_offset(&sys->resources, &non_mem, sys->mem_offset); - pci_add_resource_offset(&sys->resources, &pre_mem, sys->mem_offset); - -@@ -249,6 +262,7 @@ int __init pci_versatile_setup(int nr, s - - if (nr == 0) { - sys->mem_offset = 0; -+ sys->io_offset = 0; - ret = pci_versatile_setup_resources(sys); - if (ret < 0) { - printk("pci_versatile_setup: resources... oops?\n"); diff --git a/patches/linux-3.4.2/series.pengutronix-versatilepb b/patches/linux-3.4.2/series.pengutronix-versatilepb deleted file mode 100644 index 5e6ea60..0000000 --- a/patches/linux-3.4.2/series.pengutronix-versatilepb +++ /dev/null @@ -1 +0,0 @@ -0001-fix-versatile.patch diff --git a/platformconfig b/platformconfig index 589de12..ff3449e 100644 --- a/platformconfig +++ b/platformconfig @@ -1,8 +1,8 @@ # # Automatically generated make config: don't edit -# PTXdist 2012.06.0 +# PTXdist 2012.07.0-00032-g4f8613d # -PTXCONF_PLATFORMCONFIG_VERSION="2012.06.0" +PTXCONF_PLATFORMCONFIG_VERSION="2012.07.0-00032-g4f8613d" PTXCONF_RUNTIME=y PTXCONF_BUILDTIME=y PTXCONF__platformconfig_MAGIC__=y @@ -19,7 +19,7 @@ PTXCONF__platformconfig_MAGIC__=y # ------------------------------------ # PTXCONF_PLATFORM="pengutronix-versatilepb" -PTXCONF_PLATFORM_VERSION="-2011.01.0" +PTXCONF_PLATFORM_VERSION="-2012.07.0+master" # # architecture @@ -83,18 +83,18 @@ PTXCONF_KERNEL=y PTXCONF_KERNEL_MODULES=y PTXCONF_KERNEL_MODULES_INSTALL=y PTXCONF_KERNEL_MODULES_BUILD="modules" -PTXCONF_KERNEL_VERSION="3.4.2" -PTXCONF_KERNEL_MD5="ee05aa80a4766bc1f3f2cd2bf85b6267" +PTXCONF_KERNEL_VERSION="3.5.3" +PTXCONF_KERNEL_MD5="025dad5bdd416c052e78130d6e527379" PTXCONF_KERNEL_ARCH_STRING="arm" # PTXCONF_KERNEL_IMAGE_BZ is not set -# PTXCONF_KERNEL_IMAGE_Z is not set +PTXCONF_KERNEL_IMAGE_Z=y # PTXCONF_KERNEL_IMAGE_XIP is not set -PTXCONF_KERNEL_IMAGE_U=y +# PTXCONF_KERNEL_IMAGE_U is not set # PTXCONF_KERNEL_IMAGE_VM is not set # PTXCONF_KERNEL_IMAGE_VMLINUX is not set # PTXCONF_KERNEL_IMAGE_RAW is not set # PTXCONF_KERNEL_IMAGE_SIMPLE is not set -PTXCONF_KERNEL_IMAGE="uImage" +PTXCONF_KERNEL_IMAGE="zImage" # PTXCONF_KERNEL_XZ is not set # PTXCONF_KERNEL_LZOP is not set @@ -142,6 +142,7 @@ PTXCONF_FLASH_BLOCKSIZE="128k" # # image creation options # +# PTXCONF_IMAGE_BOOT_MLO_VFAT is not set # PTXCONF_IMAGE_CPIO is not set # PTXCONF_IMAGE_CPIO_GZ is not set PTXCONF_IMAGE_EXT2=y @@ -149,6 +150,7 @@ PTXCONF_IMAGE_EXT2_SIZE=40000 PTXCONF_IMAGE_EXT2_EXTRA_ARGS="-N3000" # PTXCONF_IMAGE_EXT2_GZIP is not set # PTXCONF_IMAGE_EXT2_JOURNAL is not set +# PTXCONF_IMAGE_EXT2_EXT4 is not set PTXCONF_IMAGE_HD=y PTXCONF_IMAGE_HD_PART1=y PTXCONF_IMAGE_HD_PART1_START="1" @@ -175,19 +177,28 @@ PTXCONF_IMAGE_KERNEL_INSTALL_EARLY=y # PTXCONF_IMAGE_UBI is not set # PTXCONF_IMAGE_UBIFS is not set # PTXCONF_IMAGE_UIMAGE is not set + +# +# new image creation options +# +# PTXCONF_IMAGE_BOOT_MLO is not set +# PTXCONF_IMAGE_ROOT_EXT is not set +# PTXCONF_IMAGE_ROOT_TGZ is not set PTXCONF_CROSS_MODULE_INIT_TOOLS=y # PTXCONF_HOST_CDRKIT is not set # PTXCONF_HOST_CMAKE is not set # PTXCONF_HOST_CRAMFS is not set # PTXCONF_HOST_DOSFSTOOLS is not set -# PTXCONF_HOST_E2FSPROGS is not set +PTXCONF_HOST_E2FSPROGS=y PTXCONF_HOST_GENEXT2FS=y +# PTXCONF_HOST_GENIMAGE is not set PTXCONF_HOST_GENPART=y # PTXCONF_HOST_LIBICONV is not set # PTXCONF_HOST_GETTEXT is not set # PTXCONF_HOST_LIBBLKID is not set # PTXCONF_HOST_LIBBZ2 is not set # PTXCONF_HOST_LIBCAP is not set +# PTXCONF_HOST_LIBCONFUSE is not set # PTXCONF_HOST_LIBLZO is not set # PTXCONF_HOST_LIBUUID is not set # PTXCONF_HOST_LZOP is not set @@ -196,7 +207,7 @@ PTXCONF_HOST_GENPART=y # PTXCONF_HOST_MTOOLS is not set # PTXCONF_HOST_OPENSSL is not set # PTXCONF_HOST_SQUASHFS_TOOLS is not set -PTXCONF_HOST_U_BOOT_TOOLS=y +# PTXCONF_HOST_U_BOOT_TOOLS is not set # PTXCONF_HOST_UTIL_LINUX_NG is not set # PTXCONF_HOST_XL_TOOLS is not set # PTXCONF_HOST_XZ is not set |