Changeset 12066


Ignore:
Timestamp:
2008-08-01T21:34:37+02:00 (10 years ago)
Author:
juhosg
Message:

[magicbox] update to 2.6.26

Location:
trunk/target/linux/magicbox
Files:
4 edited

Legend:

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

    r11184 r12066  
    1 #  
    2 # Copyright (C) 2006 OpenWrt.org 
     1# 
     2# Copyright (C) 2006-2008 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1212FEATURES:=squashfs pci 
    1313 
    14 LINUX_VERSION:=2.6.24.7 
     14LINUX_VERSION:=2.6.26 
    1515LINUX_KARCH:=ppc 
    1616 
  • trunk/target/linux/magicbox/config-default

    r11097 r12066  
    66# CONFIG_8139TOO is not set 
    77# CONFIG_8xx is not set 
     8# CONFIG_ACCESSIBILITY is not set 
    89# CONFIG_ADVANCED_OPTIONS is not set 
    910# CONFIG_AGP is not set 
     11CONFIG_ARCH_HAS_ILOG2_U32=y 
     12# CONFIG_ARCH_HAS_ILOG2_U64 is not set 
    1013CONFIG_ARCH_MAY_HAVE_PC_FDC=y 
    1114CONFIG_ARCH_POPULATES_NODE_MAP=y 
    12 # CONFIG_ATM_DRIVERS is not set 
    13 # CONFIG_B44 is not set 
     15# CONFIG_ARCH_SUPPORTS_MSI is not set 
    1416CONFIG_BASE_SMALL=0 
    1517CONFIG_BIOS_FIXUP=y 
    16 # CONFIG_BLK_DEV_FD is not set 
    17 # CONFIG_BLK_DEV_HD is not set 
     18CONFIG_BITREVERSE=y 
     19# CONFIG_BLK_DEV_HD_ONLY is not set 
    1820CONFIG_BLK_DEV_IDE=m 
    19 # CONFIG_BLK_DEV_IDECD is not set 
    2021CONFIG_BLK_DEV_IDEDISK=m 
    2122# CONFIG_BLK_DEV_IDEDMA is not set 
    22 # CONFIG_BLK_DEV_IDEFLOPPY is not set 
    23 # CONFIG_BLK_DEV_IDEPCI is not set 
    24 # CONFIG_BLK_DEV_IDESCSI is not set 
    25 # CONFIG_BLK_DEV_IDETAPE is not set 
    26 # CONFIG_BLK_DEV_IDE_SATA is not set 
    2723CONFIG_BLK_DEV_MAGICBOX_IDE=y 
    2824# CONFIG_BOOKE_WDT is not set 
    2925CONFIG_BOOT_LOAD=0x00400000 
     26CONFIG_BOUNCE=y 
    3027# CONFIG_BT is not set 
    3128# CONFIG_BUBINGA is not set 
     29CONFIG_CLASSIC_RCU=y 
    3230CONFIG_CMDLINE="root=/dev/mtdblock1 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200 init=/etc/preinit" 
    3331CONFIG_CMDLINE_BOOL=y 
     
    3634# CONFIG_CPCI405 is not set 
    3735# CONFIG_CPU_FREQ is not set 
    38 # CONFIG_E200 is not set 
    39 # CONFIG_E500 is not set 
     36CONFIG_CRYPTO_AEAD=m 
     37CONFIG_CRYPTO_AUTHENC=m 
     38CONFIG_CRYPTO_GF128MUL=m 
     39# CONFIG_DEBUG_BUGVERBOSE is not set 
     40CONFIG_DEVPORT=y 
     41# CONFIG_DMADEVICES is not set 
    4042# CONFIG_EDAC is not set 
    4143# CONFIG_EP405 is not set 
    42 # CONFIG_FIRMWARE_EDID is not set 
    4344CONFIG_FS_POSIX_ACL=y 
     45CONFIG_GENERIC_BUG=y 
     46# CONFIG_GENERIC_FIND_FIRST_BIT is not set 
    4447CONFIG_GENERIC_FIND_NEXT_BIT=y 
    4548CONFIG_GENERIC_NVRAM=y 
    4649# CONFIG_GEN_RTC is not set 
     50CONFIG_HAS_DMA=y 
     51CONFIG_HAS_IOMEM=y 
     52CONFIG_HAS_IOPORT=y 
     53# CONFIG_HAVE_DMA_ATTRS is not set 
     54CONFIG_HAVE_IDE=y 
     55CONFIG_HAVE_KPROBES=y 
     56# CONFIG_HAVE_KRETPROBES is not set 
     57CONFIG_HAVE_OPROFILE=y 
    4758# CONFIG_HIGHMEM is not set 
    4859CONFIG_HIGHMEM_START=0xfe000000 
    4960CONFIG_HW_RANDOM=y 
    50 CONFIG_HZ=100 
    51 CONFIG_HZ_100=y 
    52 # CONFIG_HZ_250 is not set 
    5361# CONFIG_I2C is not set 
    5462CONFIG_IBM_EMAC=y 
     
    6068CONFIG_IBM_EMAC_RX_SKB_HEADROOM=0 
    6169CONFIG_IBM_EMAC_TXB=8 
     70# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 
     71# CONFIG_IBM_NEW_EMAC_RGMII is not set 
     72# CONFIG_IBM_NEW_EMAC_TAH is not set 
     73# CONFIG_IBM_NEW_EMAC_ZMII is not set 
    6274CONFIG_IBM_OCP=y 
    6375CONFIG_IDE=m 
    64 # CONFIG_IDEDISK_MULTI_MODE is not set 
    65 # CONFIG_IDEDMA_AUTO is not set 
    66 # CONFIG_IDE_ARM is not set 
    6776CONFIG_IDE_GENERIC=m 
    68 CONFIG_IDE_MAX_HWIFS=4 
    6977# CONFIG_IDE_PROC_FS is not set 
    70 # CONFIG_IDE_TASK_IOCTL is not set 
    7178CONFIG_INITRAMFS_SOURCE="" 
     79CONFIG_IPV6_NDISC_NODETYPE=y 
    7280CONFIG_ISA_DMA_API=y 
     81# CONFIG_IWLWIFI_LEDS is not set 
    7382CONFIG_KERNEL_START=0xc0000000 
    74 # CONFIG_KEXEC is not set 
    75 # CONFIG_LEDS_TRIGGER_IDE_DISK is not set 
     83# CONFIG_LEDS_ALIX is not set 
    7684CONFIG_LOWMEM_SIZE=0x30000000 
     85CONFIG_LZO_COMPRESS=m 
     86CONFIG_LZO_DECOMPRESS=m 
    7787# CONFIG_MACINTOSH_DRIVERS is not set 
    7888CONFIG_MAGICBOX=y 
    7989CONFIG_MATH_EMULATION=y 
    80 CONFIG_MINI_FO=y 
     90# CONFIG_MEDIA_ATTACH is not set 
     91# CONFIG_MEMSTICK is not set 
    8192CONFIG_MTD=y 
    8293# CONFIG_MTD_ABSENT is not set 
     94CONFIG_MTD_BLKDEVS=y 
    8395CONFIG_MTD_BLOCK=y 
    8496# CONFIG_MTD_BLOCK2MTD is not set 
     
    114126# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set 
    115127# CONFIG_MTD_MTDRAM is not set 
    116 # CONFIG_MTD_OBSOLETE_CHIPS is not set 
    117128# CONFIG_MTD_ONENAND is not set 
    118129# CONFIG_MTD_OTP is not set 
     
    132143# CONFIG_NATSEMI is not set 
    133144# CONFIG_NE2K_PCI is not set 
     145# CONFIG_NETDEV_1000 is not set 
    134146# CONFIG_NET_VENDOR_3COM is not set 
    135 # CONFIG_NETDEV_1000 is not set 
    136147CONFIG_NOT_COHERENT_CACHE=y 
    137148# CONFIG_NVRAM is not set 
     149# CONFIG_OCF_OCF is not set 
     150CONFIG_PAGEFLAGS_EXTENDED=y 
     151CONFIG_PCI=y 
    138152# CONFIG_PCIPCWATCHDOG is not set 
    139 CONFIG_PCI=y 
    140153CONFIG_PCI_DOMAINS=y 
     154CONFIG_PCI_SYSCALL=y 
    141155# CONFIG_PC_KEYBOARD is not set 
    142 # CONFIG_PM is not set 
    143156CONFIG_PPC=y 
    144157CONFIG_PPC32=y 
    145158CONFIG_PPC4xx_DMA=y 
    146159CONFIG_PPC4xx_EDMA=y 
     160CONFIG_PPC_DCR=y 
     161CONFIG_PPC_DCR_NATIVE=y 
    147162CONFIG_PPC_GEN550=y 
    148163# CONFIG_PPC_I8259 is not set 
    149164CONFIG_PPC_INDIRECT_PCI=y 
    150165CONFIG_PPC_OCP=y 
     166# CONFIG_R6040 is not set 
    151167# CONFIG_REDWOOD_5 is not set 
    152168# CONFIG_REDWOOD_6 is not set 
     169CONFIG_RFKILL_LEDS=y 
    153170CONFIG_RWSEM_XCHGADD_ALGORITHM=y 
     171# CONFIG_SCHED_HRTICK is not set 
    154172CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 
    155 # CONFIG_SCSI_BUSLOGIC is not set 
    156 # CONFIG_SCSI_EATA is not set 
    157 # CONFIG_SCSI_GDTH is not set 
    158 # CONFIG_SECCOMP is not set 
     173CONFIG_SCSI_WAIT_SCAN=m 
    159174# CONFIG_SERIAL_8250_EXTENDED is not set 
    160175# CONFIG_SERIAL_TEXT_DEBUG is not set 
     176CONFIG_SLABINFO=y 
    161177# CONFIG_SOFT_WATCHDOG is not set 
    162178# CONFIG_SOUND is not set 
    163179# CONFIG_SPARSEMEM_STATIC is not set 
     180# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set 
     181CONFIG_SSB_POSSIBLE=y 
    164182# CONFIG_SYCAMORE is not set 
     183CONFIG_SYSVIPC_SYSCTL=y 
    165184CONFIG_TASK_SIZE=0x80000000 
     185# CONFIG_THERMAL is not set 
     186# CONFIG_THERMAL_HWMON is not set 
    166187CONFIG_UART0_TTYS0=y 
    167188# CONFIG_UART0_TTYS1 is not set 
    168 # CONFIG_UNUSED_SYMBOLS is not set 
    169 # CONFIG_USER_NS is not set 
     189# CONFIG_VGASTATE is not set 
    170190# CONFIG_VIA_RHINE is not set 
     191CONFIG_VIDEO_ALLOW_V4L1=y 
     192CONFIG_VIDEO_MEDIA=m 
     193CONFIG_VIDEO_V4L1=m 
     194CONFIG_VIDEO_V4L2=m 
     195CONFIG_VIDEO_V4L2_COMMON=m 
    171196# CONFIG_WALNUT is not set 
    172197CONFIG_WANT_EARLY_SERIAL=y 
    173 # CONFIG_WINDFARM is not set 
     198CONFIG_WORD_SIZE=32 
    174199# CONFIG_XILINX_ML300 is not set 
    175200# CONFIG_XILINX_ML403 is not set 
  • trunk/target/linux/magicbox/patches/001-magicbox_support.patch

    r11205 r12066  
    1 Index: linux-2.6.24.7/arch/ppc/platforms/4xx/Kconfig 
    2 =================================================================== 
    3 --- linux-2.6.24.7.orig/arch/ppc/platforms/4xx/Kconfig 
    4 +++ linux-2.6.24.7/arch/ppc/platforms/4xx/Kconfig 
    5 @@ -53,6 +53,12 @@ config WALNUT 
     1--- a/arch/ppc/platforms/4xx/Kconfig 
     2+++ b/arch/ppc/platforms/4xx/Kconfig 
     3@@ -53,6 +53,12 @@ 
    64        help 
    75          This option enables support for the IBM PPC405GP evaluation board. 
     
    1614        bool "Xilinx-ML300" 
    1715        select XILINX_VIRTEX_II_PRO 
    18 @@ -184,7 +190,7 @@ config BOOKE 
     16@@ -184,7 +190,7 @@ 
    1917  
    2018 config IBM_OCP 
     
    2523  
    2624 config IBM_EMAC4 
    27 @@ -194,7 +200,7 @@ config IBM_EMAC4 
     25@@ -194,7 +200,7 @@ 
    2826  
    2927 config BIOS_FIXUP 
     
    3432  
    3533 # OAK doesn't exist but wanted to keep this around for any future 403GCX boards 
    36 @@ -205,7 +211,7 @@ config 403GCX 
     34@@ -205,7 +211,7 @@ 
    3735  
    3836 config 405EP 
     
    4341  
    4442 config 405GP 
    45 Index: linux-2.6.24.7/arch/ppc/platforms/4xx/Makefile 
    46 =================================================================== 
    47 --- linux-2.6.24.7.orig/arch/ppc/platforms/4xx/Makefile 
    48 +++ linux-2.6.24.7/arch/ppc/platforms/4xx/Makefile 
    49 @@ -14,6 +14,7 @@ obj-$(CONFIG_REDWOOD_6)               += redwood6.o 
     43--- a/arch/ppc/platforms/4xx/Makefile 
     44+++ b/arch/ppc/platforms/4xx/Makefile 
     45@@ -14,6 +14,7 @@ 
    5046 obj-$(CONFIG_SYCAMORE)         += sycamore.o 
    5147 obj-$(CONFIG_TAISHAN)          += taishan.o 
     
    5551 obj-$(CONFIG_XILINX_ML403)     += xilinx_ml403.o 
    5652  
    57 Index: linux-2.6.24.7/include/asm-ppc/ibm4xx.h 
    58 =================================================================== 
    59 --- linux-2.6.24.7.orig/include/asm-ppc/ibm4xx.h 
    60 +++ linux-2.6.24.7/include/asm-ppc/ibm4xx.h 
     53--- a/include/asm-ppc/ibm4xx.h 
     54+++ b/include/asm-ppc/ibm4xx.h 
    6155@@ -19,6 +19,10 @@ 
    6256  
  • trunk/target/linux/magicbox/patches/100-cf_slot.patch

    r11205 r12066  
    1 Index: linux-2.6.24.7/drivers/ide/ide.c 
    2 =================================================================== 
    3 --- linux-2.6.24.7.orig/drivers/ide/ide.c 
    4 +++ linux-2.6.24.7/drivers/ide/ide.c 
    5 @@ -1563,6 +1563,7 @@ done: 
    6  extern void __init pnpide_init(void); 
    7  extern void __exit pnpide_exit(void); 
    8  extern void __init h8300_ide_init(void); 
    9 +extern void __init ide_magicbox_init(void); 
     1--- a/drivers/ide/ide.c 
     2+++ b/drivers/ide/ide.c 
     3@@ -494,6 +494,9 @@ 
    104  
    11  /* 
    12   * probe_for_hwifs() finds/initializes "known" IDE interfaces 
    13 @@ -1627,6 +1628,9 @@ static void __init probe_for_hwifs (void 
    14  #ifdef CONFIG_H8300 
    15         h8300_ide_init(); 
     5        return -EPERM; 
    166 #endif 
    177+#ifdef CONFIG_BLK_DEV_MAGICBOX_IDE 
     
    2010 } 
    2111  
    22  /* 
    23 Index: linux-2.6.24.7/drivers/ide/Kconfig 
    24 =================================================================== 
    25 --- linux-2.6.24.7.orig/drivers/ide/Kconfig 
    26 +++ linux-2.6.24.7/drivers/ide/Kconfig 
    27 @@ -1018,6 +1018,14 @@ config BLK_DEV_MPC8xx_IDE 
     12 int set_pio_mode(ide_drive_t *drive, int arg) 
     13--- a/drivers/ide/Kconfig 
     14+++ b/drivers/ide/Kconfig 
     15@@ -928,6 +928,14 @@ 
    2816  
    2917          If unsure, say N. 
     
    4028        prompt "Type of MPC8xx IDE interface" 
    4129        depends on BLK_DEV_MPC8xx_IDE 
    42 Index: linux-2.6.24.7/drivers/ide/Makefile 
    43 =================================================================== 
    44 --- linux-2.6.24.7.orig/drivers/ide/Makefile 
    45 +++ linux-2.6.24.7/drivers/ide/Makefile 
    46 @@ -37,6 +37,7 @@ ide-core-$(CONFIG_BLK_DEV_Q40IDE)     += leg 
    47  # built-in only drivers from ppc/ 
    48  ide-core-$(CONFIG_BLK_DEV_MPC8xx_IDE)  += ppc/mpc8xx.o 
    49  ide-core-$(CONFIG_BLK_DEV_IDE_PMAC)    += ppc/pmac.o 
    50 +ide-core-$(CONFIG_BLK_DEV_MAGICBOX_IDE)        += ppc/magicbox_ide.o 
     30--- a/drivers/ide/ppc/Makefile 
     31+++ b/drivers/ide/ppc/Makefile 
     32@@ -1,3 +1,4 @@ 
    5133  
    52  # built-in only drivers from h8300/ 
    53  ide-core-$(CONFIG_IDE_H8300)           += h8300/ide-h8300.o 
     34 obj-$(CONFIG_BLK_DEV_IDE_PMAC)         += pmac.o 
     35 obj-$(CONFIG_BLK_DEV_MPC8xx_IDE)       += mpc8xx.o 
     36+obj-$(CONFIG_BLK_DEV_MAGICBOX_IDE)     += magicbox_ide.o 
Note: See TracChangeset for help on using the changeset viewer.