Changeset 30791


Ignore:
Timestamp:
2012-03-02T19:04:02+01:00 (6 years ago)
Author:
juhosg
Message:

ppc40x: switch to 3.2.9

Location:
trunk/target/linux/ppc40x
Files:
5 edited

Legend:

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

    r29965 r30791  
    1414MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> 
    1515 
    16 LINUX_VERSION:=3.0.18 
     16LINUX_VERSION:=3.2.9 
    1717 
    1818include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/ppc40x/config-default

    r23777 r30791  
    77# CONFIG_ACADIA is not set 
    88# CONFIG_ADVANCED_OPTIONS is not set 
     9# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set 
    910CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 
    1011CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 
    1112CONFIG_ARCH_HAS_ILOG2_U32=y 
    1213CONFIG_ARCH_HAS_WALK_MEMORY=y 
     14CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y 
     15CONFIG_ARCH_HIBERNATION_POSSIBLE=y 
    1316CONFIG_ARCH_MAY_HAVE_PC_FDC=y 
    1417# CONFIG_ARCH_NO_VIRT_TO_BUS is not set 
    1518# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set 
    1619CONFIG_ARCH_POPULATES_NODE_MAP=y 
    17 CONFIG_ARCH_REQUIRE_GPIOLIB=y 
    1820CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 
    1921CONFIG_ARCH_SUPPORTS_MSI=y 
     22CONFIG_ARCH_SUSPEND_POSSIBLE=y 
    2023CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y 
    2124CONFIG_AUDIT_ARCH=y 
    22 CONFIG_BITREVERSE=y 
     25CONFIG_BCMA_POSSIBLE=y 
    2326# CONFIG_BOOKE_WDT is not set 
    2427CONFIG_BOUNCE=y 
    2528CONFIG_CC_OPTIMIZE_FOR_SIZE=y 
    26 CONFIG_CFG80211_DEFAULT_PS_VALUE=0 
    2729CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2 noinitrd" 
    2830CONFIG_CMDLINE_BOOL=y 
     
    3032CONFIG_DECOMPRESS_LZMA=y 
    3133# CONFIG_DEFAULT_UIMAGE is not set 
    32 CONFIG_DEVPORT=y 
    3334CONFIG_DTC=y 
    3435# CONFIG_E200 is not set 
    3536CONFIG_EARLY_PRINTK=y 
    3637# CONFIG_EP405 is not set 
     38# CONFIG_EPAPR_BOOT is not set 
    3739CONFIG_EXTRA_TARGETS="uImage" 
    38 CONFIG_FORCE_MAX_ZONEORDER=11 
    3940# CONFIG_FSL_ULI1575 is not set 
    40 # CONFIG_FSNOTIFY is not set 
    4141CONFIG_GENERIC_ATOMIC64=y 
    4242CONFIG_GENERIC_BUG=y 
     
    4444CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 
    4545CONFIG_GENERIC_CMOS_UPDATE=y 
    46 CONFIG_GENERIC_FIND_LAST_BIT=y 
    47 CONFIG_GENERIC_FIND_NEXT_BIT=y 
    4846CONFIG_GENERIC_GPIO=y 
    49 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 
    50 # CONFIG_GENERIC_IOMAP is not set 
     47CONFIG_GENERIC_IRQ_SHOW=y 
     48CONFIG_GENERIC_IRQ_SHOW_LEVEL=y 
     49CONFIG_GENERIC_ISA_DMA=y 
    5150CONFIG_GENERIC_NVRAM=y 
    5251# CONFIG_GENERIC_TBSYNC is not set 
     
    5958CONFIG_HAS_IOPORT=y 
    6059# CONFIG_HAS_RAPIDIO is not set 
     60CONFIG_HAVE_ARCH_JUMP_LABEL=y 
    6161CONFIG_HAVE_ARCH_KGDB=y 
    6262CONFIG_HAVE_ARCH_TRACEHOOK=y 
     
    6969CONFIG_HAVE_FUNCTION_TRACER=y 
    7070# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 
     71CONFIG_HAVE_GENERIC_HARDIRQS=y 
    7172CONFIG_HAVE_IDE=y 
    7273CONFIG_HAVE_IOREMAP_PROT=y 
    73 CONFIG_HAVE_KPROBES=y 
    74 CONFIG_HAVE_KRETPROBES=y 
     74CONFIG_HAVE_IRQ_WORK=y 
    7575CONFIG_HAVE_LATENCYTOP_SUPPORT=y 
    76 CONFIG_HAVE_LMB=y 
     76CONFIG_HAVE_MEMBLOCK=y 
    7777CONFIG_HAVE_OPROFILE=y 
    7878CONFIG_HAVE_PERF_EVENTS=y 
     79CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y 
    7980# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 
    80 # CONFIG_HCU4 is not set 
     81CONFIG_HAVE_SPARSE_IRQ=y 
     82CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 
    8183# CONFIG_HOTFOOT is not set 
    8284CONFIG_HW_RANDOM=y 
     
    8486# CONFIG_HZ_100 is not set 
    8587CONFIG_HZ_250=y 
    86 CONFIG_IBM_NEW_EMAC=y 
    87 # CONFIG_IBM_NEW_EMAC_DEBUG is not set 
    88 CONFIG_IBM_NEW_EMAC_EMAC4=y 
    89 CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32 
    90 CONFIG_IBM_NEW_EMAC_RGMII=y 
    91 CONFIG_IBM_NEW_EMAC_RXB=256 
    92 CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256 
    93 CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0 
    94 CONFIG_IBM_NEW_EMAC_TXB=256 
     88CONFIG_IBM_EMAC=y 
     89CONFIG_IBM_EMAC_EMAC4=y 
     90CONFIG_IBM_EMAC_POLL_WEIGHT=32 
     91CONFIG_IBM_EMAC_RGMII=y 
     92CONFIG_IBM_EMAC_RXB=256 
     93CONFIG_IBM_EMAC_RX_COPY_THRESHOLD=256 
     94CONFIG_IBM_EMAC_RX_SKB_HEADROOM=0 
     95CONFIG_IBM_EMAC_TXB=256 
    9596CONFIG_INITRAMFS_SOURCE="" 
    9697CONFIG_IOMMU_HELPER=y 
    9798# CONFIG_IPIC is not set 
    98 # CONFIG_IRQSTACKS is not set 
    99 CONFIG_IRQ_PER_CPU=y 
    10099CONFIG_ISA_DMA_API=y 
    101 # CONFIG_ISDN_CAPI is not set 
    102 # CONFIG_ISDN_I4L is not set 
    103100CONFIG_KERNEL_START=0xc0000000 
    104101CONFIG_KILAUEA=y 
    105102CONFIG_LEDS_GPIO=m 
    106 CONFIG_LEDS_GPIO_OF=y 
    107103CONFIG_LOWMEM_SIZE=0x30000000 
    108104CONFIG_MAGICBOX=y 
     
    110106# CONFIG_MATH_EMULATION is not set 
    111107CONFIG_MAX_ACTIVE_REGIONS=32 
     108# CONFIG_MLX4_CORE is not set 
    112109# CONFIG_MMIO_NVRAM is not set 
    113110# CONFIG_MPIC is not set 
     111# CONFIG_MPIC_U3_HT_IRQS is not set 
    114112# CONFIG_MPIC_WEIRD is not set 
    115113CONFIG_MTD_CFI_ADV_OPTIONS=y 
     
    118116CONFIG_MTD_OF_PARTS=y 
    119117CONFIG_MTD_PHYSMAP_OF=y 
     118CONFIG_NEED_DMA_MAP_STATE=y 
    120119# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 
     120CONFIG_NEED_PER_CPU_KM=y 
     121CONFIG_NEED_SG_DMA_LENGTH=y 
    121122CONFIG_NLS=m 
    122123CONFIG_NOT_COHERENT_CACHE=y 
    123124CONFIG_NR_IRQS=512 
    124125CONFIG_OF=y 
     126CONFIG_OF_ADDRESS=y 
    125127CONFIG_OF_DEVICE=y 
     128CONFIG_OF_DYNAMIC=y 
     129CONFIG_OF_EARLY_FLATTREE=y 
     130CONFIG_OF_FLATTREE=y 
    126131CONFIG_OF_GPIO=y 
     132CONFIG_OF_IRQ=y 
     133CONFIG_OF_NET=y 
     134CONFIG_OF_PCI=y 
     135CONFIG_OF_PCI_IRQ=y 
    127136CONFIG_OPENRB=y 
    128137CONFIG_PAGEFLAGS_EXTENDED=y 
     
    138147CONFIG_PPC32=y 
    139148CONFIG_PPC40x_SIMPLE=y 
     149CONFIG_PPC4xx_MSI=y 
    140150CONFIG_PPC4xx_PCI_EXPRESS=y 
    141151# CONFIG_PPC64 is not set 
     
    143153# CONFIG_PPC_8xx is not set 
    144154# CONFIG_PPC_970_NAP is not set 
     155CONFIG_PPC_ADV_DEBUG_DACS=2 
     156CONFIG_PPC_ADV_DEBUG_DVCS=0 
     157CONFIG_PPC_ADV_DEBUG_IACS=2 
     158CONFIG_PPC_ADV_DEBUG_REGS=y 
    145159# CONFIG_PPC_BOOK3S_32 is not set 
    146160# CONFIG_PPC_CELL is not set 
     
    151165CONFIG_PPC_DCR_NATIVE=y 
    152166# CONFIG_PPC_EARLY_DEBUG is not set 
     167# CONFIG_PPC_EPAPR_HV_BYTECHAN is not set 
     168# CONFIG_PPC_EPAPR_HV_PIC is not set 
    153169# CONFIG_PPC_I8259 is not set 
    154 # CONFIG_PPC_INDIRECT_IO is not set 
     170# CONFIG_PPC_ICP_HV is not set 
     171# CONFIG_PPC_ICP_NATIVE is not set 
     172# CONFIG_PPC_ICS_RTAS is not set 
    155173CONFIG_PPC_INDIRECT_PCI=y 
    156174CONFIG_PPC_MMU_NOHASH=y 
    157 CONFIG_PPC_MMU_NOHASH_32=y 
    158175# CONFIG_PPC_MM_SLICES is not set 
    159176# CONFIG_PPC_MPC106 is not set 
     177CONFIG_PPC_MSI_BITMAP=y 
    160178CONFIG_PPC_OF=y 
     179# CONFIG_PPC_P7_NAP is not set 
    161180CONFIG_PPC_PCI_CHOICE=y 
    162181# CONFIG_PPC_RTAS is not set 
    163182CONFIG_PPC_UDBG_16550=y 
    164183CONFIG_PPC_WERROR=y 
     184# CONFIG_PPC_WSP is not set 
     185# CONFIG_PPC_XICS is not set 
    165186# CONFIG_PQ2ADS is not set 
     187# CONFIG_PREEMPT_RCU is not set 
    166188CONFIG_PRINT_STACK_DEPTH=64 
    167189CONFIG_PROC_DEVICETREE=y 
     190# CONFIG_QUOTACTL is not set 
    168191CONFIG_RWSEM_XCHGADD_ALGORITHM=y 
    169192CONFIG_SCHED_HRTICK=y 
    170 CONFIG_SCHED_OMIT_FRAME_POINTER=y 
    171193# CONFIG_SCSI_DMA is not set 
    172194# CONFIG_SERIAL_8250_DETECT_IRQ is not set 
     
    180202CONFIG_SWIOTLB=y 
    181203CONFIG_TASK_SIZE=0xc0000000 
    182 # CONFIG_TREE_PREEMPT_RCU is not set 
    183 CONFIG_TREE_RCU=y 
    184204CONFIG_USB=m 
     205CONFIG_USB_ARCH_HAS_XHCI=y 
     206CONFIG_USB_COMMON=m 
    185207# CONFIG_USB_EHCI_HCD is not set 
    186208CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y 
     
    190212CONFIG_USB_OHCI_HCD_PPC_OF=y 
    191213CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 
    192 # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set 
    193214CONFIG_USB_SUPPORT=y 
    194215# CONFIG_USB_UHCI_HCD is not set 
     
    197218# CONFIG_XILINX_SYSACE is not set 
    198219# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set 
     220CONFIG_XZ_DEC=y 
  • trunk/target/linux/ppc40x/patches/004-magicbox.patch

    r27826 r30791  
    408408  
    409409 src-boot := $(addprefix $(obj)/, $(src-boot)) 
    410 @@ -198,6 +200,7 @@ image-$(CONFIG_EP405)                       += dtbImage.ep40 
     410@@ -199,6 +201,7 @@ image-$(CONFIG_EP405)                       += dtbImage.ep40 
    411411 image-$(CONFIG_HOTFOOT)                        += cuImage.hotfoot 
    412412 image-$(CONFIG_WALNUT)                 += treeImage.walnut 
     
    418418--- a/arch/powerpc/platforms/40x/Kconfig 
    419419+++ b/arch/powerpc/platforms/40x/Kconfig 
    420 @@ -62,6 +62,16 @@ config KILAUEA 
     420@@ -54,6 +54,16 @@ config KILAUEA 
    421421        help 
    422422          This option enables support for the AMCC PPC405EX evaluation board. 
  • trunk/target/linux/ppc40x/patches/005-openrb.patch

    r27826 r30791  
    409409  
    410410 src-boot := $(addprefix $(obj)/, $(src-boot)) 
    411 @@ -201,6 +202,7 @@ image-$(CONFIG_HOTFOOT)                     += cuImage.hot 
     411@@ -202,6 +203,7 @@ image-$(CONFIG_HOTFOOT)                     += cuImage.hot 
    412412 image-$(CONFIG_WALNUT)                 += treeImage.walnut 
    413413 image-$(CONFIG_ACADIA)                 += cuImage.acadia 
     
    419419--- a/arch/powerpc/platforms/40x/Kconfig 
    420420+++ b/arch/powerpc/platforms/40x/Kconfig 
    421 @@ -72,6 +72,16 @@ config MAGICBOX 
     421@@ -64,6 +64,16 @@ config MAGICBOX 
    422422        help 
    423423          This option enables support for the Magicbox boards. 
  • trunk/target/linux/ppc40x/patches/101-pata-magicbox-cf-driver.patch

    r30789 r30791  
    2020--- a/drivers/ata/Makefile 
    2121+++ b/drivers/ata/Makefile 
    22 @@ -80,6 +80,7 @@ obj-$(CONFIG_PATA_AT91)               += pata_at91.o 
     22@@ -81,6 +81,7 @@ obj-$(CONFIG_PATA_AT91)               += pata_at91.o 
    2323 obj-$(CONFIG_PATA_CMD640_PCI)  += pata_cmd640.o 
    2424 obj-$(CONFIG_PATA_ISAPNP)      += pata_isapnp.o 
Note: See TracChangeset for help on using the changeset viewer.