Changeset 10455


Ignore:
Timestamp:
2008-02-13T18:31:17+01:00 (8 years ago)
Author:
florian
Message:

Upgrade brcm63xx to 2.6.24

Location:
trunk/target/linux/brcm63xx
Files:
1 added
2 deleted
10 edited
1 copied

Legend:

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

    r10443 r10455  
    1111BOARDNAME:=Broadcom BCM963xx 
    1212FEATURES:=squashfs jffs2 broken usb atm 
    13 LINUX_VERSION:=2.6.22.18 
     13LINUX_VERSION:=2.6.24.2 
    1414 
    1515include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/brcm63xx/config-2.6.24

    r10446 r10455  
    11CONFIG_32BIT=y 
    22# CONFIG_64BIT is not set 
    3 # CONFIG_64BIT_PHYS_ADDR is not set 
    43# CONFIG_8139TOO is not set 
    54# CONFIG_ARCH_HAS_ILOG2_U32 is not set 
    65# CONFIG_ARCH_HAS_ILOG2_U64 is not set 
     6CONFIG_ARCH_POPULATES_NODE_MAP=y 
    77# CONFIG_ARCH_SUPPORTS_MSI is not set 
     8CONFIG_ARCH_SUPPORTS_OPROFILE=y 
    89CONFIG_ATM_DRIVERS=y 
    910CONFIG_AUDIT=y 
    1011CONFIG_AUDIT_GENERIC=y 
    1112CONFIG_BASE_SMALL=0 
     13# CONFIG_BCM47XX is not set 
    1214CONFIG_BCM963XX=y 
    1315CONFIG_BINFMT_MISC=m 
     
    1921# CONFIG_BSD_DISKLABEL is not set 
    2022CONFIG_BSD_PROCESS_ACCT_V3=y 
    21 CONFIG_CFE=y 
     23# CONFIG_BT_HCIUART_LL is not set 
    2224CONFIG_CICADA_PHY=m 
    2325# CONFIG_CIFS is not set 
     
    2931CONFIG_CPU_HAS_SYNC=y 
    3032# CONFIG_CPU_LITTLE_ENDIAN is not set 
     33# CONFIG_CPU_LOONGSON2 is not set 
    3134CONFIG_CPU_MIPS32=y 
    3235CONFIG_CPU_MIPS32_R1=y 
     
    5356# CONFIG_CPU_VR41XX is not set 
    5457CONFIG_CRAMFS=y 
     58# CONFIG_CRYPTO_HW is not set 
    5559CONFIG_DAVICOM_PHY=m 
    56 # CONFIG_DDB5477 is not set 
    5760CONFIG_DEBUG_FS=y 
    5861CONFIG_DEFAULT_BIC=y 
     
    7780CONFIG_FUSE_FS=m 
    7881CONFIG_FW_LOADER=m 
     82CONFIG_GENERIC_CLOCKEVENTS=y 
     83CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 
     84CONFIG_GENERIC_CMOS_UPDATE=y 
    7985CONFIG_GENERIC_FIND_NEXT_BIT=y 
    80 # CONFIG_GENERIC_GPIO is not set 
    8186# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set 
    82 # CONFIG_GEN_RTC is not set 
    8387# CONFIG_HAMRADIO is not set 
    8488CONFIG_HAS_DMA=y 
     
    9397CONFIG_HZ_250=y 
    9498# CONFIG_I2C is not set 
     99# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 
     100# CONFIG_IBM_NEW_EMAC_RGMII is not set 
     101# CONFIG_IBM_NEW_EMAC_TAH is not set 
     102# CONFIG_IBM_NEW_EMAC_ZMII is not set 
    95103# CONFIG_IDE is not set 
    96104CONFIG_INITRAMFS_SOURCE="" 
     
    119127CONFIG_KMOD=y 
    120128CONFIG_LBD=y 
     129# CONFIG_LEDS_ALIX is not set 
    121130# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set 
     131# CONFIG_LEMOTE_FULONG is not set 
    122132# CONFIG_LLC2 is not set 
    123133CONFIG_LXT_PHY=m 
     
    129139CONFIG_MAGIC_SYSRQ=y 
    130140CONFIG_MARVELL_PHY=m 
     141# CONFIG_MDIO_BITBANG is not set 
    131142CONFIG_MII=m 
    132143# CONFIG_MINIX_FS is not set 
     
    134145# CONFIG_MIPS_ATLAS is not set 
    135146# CONFIG_MIPS_COBALT is not set 
    136 # CONFIG_MIPS_EV64120 is not set 
    137147CONFIG_MIPS_L1_CACHE_SHIFT=5 
    138148# CONFIG_MIPS_MALTA is not set 
     
    142152# CONFIG_MIPS_SEAD is not set 
    143153# CONFIG_MIPS_SIM is not set 
    144 # CONFIG_MIPS_VPE_LOADER is not set 
    145154CONFIG_MODULE_FORCE_UNLOAD=y 
    146155CONFIG_MODVERSIONS=y 
    147 # CONFIG_MOMENCO_OCELOT is not set 
    148 # CONFIG_MOMENCO_OCELOT_3 is not set 
    149 # CONFIG_MOMENCO_OCELOT_C is not set 
    150156CONFIG_MTD=y 
    151157# CONFIG_MTD_ABSENT is not set 
     
    202208# CONFIG_NATSEMI is not set 
    203209# CONFIG_NE2K_PCI is not set 
    204 # CONFIG_NETDEV_1000 is not set 
    205 CONFIG_NET_SCH_FIFO=y 
    206210# CONFIG_NET_VENDOR_3COM is not set 
    207 CONFIG_NF_CT_PROTO_GRE=m 
    208 CONFIG_NF_NAT_PROTO_GRE=m 
    209211CONFIG_NLS=y 
    210212CONFIG_NLS_ASCII=m 
     213# CONFIG_NO_IOPORT is not set 
    211214# CONFIG_PAGE_SIZE_16KB is not set 
    212215CONFIG_PAGE_SIZE_4KB=y 
    213216# CONFIG_PAGE_SIZE_64KB is not set 
    214217# CONFIG_PAGE_SIZE_8KB is not set 
     218CONFIG_PCI_DOMAINS=y 
    215219CONFIG_PHYLIB=m 
     220# CONFIG_PMC_MSP is not set 
    216221# CONFIG_PMC_YOSEMITE is not set 
    217 # CONFIG_PNPACPI is not set 
    218222# CONFIG_PNX8550_JBS is not set 
    219223# CONFIG_PNX8550_STB810 is not set 
     
    222226CONFIG_RELAY=y 
    223227# CONFIG_RTC is not set 
     228CONFIG_RTC_LIB=y 
    224229CONFIG_RWSEM_GENERIC_SPINLOCK=y 
    225230CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 
     
    231236# CONFIG_SCTP_HMAC_NONE is not set 
    232237# CONFIG_SCTP_HMAC_SHA1 is not set 
     238# CONFIG_SENSORS_F71882FG is not set 
     239# CONFIG_SENSORS_I5K_AMB is not set 
     240# CONFIG_SENSORS_PC87360 is not set 
    233241# CONFIG_SERIAL_8250 is not set 
    234242CONFIG_SERIO=m 
     
    251259# CONFIG_SIBYTE_SENTOSA is not set 
    252260# CONFIG_SIBYTE_SWARM is not set 
     261CONFIG_SLABINFO=y 
    253262# CONFIG_SMSC_PHY is not set 
    254263# CONFIG_SOUND is not set 
    255264# CONFIG_SPARSEMEM_STATIC is not set 
     265# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set 
    256266CONFIG_SQUASHFS_EMBEDDED=y 
    257267CONFIG_SQUASHFS_VMALLOC=y 
     268CONFIG_SSB_POSSIBLE=y 
    258269CONFIG_SYSVIPC_SYSCTL=y 
    259270CONFIG_SYS_HAS_CPU_MIPS32_R1=y 
     
    269280CONFIG_TCP_CONG_VEGAS=m 
    270281# CONFIG_TCP_CONG_VENO is not set 
     282CONFIG_TICK_ONESHOT=y 
    271283CONFIG_TIPC=m 
    272284# CONFIG_TIPC_ADVANCED is not set 
     
    276288# CONFIG_TOSHIBA_RBTX4938 is not set 
    277289CONFIG_TRAD_SIGNALS=y 
    278 # CONFIG_UNUSED_SYMBOLS is not set 
    279290# CONFIG_USB_EHCI_HCD is not set 
     291# CONFIG_USB_R8A66597_HCD is not set 
     292# CONFIG_USB_SERIAL_CH341 is not set 
    280293# CONFIG_USB_UHCI_HCD is not set 
     294# CONFIG_USER_NS is not set 
    281295# CONFIG_VGASTATE is not set 
    282296# CONFIG_VIA_RHINE is not set 
  • trunk/target/linux/brcm63xx/files/arch/mips/bcm963xx/irq.c

    r6985 r10455  
    4141#include <bcm_intr.h> 
    4242 
    43 static void irq_dispatch_int(struct pt_regs *regs) 
     43static void irq_dispatch_int(void) 
    4444{ 
    4545        unsigned int pendingIrqs; 
     
    7979 
    8080 
    81 extern void brcm_timer_interrupt(struct pt_regs *regs); 
    82  
    83 asmlinkage void plat_irq_dispatch(struct pt_regs *regs) 
    84 { 
    85         u32 cause; 
    86         while((cause = (read_c0_cause()& CAUSEF_IP))) { 
    87                 if (cause & CAUSEF_IP7) 
    88                         brcm_timer_interrupt(regs); 
    89                 else if (cause & CAUSEF_IP2) 
    90                         irq_dispatch_int(regs); 
    91                 else if (cause & CAUSEF_IP3) 
    92                         irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_0); 
    93                 else if (cause & CAUSEF_IP4) 
    94                         irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_1); 
    95                 else if (cause & CAUSEF_IP5) 
    96                         irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_2); 
    97                 else if (cause & CAUSEF_IP6) 
    98                         irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_3); 
     81//extern void brcm_timer_interrupt(struct pt_regs *regs); 
     82 
     83asmlinkage void plat_irq_dispatch(void) 
     84{ 
     85        unsigned long cause; 
     86 
     87        cause = read_c0_status() & read_c0_cause() & ST0_IM; 
     88        if (cause & CAUSEF_IP7) 
     89                do_IRQ(7); 
     90        else if (cause & CAUSEF_IP2) 
     91                irq_dispatch_int(); 
     92        else if (cause & CAUSEF_IP3) 
     93                irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_0); 
     94        else if (cause & CAUSEF_IP4) 
     95                irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_1); 
     96        else if (cause & CAUSEF_IP5) 
     97                irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_2); 
     98        else if (cause & CAUSEF_IP6) { 
     99                irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_3); 
    99100                local_irq_disable(); 
    100101        } 
     
    240241        {        
    241242                printk("BcmHalMapInterrupt : internal IRQ\n"); 
    242                 nRet = request_irq( interruptId, pfunc, SA_SAMPLE_RANDOM | SA_INTERRUPT, devname, (void *) param ); 
     243                nRet = request_irq( interruptId, pfunc, IRQF_DISABLED, devname, (void *) param ); 
    243244        } 
    244245        else if (interruptId >= INTERRUPT_ID_EXTERNAL_0 && interruptId <= INTERRUPT_ID_EXTERNAL_3) 
    245246        { 
    246247                printk("BcmHalMapInterrupt : external IRQ\n"); 
    247                 nRet = request_external_irq( interruptId, pfunc, SA_SAMPLE_RANDOM | SA_INTERRUPT, devname, (void *) param ); 
     248                nRet = request_external_irq( interruptId, pfunc, IRQF_DISABLED, devname, (void *) param ); 
    248249        } 
    249250 
  • trunk/target/linux/brcm63xx/files/arch/mips/bcm963xx/prom.c

    r7408 r10455  
    5757        detect_bootloader(); 
    5858 
    59         /* Do further initialisations depending on the bootloader */ 
    60         if (boot_loader_type == BOOT_LOADER_CFE || boot_loader_type == BOOT_LOADER_CFE2) { 
    61                 cfe_setup(fw_arg0, fw_arg1, fw_arg2, fw_arg3); 
    62         } 
    6359        /* Register 16MB RAM minus the ADSL SDRAM by default */ 
    6460        add_memory_region(0, (0x01000000 - ADSL_SDRAM_IMAGE_SIZE), BOOT_MEM_RAM); 
    6561 
    66         mips_machgroup = MACH_GROUP_BRCM; 
    67         mips_machtype = MACH_BCM; 
    6862} 
    6963 
  • trunk/target/linux/brcm63xx/files/arch/mips/bcm963xx/setup.c

    r6897 r10455  
    466466        pm_power_off = brcm_machine_halt; 
    467467 
    468         board_time_init = brcm_time_init; 
     468        //board_time_init = brcm_time_init; 
    469469 
    470470        /* mpi initialization */ 
  • trunk/target/linux/brcm63xx/files/arch/mips/bcm963xx/time.c

    r6896 r10455  
    7878 * is provably more robust. 
    7979 */ 
     80#if 0 
    8081irqreturn_t brcm_timer_interrupt(struct pt_regs *regs) 
    8182{ 
     
    8990        return IRQ_HANDLED; 
    9091} 
     92#endif 
    9193 
    92  
    93 void __init brcm_time_init(void) 
     94void __init plat_time_init(void) 
    9495{ 
    9596        unsigned int est_freq, flags; 
     
    108109} 
    109110 
    110  
     111#if 0 
    111112void __init plat_timer_setup(struct irqaction *irq) 
    112113{ 
     
    115116        set_c0_status(IE_IRQ5); 
    116117} 
     118#endif 
  • trunk/target/linux/brcm63xx/files/arch/mips/pci/fixup-bcm96348.c

    r6896 r10455  
    3737}; 
    3838 
    39 int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) 
     39int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) 
    4040{ 
    4141    return irq_tab_bcm96348[slot]; 
  • trunk/target/linux/brcm63xx/files/drivers/serial/bcm63xx_cons.c

    r7408 r10455  
    894894 
    895895#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) 
    896         info->pgrp = process_group(current); 
     896        info->pgrp = task_pgrp(current); 
    897897#else 
    898898        info->session = current->session; 
  • trunk/target/linux/brcm63xx/patches/001-bcm963xx.patch

    r8381 r10455  
    1 diff -urN linux-2.6.19/arch/mips/Kconfig linux-2.6.19.new/arch/mips/Kconfig 
    2 --- linux-2.6.19/arch/mips/Kconfig      2006-11-29 22:57:37.000000000 +0100 
    3 +++ linux-2.6.19.new/arch/mips/Kconfig  2006-12-16 18:46:31.000000000 +0100 
    4 @@ -4,6 +4,10 @@ 
    5         # Horrible source of confusion.  Die, die, die ... 
    6         select EMBEDDED 
     1diff -urN linux-2.6.24/arch/mips/Kconfig linux-2.6.24.new/arch/mips/Kconfig 
     2--- linux-2.6.24/arch/mips/Kconfig      2008-01-24 23:58:37.000000000 +0100 
     3+++ linux-2.6.24.new/arch/mips/Kconfig  2008-02-13 16:20:49.000000000 +0100 
     4@@ -67,6 +67,17 @@ 
     5        help 
     6         Support for BCM47XX based boards 
    77  
    8 +config CFE 
    9 +       bool 
    10 +       # Common Firmware Environment 
     8+config BCM963XX 
     9+       bool "Support for Broadcom BCM963xx SoC" 
     10+       select SYS_SUPPORTS_32BIT_KERNEL 
     11+       select SYS_SUPPORTS_BIG_ENDIAN 
     12+       select SYS_HAS_CPU_MIPS32_R1 
     13+       select HW_HAS_PCI 
     14+       select DMA_NONCOHERENT 
     15+       select IRQ_CPU 
     16+       help 
     17+         This is a fmaily of boards based on the Broadcom MIPS32 
    1118+ 
    12  mainmenu "Linux/MIPS Kernel Configuration" 
    13   
    14  menu "Machine selection" 
    15 @@ -15,6 +15,18 @@ 
    16         prompt "System type" 
    17         default SGI_IP22 
    18   
    19 +config BCM963XX  
    20 +       bool "Support for Broadcom BCM963xx SoC" 
    21 +       select SYS_SUPPORTS_32BIT_KERNEL 
    22 +       select SYS_SUPPORTS_BIG_ENDIAN 
    23 +       select SYS_HAS_CPU_MIPS32_R1 
    24 +       select HW_HAS_PCI 
    25 +       select DMA_NONCOHERENT 
    26 +       select IRQ_CPU 
    27 +       select CFE 
    28 +       help 
    29 +        This is a fmaily of boards based on the Broadcom MIPS32 
    30 + 
    31  config MACH_ALCHEMY 
    32         bool "Alchemy processor based machines" 
    33   
    34 diff -urN linux-2.6.19/arch/mips/Makefile linux-2.6.19.new/arch/mips/Makefile 
    35 --- linux-2.6.19/arch/mips/Makefile     2006-12-16 17:36:29.000000000 +0100 
    36 +++ linux-2.6.19.new/arch/mips/Makefile 2006-12-16 18:46:31.000000000 +0100 
    37 @@ -158,6 +158,19 @@ 
    38  # 
    39   
    40  # 
    41 +# Broadcom BCM963xx SoC 
    42 +# 
    43 +core-$(CONFIG_BCM963XX)        += arch/mips/bcm963xx/ 
    44 +cflags-$(CONFIG_BCM963XX)      += -Iinclude/asm-mips/mach-bcm963xx 
    45 +load-$(CONFIG_BCM963XX)        += 0xffffffff80010000 
    46 + 
    47 + 
    48 +# 
    49 +# Common Firmware Environment 
    50 +# 
    51 +core-$(CONFIG_CFE)             += arch/mips/cfe/ 
    52 + 
    53 +# 
    54  # Acer PICA 61, Mips Magnum 4000 and Olivetti M700. 
    55  # 
    56  core-$(CONFIG_MACH_JAZZ)       += arch/mips/jazz/ 
    57 diff -urN linux-2.6.19/arch/mips/kernel/cpu-probe.c linux-2.6.19.new/arch/mips/kernel/cpu-probe.c 
    58 --- linux-2.6.19/arch/mips/kernel/cpu-probe.c   2006-11-29 22:57:37.000000000 +0100 
    59 +++ linux-2.6.19.new/arch/mips/kernel/cpu-probe.c       2006-12-16 18:46:31.000000000 +0100 
    60 @@ -590,6 +590,28 @@ 
    61                 return; 
    62  } 
    63   
    64 +static inline void cpu_probe_broadcom(struct cpuinfo_mips *c) 
    65 +{ 
    66 +       decode_configs(c); 
    67 +       switch (c->processor_id & 0xff00) { 
    68 +       case PRID_IMP_BCM6338: 
    69 +               c->cputype = CPU_BCM6338; 
    70 +               break; 
    71 +       case PRID_IMP_BCM6345: 
    72 +               c->cputype = CPU_BCM6345; 
    73 +               break; 
    74 +       case PRID_IMP_BCM6348: 
    75 +               c->cputype = CPU_BCM6348; 
    76 +               break; 
     19 config MIPS_COBALT 
     20        bool "Cobalt Server" 
     21        select CEVT_R4K 
     22diff -urN linux-2.6.24/arch/mips/kernel/cpu-probe.c linux-2.6.24.new/arch/mips/kernel/cpu-probe.c 
     23--- linux-2.6.24/arch/mips/kernel/cpu-probe.c   2008-01-24 23:58:37.000000000 +0100 
     24+++ linux-2.6.24.new/arch/mips/kernel/cpu-probe.c       2008-02-13 16:23:21.000000000 +0100 
     25@@ -796,6 +796,18 @@ 
     26        case PRID_IMP_BCM4710: 
     27                c->cputype = CPU_BCM4710; 
     28                break; 
     29+//     case PRID_IMP_BCM6338: 
     30+//             c->cputype = CPU_BCM6338; 
     31+//             break; 
     32+       case PRID_IMP_BCM6345: 
     33+               c->cputype = CPU_BCM6345; 
     34+               break; 
     35+       case PRID_IMP_BCM6348: 
     36+               c->cputype = CPU_BCM6348; 
     37+               break; 
    7738+       case PRID_IMP_BCM6358: 
    7839+               c->cputype = CPU_BCM6358; 
    7940+               break; 
    80 +       default: 
    81 +               c->cputype = CPU_UNKNOWN; 
    82 +               break; 
    83 +       } 
    84 +} 
     41        default: 
     42                c->cputype = CPU_UNKNOWN; 
     43                break; 
     44@@ -878,6 +890,10 @@ 
     45        case CPU_SR71000:       name = "Sandcraft SR71000"; break; 
     46        case CPU_BCM3302:       name = "Broadcom BCM3302"; break; 
     47        case CPU_BCM4710:       name = "Broadcom BCM4710"; break; 
     48+       case CPU_BCM6338:       name = "Broadcom BCM6338"; break; 
     49+       case CPU_BCM6345:       name = "Broadcom BCM6345"; break; 
     50+       case CPU_BCM6348:       name = "Broadcom BCM6348"; break; 
     51+       case CPU_BCM6358:       name = "Broadcom BCM6358"; break; 
     52        case CPU_PR4450:        name = "Philips PR4450"; break; 
     53        case CPU_LOONGSON2:     name = "ICT Loongson-2"; break; 
     54        default: 
     55diff -urN linux-2.6.24/arch/mips/Makefile linux-2.6.24.new/arch/mips/Makefile 
     56--- linux-2.6.24/arch/mips/Makefile     2008-01-24 23:58:37.000000000 +0100 
     57+++ linux-2.6.24.new/arch/mips/Makefile 2008-02-13 16:21:21.000000000 +0100 
     58@@ -543,6 +543,10 @@ 
     59 cflags-$(CONFIG_BCM47XX)       += -Iinclude/asm-mips/mach-bcm47xx 
     60 load-$(CONFIG_BCM47XX)         := 0xffffffff80001000 
     61  
     62+core-$(CONFIG_BCM963XX)                += arch/mips/bcm963xx/ 
     63+cflags-$(CONFIG_BCM963XX)      += -Iinclude/asm-mips/mach-bcm963xx 
     64+load-$(CONFIG_BCM963XX)                := 0xffffffff8001000 
    8565+ 
    86  static inline void cpu_probe_mips(struct cpuinfo_mips *c) 
    87  { 
    88         decode_configs(c); 
    89 @@ -724,6 +743,9 @@ 
    90         case PRID_COMP_LEGACY: 
    91                 cpu_probe_legacy(c); 
    92                 break; 
    93 +        case PRID_COMP_BROADCOM: 
    94 +                cpu_probe_broadcom(c); 
    95 +                break; 
    96         case PRID_COMP_MIPS: 
    97                 cpu_probe_mips(c); 
    98                 break; 
    99 diff -urN linux-2.6.19/arch/mips/kernel/proc.c linux-2.6.19.new/arch/mips/kernel/proc.c 
    100 --- linux-2.6.19/arch/mips/kernel/proc.c        2006-11-29 22:57:37.000000000 +0100 
    101 +++ linux-2.6.19.new/arch/mips/kernel/proc.c    2006-12-16 18:46:31.000000000 +0100 
    102 @@ -84,6 +84,10 @@ 
    103         [CPU_VR4181A]   = "NEC VR4181A", 
    104         [CPU_SR71000]   = "Sandcraft SR71000", 
    105         [CPU_PR4450]    = "Philips PR4450", 
    106 +       [CPU_BCM6338]   = "BCM6338", 
    107 +       [CPU_BCM6345]   = "BCM6345", 
    108 +       [CPU_BCM6348]   = "BCM6348", 
    109 +       [CPU_BCM6358]   = "BCM6358", 
    110  }; 
    111   
    112   
    113 diff -urN linux-2.6.19/arch/mips/mm/c-r4k.c linux-2.6.19.new/arch/mips/mm/c-r4k.c 
    114 --- linux-2.6.19/arch/mips/mm/c-r4k.c   2006-11-29 22:57:37.000000000 +0100 
    115 +++ linux-2.6.19.new/arch/mips/mm/c-r4k.c       2006-12-16 18:46:31.000000000 +0100 
    116 @@ -852,6 +852,13 @@ 
     66 # 
     67 # SNI RM 
     68 # 
     69diff -urN linux-2.6.24/arch/mips/mm/c-r4k.c linux-2.6.24.new/arch/mips/mm/c-r4k.c 
     70--- linux-2.6.24/arch/mips/mm/c-r4k.c   2008-01-24 23:58:37.000000000 +0100 
     71+++ linux-2.6.24.new/arch/mips/mm/c-r4k.c       2008-02-13 16:24:29.000000000 +0100 
     72@@ -878,6 +878,13 @@ 
    11773                if (!(config & MIPS_CONF_M)) 
    11874                        panic("Don't know how to probe P-caches on this cpu."); 
     
    12884                 * So we seem to be a MIPS32 or MIPS64 CPU 
    12985                 * So let's probe the I-cache ... 
    130 diff -urN linux-2.6.19/arch/mips/mm/tlbex.c linux-2.6.19.new/arch/mips/mm/tlbex.c 
    131 --- linux-2.6.19/arch/mips/mm/tlbex.c   2006-11-29 22:57:37.000000000 +0100 
    132 +++ linux-2.6.19.new/arch/mips/mm/tlbex.c       2006-12-16 18:46:31.000000000 +0100 
    133 @@ -892,6 +892,10 @@ 
    134         case CPU_4KSC: 
    135         case CPU_20KC: 
     86diff -urN linux-2.6.24/arch/mips/mm/tlbex.c linux-2.6.24.new/arch/mips/mm/tlbex.c 
     87--- linux-2.6.24/arch/mips/mm/tlbex.c   2008-01-24 23:58:37.000000000 +0100 
     88+++ linux-2.6.24.new/arch/mips/mm/tlbex.c       2008-02-13 16:25:08.000000000 +0100 
     89@@ -910,6 +910,10 @@ 
    13690        case CPU_25KF: 
    137 +       case CPU_BCM6338: 
     91        case CPU_BCM3302: 
     92        case CPU_BCM4710: 
     93+//     case CPU_BCM6338: 
    13894+       case CPU_BCM6345: 
    13995+       case CPU_BCM6348: 
    14096+       case CPU_BCM6358: 
    141                 tlbw(p); 
    142                 break; 
     97        case CPU_LOONGSON2: 
     98                if (m4kc_tlbp_war()) 
     99                        i_nop(p); 
     100diff -urN linux-2.6.24/arch/mips/pci/Makefile linux-2.6.24.new/arch/mips/pci/Makefile 
     101--- linux-2.6.24/arch/mips/pci/Makefile 2008-01-24 23:58:37.000000000 +0100 
     102+++ linux-2.6.24.new/arch/mips/pci/Makefile     2008-02-13 16:27:33.000000000 +0100 
     103@@ -48,3 +48,4 @@ 
     104 obj-$(CONFIG_VICTOR_MPC30X)    += fixup-mpc30x.o 
     105 obj-$(CONFIG_ZAO_CAPCELLA)     += fixup-capcella.o 
     106 obj-$(CONFIG_WR_PPMC)          += fixup-wrppmc.o 
     107+obj-$(CONFIG_BCM963XX)         += fixup-bcm96348.o pci-bcm96348.o ops-bcm96348.o 
     108diff -urN linux-2.6.24/include/asm-mips/bootinfo.h linux-2.6.24.new/include/asm-mips/bootinfo.h 
     109--- linux-2.6.24/include/asm-mips/bootinfo.h    2008-01-24 23:58:37.000000000 +0100 
     110+++ linux-2.6.24.new/include/asm-mips/bootinfo.h        2008-02-13 16:26:05.000000000 +0100 
     111@@ -197,6 +197,10 @@ 
     112  */ 
     113 #define MACH_GROUP_BRCM                23      /* Broadcom                     */ 
     114 #define  MACH_BCM47XX          1       /* Broadcom BCM47XX             */ 
     115+#define  MACH_BCM96338          2 
     116+#define  MACH_BCM96345          3 
     117+#define  MACH_BCM96348          4 
     118+#define  MACH_BCM96358          5 
    143119  
    144 diff -urN linux-2.6.19/arch/mips/pci/Makefile linux-2.6.19.new/arch/mips/pci/Makefile 
    145 --- linux-2.6.19/arch/mips/pci/Makefile 2006-11-29 22:57:37.000000000 +0100 
    146 +++ linux-2.6.19.new/arch/mips/pci/Makefile     2006-12-16 18:48:18.000000000 +0100 
    147 @@ -16,6 +16,7 @@ 
    148  obj-$(CONFIG_PCI_VR41XX)       += ops-vr41xx.o pci-vr41xx.o 
    149  obj-$(CONFIG_NEC_CMBVR4133)    += fixup-vr4133.o 
    150  obj-$(CONFIG_MARKEINS)         += ops-emma2rh.o pci-emma2rh.o fixup-emma2rh.o 
    151 +obj-$(CONFIG_BCM963XX)         += fixup-bcm96348.o pci-bcm96348.o ops-bcm96348.o 
    152   
    153  # 
    154  # These are still pretty much in the old state, watch, go blind. 
    155 diff -urN linux-2.6.19/include/asm-mips/bootinfo.h linux-2.6.19.new/include/asm-mips/bootinfo.h 
    156 --- linux-2.6.19/include/asm-mips/bootinfo.h    2006-11-29 22:57:37.000000000 +0100 
    157 +++ linux-2.6.19.new/include/asm-mips/bootinfo.h        2006-12-16 18:46:31.000000000 +0100 
    158 @@ -213,6 +213,15 @@ 
    159  #define MACH_GROUP_NEC_EMMA2RH 25      /* NEC EMMA2RH (was 23)         */ 
    160  #define  MACH_NEC_MARKEINS     0       /* NEC EMMA2RH Mark-eins        */ 
    161   
    162 +/* 
    163 + * Valid machtype for group BRCM 
    164 + */ 
    165 +#define MACH_GROUP_BRCM        23      /* Broadcom boards              */ 
    166 +#define MACH_BCM96338          0 
    167 +#define MACH_BCM96345          1 
    168 +#define MACH_BCM96348          2 
    169 +#define MACH_BCM96358          3 
    170 + 
    171120 #define CL_SIZE                        COMMAND_LINE_SIZE 
    172121  
    173  const char *get_system_type(void); 
    174 diff -urN linux-2.6.19/include/asm-mips/cpu.h linux-2.6.19.new/include/asm-mips/cpu.h 
    175 --- linux-2.6.19/include/asm-mips/cpu.h 2006-11-29 22:57:37.000000000 +0100 
    176 +++ linux-2.6.19.new/include/asm-mips/cpu.h     2006-12-16 18:46:31.000000000 +0100 
    177 @@ -103,6 +103,14 @@ 
     122diff -urN linux-2.6.24/include/asm-mips/cpu.h linux-2.6.24.new/include/asm-mips/cpu.h 
     123--- linux-2.6.24/include/asm-mips/cpu.h 2008-01-24 23:58:37.000000000 +0100 
     124+++ linux-2.6.24.new/include/asm-mips/cpu.h     2008-02-13 16:27:13.000000000 +0100 
     125@@ -111,6 +111,10 @@ 
    178126  
    179  #define PRID_IMP_SR71000        0x0400 
     127 #define PRID_IMP_BCM4710       0x4000 
     128 #define PRID_IMP_BCM3302       0x9000 
     129+//#define PRID_IMP_BCM6338        0x9000 
     130+#define PRID_IMP_BCM6345        0x8000 
     131+#define PRID_IMP_BCM6348        0x9100 
     132+#define PRID_IMP_BCM6358        0xA000 
    180133  
    181 +/* These are the PRID's for when 23:16 == PRID_COMP_BROADCOM 
    182 + */ 
    183 + 
    184 +#define PRID_IMP_BCM6338               0x9000 
    185 +#define PRID_IMP_BCM6345               0x8000 
    186 +#define PRID_IMP_BCM6348               0x9100 
    187 +#define PRID_IMP_BCM6358               0xA000 
    188 + 
    189134 /* 
    190135  * Definitions for 7:0 on legacy processors 
    191   */ 
    192 @@ -200,7 +207,11 @@ 
    193  #define CPU_SB1A               62 
    194  #define CPU_74K                        63 
    195  #define CPU_R14000             64 
    196 -#define CPU_LAST               64 
    197 +#define CPU_BCM6338             65 
    198 +#define CPU_BCM6345             66 
    199 +#define CPU_BCM6348             67 
    200 +#define CPU_BCM6358             68      
    201 +#define CPU_LAST               68 
     136@@ -196,7 +200,8 @@ 
     137         */ 
     138        CPU_4KC, CPU_4KEC, CPU_4KSC, CPU_24K, CPU_34K, CPU_74K, CPU_AU1000, 
     139        CPU_AU1100, CPU_AU1200, CPU_AU1500, CPU_AU1550, CPU_PR4450, 
     140-       CPU_BCM3302, CPU_BCM4710, 
     141+       CPU_BCM3302, CPU_BCM4710, CPU_BCM6338, CPU_BCM6345, CPU_BCM6348, 
     142+       CPU_BCM6358, 
    202143  
    203  /* 
    204   * ISA Level encodings 
    205 diff -urN linux-2.6.19/include/asm-mips/module.h linux-2.6.19.new/include/asm-mips/module.h 
    206 --- linux-2.6.19/include/asm-mips/module.h      2006-11-29 22:57:37.000000000 +0100 
    207 +++ linux-2.6.19.new/include/asm-mips/module.h  2006-12-16 19:03:22.000000000 +0100 
    208 @@ -112,6 +112,14 @@ 
    209  #define MODULE_PROC_FAMILY "RM9000 " 
    210  #elif defined CONFIG_CPU_SB1 
    211  #define MODULE_PROC_FAMILY "SB1 " 
    212 +#elif defined CONFIG_CPU_BCM6338 
    213 +#define MODULE_PROC_FAMILY "BCM6338 " 
    214 +#elif defined CONFIG_CPU_BCM6345 
    215 +#define MODULE_PROC_FAMILY "BCM6345 " 
    216 +#elif defined CONFIG_CPU_BCM6348 
    217 +#define MODULE_PROC_FAMILY "BCM6348 " 
    218 +#elif defined CONFIG_CPU_BCM6358 
    219 +#define MODULE_PROC_FAMILY "BCM6358 " 
    220  #else 
    221  #error MODULE_PROC_FAMILY undefined for your processor configuration 
    222  #endif 
     144        /* 
     145         * MIPS64 class processors 
  • trunk/target/linux/brcm63xx/patches/002-bcm963xx_serial.patch

    r8018 r10455  
    1 diff -urN linux-2.6.21.1/drivers/serial/Makefile linux-2.6.21.1.new/drivers/serial/Makefile 
    2 --- linux-2.6.21.1/drivers/serial/Makefile      2007-04-27 23:49:26.000000000 +0200 
    3 +++ linux-2.6.21.1.new/drivers/serial/Makefile  2007-05-30 20:32:27.000000000 +0200 
    4 @@ -62,3 +62,4 @@ 
    5  obj-$(CONFIG_SERIAL_NETX) += netx-serial.o 
     1diff -urN linux-2.6.24/drivers/serial/Makefile linux-2.6.24.new/drivers/serial/Makefile 
     2--- linux-2.6.24/drivers/serial/Makefile        2008-02-13 16:44:47.000000000 +0100 
     3+++ linux-2.6.24.new/drivers/serial/Makefile    2008-02-13 16:45:12.000000000 +0100 
     4@@ -65,3 +65,4 @@ 
    65 obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o 
    76 obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o 
     7 obj-$(CONFIG_SERIAL_QE) += ucc_uart.o 
    88+obj-$(CONFIG_BCM963XX) += bcm63xx_cons.o 
  • trunk/target/linux/brcm63xx/patches/040-bcm963xx_flashmap.patch

    r8018 r10455  
    1616        tristate "CFI Flash device mapped on DIL/Net PC" 
    1717        depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT 
    18 diff -urN linux-2.6.19/drivers/mtd/maps/Makefile linux-2.6.19.new/drivers/mtd/maps/Makefile 
    19 --- linux-2.6.19/drivers/mtd/maps/Makefile      2006-11-29 22:57:37.000000000 +0100 
    20 +++ linux-2.6.19.new/drivers/mtd/maps/Makefile  2006-12-18 17:21:07.000000000 +0100 
    21 @@ -72,3 +72,4 @@ 
    22  obj-$(CONFIG_MTD_OMAP_NOR)     += omap_nor.o 
    23  obj-$(CONFIG_MTD_MTX1)         += mtx-1_flash.o 
    24  obj-$(CONFIG_MTD_TQM834x)      += tqm834x.o 
    25 +obj-$(CONFIG_MTD_BCM963XX)      += bcm963xx-flash.o 
    2618diff -urN linux-2.6.19/drivers/mtd/redboot.c linux-2.6.19.new/drivers/mtd/redboot.c 
    2719--- linux-2.6.19/drivers/mtd/redboot.c  2006-12-18 17:09:14.000000000 +0100 
     
    6254                /* I'm sure the JFFS2 code has done me permanent damage. 
    6355                 * I now think the following is _normal_ 
     56diff -urN linux-2.6.24/drivers/mtd/maps/Makefile linux-2.6.24.new/drivers/mtd/maps/Makefile 
     57--- linux-2.6.24/drivers/mtd/maps/Makefile      2008-01-24 23:58:37.000000000 +0100 
     58+++ linux-2.6.24.new/drivers/mtd/maps/Makefile  2008-02-13 16:30:02.000000000 +0100 
     59@@ -69,3 +69,4 @@ 
     60 obj-$(CONFIG_MTD_OMAP_NOR)     += omap_nor.o 
     61 obj-$(CONFIG_MTD_MTX1)         += mtx-1_flash.o 
     62 obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o 
     63+obj-$(CONFIG_MTD_BCM963XX)     += bcm963xx-flash.o 
Note: See TracChangeset for help on using the changeset viewer.