mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-26 16:42:47 +00:00
Upgrade brcm63xx to 2.6.24
SVN-Revision: 10455
This commit is contained in:
Florian Fainelli
parent
c592ef61b3
commit
ebf4eb11e9
@ -10,7 +10,7 @@ ARCH:=mips
|
||||
BOARD:=brcm63xx
|
||||
BOARDNAME:=Broadcom BCM963xx
|
||||
FEATURES:=squashfs jffs2 broken usb atm
|
||||
LINUX_VERSION:=2.6.22.18
|
||||
LINUX_VERSION:=2.6.24.2
|
||||
|
||||
include $(INCLUDE_DIR)/target.mk
|
||||
|
||||
|
||||
301
target/linux/brcm63xx/config-2.6.24
Normal file
301
target/linux/brcm63xx/config-2.6.24
Normal file
@ -0,0 +1,301 @@
|
||||
CONFIG_32BIT=y
|
||||
# CONFIG_64BIT is not set
|
||||
# CONFIG_8139TOO is not set
|
||||
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
|
||||
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
|
||||
CONFIG_ARCH_POPULATES_NODE_MAP=y
|
||||
# CONFIG_ARCH_SUPPORTS_MSI is not set
|
||||
CONFIG_ARCH_SUPPORTS_OPROFILE=y
|
||||
CONFIG_ATM_DRIVERS=y
|
||||
CONFIG_AUDIT=y
|
||||
CONFIG_AUDIT_GENERIC=y
|
||||
CONFIG_BASE_SMALL=0
|
||||
# CONFIG_BCM47XX is not set
|
||||
CONFIG_BCM963XX=y
|
||||
CONFIG_BINFMT_MISC=m
|
||||
CONFIG_BITREVERSE=y
|
||||
CONFIG_BLK_DEV_IO_TRACE=y
|
||||
# CONFIG_BLK_DEV_LOOP is not set
|
||||
# CONFIG_BLK_DEV_NBD is not set
|
||||
# CONFIG_BROADCOM_PHY is not set
|
||||
# CONFIG_BSD_DISKLABEL is not set
|
||||
CONFIG_BSD_PROCESS_ACCT_V3=y
|
||||
# CONFIG_BT_HCIUART_LL is not set
|
||||
CONFIG_CICADA_PHY=m
|
||||
# CONFIG_CIFS is not set
|
||||
# CONFIG_CLS_U32_MARK is not set
|
||||
# CONFIG_CONFIGFS_FS is not set
|
||||
CONFIG_CPU_BIG_ENDIAN=y
|
||||
CONFIG_CPU_HAS_LLSC=y
|
||||
CONFIG_CPU_HAS_PREFETCH=y
|
||||
CONFIG_CPU_HAS_SYNC=y
|
||||
# CONFIG_CPU_LITTLE_ENDIAN is not set
|
||||
# CONFIG_CPU_LOONGSON2 is not set
|
||||
CONFIG_CPU_MIPS32=y
|
||||
CONFIG_CPU_MIPS32_R1=y
|
||||
# CONFIG_CPU_MIPS32_R2 is not set
|
||||
# CONFIG_CPU_MIPS64_R1 is not set
|
||||
# CONFIG_CPU_MIPS64_R2 is not set
|
||||
CONFIG_CPU_MIPSR1=y
|
||||
# CONFIG_CPU_NEVADA is not set
|
||||
# CONFIG_CPU_R10000 is not set
|
||||
# CONFIG_CPU_R3000 is not set
|
||||
# CONFIG_CPU_R4300 is not set
|
||||
# CONFIG_CPU_R4X00 is not set
|
||||
# CONFIG_CPU_R5000 is not set
|
||||
# CONFIG_CPU_R5432 is not set
|
||||
# CONFIG_CPU_R6000 is not set
|
||||
# CONFIG_CPU_R8000 is not set
|
||||
# CONFIG_CPU_RM7000 is not set
|
||||
# CONFIG_CPU_RM9000 is not set
|
||||
# CONFIG_CPU_SB1 is not set
|
||||
CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
|
||||
CONFIG_CPU_SUPPORTS_HIGHMEM=y
|
||||
# CONFIG_CPU_TX39XX is not set
|
||||
# CONFIG_CPU_TX49XX is not set
|
||||
# CONFIG_CPU_VR41XX is not set
|
||||
CONFIG_CRAMFS=y
|
||||
# CONFIG_CRYPTO_HW is not set
|
||||
CONFIG_DAVICOM_PHY=m
|
||||
CONFIG_DEBUG_FS=y
|
||||
CONFIG_DEFAULT_BIC=y
|
||||
CONFIG_DEFAULT_CFQ=y
|
||||
# CONFIG_DEFAULT_DEADLINE is not set
|
||||
CONFIG_DEFAULT_IOSCHED="cfq"
|
||||
CONFIG_DEFAULT_TCP_CONG="bic"
|
||||
# CONFIG_DEFAULT_VEGAS is not set
|
||||
CONFIG_DEVPORT=y
|
||||
# CONFIG_DM9000 is not set
|
||||
CONFIG_DMA_NEED_PCI_MAP_STATE=y
|
||||
CONFIG_DMA_NONCOHERENT=y
|
||||
CONFIG_DUMMY=m
|
||||
CONFIG_ELF_CORE=y
|
||||
CONFIG_EQUALIZER=m
|
||||
# CONFIG_EXT3_FS_POSIX_ACL is not set
|
||||
# CONFIG_EXT3_FS_SECURITY is not set
|
||||
CONFIG_EXT3_FS_XATTR=y
|
||||
# CONFIG_FIXED_PHY is not set
|
||||
CONFIG_FS_MBCACHE=m
|
||||
CONFIG_FS_POSIX_ACL=y
|
||||
CONFIG_FUSE_FS=m
|
||||
CONFIG_FW_LOADER=m
|
||||
CONFIG_GENERIC_CLOCKEVENTS=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
|
||||
CONFIG_GENERIC_CMOS_UPDATE=y
|
||||
CONFIG_GENERIC_FIND_NEXT_BIT=y
|
||||
# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
|
||||
# CONFIG_HAMRADIO is not set
|
||||
CONFIG_HAS_DMA=y
|
||||
CONFIG_HAS_IOMEM=y
|
||||
CONFIG_HAS_IOPORT=y
|
||||
CONFIG_HWMON=y
|
||||
# CONFIG_HWMON_DEBUG_CHIP is not set
|
||||
CONFIG_HW_HAS_PCI=y
|
||||
CONFIG_HW_RANDOM=y
|
||||
CONFIG_HZ=250
|
||||
# CONFIG_HZ_100 is not set
|
||||
CONFIG_HZ_250=y
|
||||
# CONFIG_I2C is not set
|
||||
# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
|
||||
# CONFIG_IBM_NEW_EMAC_RGMII is not set
|
||||
# CONFIG_IBM_NEW_EMAC_TAH is not set
|
||||
# CONFIG_IBM_NEW_EMAC_ZMII is not set
|
||||
# CONFIG_IDE is not set
|
||||
CONFIG_INITRAMFS_SOURCE=""
|
||||
CONFIG_INOTIFY=y
|
||||
CONFIG_INOTIFY_USER=y
|
||||
CONFIG_IOSCHED_CFQ=y
|
||||
# CONFIG_IOSCHED_DEADLINE is not set
|
||||
# CONFIG_IP6_NF_MATCH_FRAG is not set
|
||||
# CONFIG_IP6_NF_MATCH_HL is not set
|
||||
# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
|
||||
# CONFIG_IP6_NF_MATCH_OPTS is not set
|
||||
# CONFIG_IP6_NF_MATCH_RT is not set
|
||||
# CONFIG_IP6_NF_RAW is not set
|
||||
# CONFIG_IP6_NF_TARGET_HL is not set
|
||||
# CONFIG_IP6_NF_TARGET_LOG is not set
|
||||
CONFIG_IPV6_PRIVACY=y
|
||||
CONFIG_IPV6_ROUTE_INFO=y
|
||||
CONFIG_IPV6_TUNNEL=m
|
||||
CONFIG_IP_MROUTE=y
|
||||
CONFIG_IP_PIMSM_V1=y
|
||||
CONFIG_IP_PIMSM_V2=y
|
||||
CONFIG_IP_SCTP=m
|
||||
CONFIG_IRQ_CPU=y
|
||||
CONFIG_KALLSYMS=y
|
||||
CONFIG_KALLSYMS_EXTRA_PASS=y
|
||||
CONFIG_KMOD=y
|
||||
CONFIG_LBD=y
|
||||
# CONFIG_LEDS_ALIX is not set
|
||||
# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
|
||||
# CONFIG_LEMOTE_FULONG is not set
|
||||
# CONFIG_LLC2 is not set
|
||||
CONFIG_LXT_PHY=m
|
||||
# CONFIG_MACH_ALCHEMY is not set
|
||||
# CONFIG_MACH_DECSTATION is not set
|
||||
# CONFIG_MACH_JAZZ is not set
|
||||
# CONFIG_MACH_VR41XX is not set
|
||||
# CONFIG_MAC_PARTITION is not set
|
||||
CONFIG_MAGIC_SYSRQ=y
|
||||
CONFIG_MARVELL_PHY=m
|
||||
# CONFIG_MDIO_BITBANG is not set
|
||||
CONFIG_MII=m
|
||||
# CONFIG_MINIX_FS is not set
|
||||
CONFIG_MIPS=y
|
||||
# CONFIG_MIPS_ATLAS is not set
|
||||
# CONFIG_MIPS_COBALT is not set
|
||||
CONFIG_MIPS_L1_CACHE_SHIFT=5
|
||||
# CONFIG_MIPS_MALTA is not set
|
||||
CONFIG_MIPS_MT_DISABLED=y
|
||||
# CONFIG_MIPS_MT_SMP is not set
|
||||
# CONFIG_MIPS_MT_SMTC is not set
|
||||
# CONFIG_MIPS_SEAD is not set
|
||||
# CONFIG_MIPS_SIM is not set
|
||||
CONFIG_MODULE_FORCE_UNLOAD=y
|
||||
CONFIG_MODVERSIONS=y
|
||||
CONFIG_MTD=y
|
||||
# CONFIG_MTD_ABSENT is not set
|
||||
CONFIG_MTD_BCM963XX=y
|
||||
CONFIG_MTD_BLKDEVS=y
|
||||
CONFIG_MTD_BLOCK=y
|
||||
# CONFIG_MTD_BLOCK2MTD is not set
|
||||
CONFIG_MTD_CFI=y
|
||||
CONFIG_MTD_CFI_ADV_OPTIONS=y
|
||||
CONFIG_MTD_CFI_AMDSTD=y
|
||||
CONFIG_MTD_CFI_BE_BYTE_SWAP=y
|
||||
# CONFIG_MTD_CFI_GEOMETRY is not set
|
||||
CONFIG_MTD_CFI_I1=y
|
||||
CONFIG_MTD_CFI_I2=y
|
||||
# CONFIG_MTD_CFI_I4 is not set
|
||||
# CONFIG_MTD_CFI_I8 is not set
|
||||
CONFIG_MTD_CFI_INTELEXT=y
|
||||
# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
|
||||
# CONFIG_MTD_CFI_NOSWAP is not set
|
||||
CONFIG_MTD_CFI_STAA=y
|
||||
CONFIG_MTD_CFI_UTIL=y
|
||||
CONFIG_MTD_CHAR=y
|
||||
CONFIG_MTD_CMDLINE_PARTS=y
|
||||
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
|
||||
CONFIG_MTD_CONCAT=y
|
||||
CONFIG_MTD_DEBUG=y
|
||||
CONFIG_MTD_DEBUG_VERBOSE=3
|
||||
# CONFIG_MTD_DOC2000 is not set
|
||||
# CONFIG_MTD_DOC2001 is not set
|
||||
# CONFIG_MTD_DOC2001PLUS is not set
|
||||
CONFIG_MTD_GEN_PROBE=y
|
||||
CONFIG_MTD_JEDECPROBE=y
|
||||
CONFIG_MTD_MAP_BANK_WIDTH_1=y
|
||||
# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
|
||||
CONFIG_MTD_MAP_BANK_WIDTH_2=y
|
||||
# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
|
||||
CONFIG_MTD_MAP_BANK_WIDTH_4=y
|
||||
# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
|
||||
# CONFIG_MTD_MTDRAM is not set
|
||||
# CONFIG_MTD_ONENAND is not set
|
||||
# CONFIG_MTD_OTP is not set
|
||||
CONFIG_MTD_PARTITIONS=y
|
||||
# CONFIG_MTD_PHRAM is not set
|
||||
# CONFIG_MTD_PHYSMAP is not set
|
||||
# CONFIG_MTD_PLATRAM is not set
|
||||
# CONFIG_MTD_PMC551 is not set
|
||||
# CONFIG_MTD_RAM is not set
|
||||
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
|
||||
CONFIG_MTD_REDBOOT_PARTS=y
|
||||
CONFIG_MTD_REDBOOT_PARTS_READONLY=y
|
||||
CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
|
||||
# CONFIG_MTD_ROM is not set
|
||||
# CONFIG_MTD_SLRAM is not set
|
||||
# CONFIG_NATSEMI is not set
|
||||
# CONFIG_NE2K_PCI is not set
|
||||
# CONFIG_NET_VENDOR_3COM is not set
|
||||
CONFIG_NLS=y
|
||||
CONFIG_NLS_ASCII=m
|
||||
# CONFIG_NO_IOPORT is not set
|
||||
# CONFIG_PAGE_SIZE_16KB is not set
|
||||
CONFIG_PAGE_SIZE_4KB=y
|
||||
# CONFIG_PAGE_SIZE_64KB is not set
|
||||
# CONFIG_PAGE_SIZE_8KB is not set
|
||||
CONFIG_PCI_DOMAINS=y
|
||||
CONFIG_PHYLIB=m
|
||||
# CONFIG_PMC_MSP is not set
|
||||
# CONFIG_PMC_YOSEMITE is not set
|
||||
# CONFIG_PNX8550_JBS is not set
|
||||
# CONFIG_PNX8550_STB810 is not set
|
||||
CONFIG_POSIX_MQUEUE=y
|
||||
CONFIG_QSEMI_PHY=m
|
||||
CONFIG_RELAY=y
|
||||
# CONFIG_RTC is not set
|
||||
CONFIG_RTC_LIB=y
|
||||
CONFIG_RWSEM_GENERIC_SPINLOCK=y
|
||||
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
|
||||
# CONFIG_SCSI_MULTI_LUN is not set
|
||||
CONFIG_SCSI_WAIT_SCAN=m
|
||||
# CONFIG_SCTP_DBG_MSG is not set
|
||||
# CONFIG_SCTP_DBG_OBJCNT is not set
|
||||
CONFIG_SCTP_HMAC_MD5=y
|
||||
# CONFIG_SCTP_HMAC_NONE is not set
|
||||
# CONFIG_SCTP_HMAC_SHA1 is not set
|
||||
# CONFIG_SENSORS_F71882FG is not set
|
||||
# CONFIG_SENSORS_I5K_AMB is not set
|
||||
# CONFIG_SENSORS_PC87360 is not set
|
||||
# CONFIG_SERIAL_8250 is not set
|
||||
CONFIG_SERIO=m
|
||||
CONFIG_SERIO_I8042=m
|
||||
CONFIG_SERIO_LIBPS2=m
|
||||
# CONFIG_SERIO_PCIPS2 is not set
|
||||
# CONFIG_SERIO_RAW is not set
|
||||
CONFIG_SERIO_SERPORT=m
|
||||
# CONFIG_SGI_IP22 is not set
|
||||
# CONFIG_SGI_IP27 is not set
|
||||
# CONFIG_SGI_IP32 is not set
|
||||
CONFIG_SHAPER=m
|
||||
# CONFIG_SIBYTE_BIGSUR is not set
|
||||
# CONFIG_SIBYTE_CARMEL is not set
|
||||
# CONFIG_SIBYTE_CRHINE is not set
|
||||
# CONFIG_SIBYTE_CRHONE is not set
|
||||
# CONFIG_SIBYTE_LITTLESUR is not set
|
||||
# CONFIG_SIBYTE_PTSWARM is not set
|
||||
# CONFIG_SIBYTE_RHONE is not set
|
||||
# CONFIG_SIBYTE_SENTOSA is not set
|
||||
# CONFIG_SIBYTE_SWARM is not set
|
||||
CONFIG_SLABINFO=y
|
||||
# CONFIG_SMSC_PHY is not set
|
||||
# CONFIG_SOUND is not set
|
||||
# CONFIG_SPARSEMEM_STATIC is not set
|
||||
# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
|
||||
CONFIG_SQUASHFS_EMBEDDED=y
|
||||
CONFIG_SQUASHFS_VMALLOC=y
|
||||
CONFIG_SSB_POSSIBLE=y
|
||||
CONFIG_SYSVIPC_SYSCTL=y
|
||||
CONFIG_SYS_HAS_CPU_MIPS32_R1=y
|
||||
CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
|
||||
CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
|
||||
CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
|
||||
# CONFIG_TC35815 is not set
|
||||
CONFIG_TCP_CONG_BIC=y
|
||||
# CONFIG_TCP_CONG_HSTCP is not set
|
||||
# CONFIG_TCP_CONG_HYBLA is not set
|
||||
# CONFIG_TCP_CONG_LP is not set
|
||||
# CONFIG_TCP_CONG_SCALABLE is not set
|
||||
CONFIG_TCP_CONG_VEGAS=m
|
||||
# CONFIG_TCP_CONG_VENO is not set
|
||||
CONFIG_TICK_ONESHOT=y
|
||||
CONFIG_TIPC=m
|
||||
# CONFIG_TIPC_ADVANCED is not set
|
||||
# CONFIG_TIPC_DEBUG is not set
|
||||
# CONFIG_TOSHIBA_JMR3927 is not set
|
||||
# CONFIG_TOSHIBA_RBTX4927 is not set
|
||||
# CONFIG_TOSHIBA_RBTX4938 is not set
|
||||
CONFIG_TRAD_SIGNALS=y
|
||||
# CONFIG_USB_EHCI_HCD is not set
|
||||
# CONFIG_USB_R8A66597_HCD is not set
|
||||
# CONFIG_USB_SERIAL_CH341 is not set
|
||||
# CONFIG_USB_UHCI_HCD is not set
|
||||
# CONFIG_USER_NS is not set
|
||||
# CONFIG_VGASTATE is not set
|
||||
# CONFIG_VIA_RHINE is not set
|
||||
CONFIG_VLAN_8021Q=m
|
||||
CONFIG_VM_EVENT_COUNTERS=y
|
||||
CONFIG_WAN_ROUTER=m
|
||||
# CONFIG_WATCHDOG is not set
|
||||
CONFIG_ZONE_DMA_FLAG=0
|
||||
@ -40,7 +40,7 @@
|
||||
#include <bcm_map_part.h>
|
||||
#include <bcm_intr.h>
|
||||
|
||||
static void irq_dispatch_int(struct pt_regs *regs)
|
||||
static void irq_dispatch_int(void)
|
||||
{
|
||||
unsigned int pendingIrqs;
|
||||
static unsigned int irqBit;
|
||||
@ -78,24 +78,25 @@ static void irq_dispatch_ext(uint32 irq)
|
||||
}
|
||||
|
||||
|
||||
extern void brcm_timer_interrupt(struct pt_regs *regs);
|
||||
//extern void brcm_timer_interrupt(struct pt_regs *regs);
|
||||
|
||||
asmlinkage void plat_irq_dispatch(struct pt_regs *regs)
|
||||
asmlinkage void plat_irq_dispatch(void)
|
||||
{
|
||||
u32 cause;
|
||||
while((cause = (read_c0_cause()& CAUSEF_IP))) {
|
||||
if (cause & CAUSEF_IP7)
|
||||
brcm_timer_interrupt(regs);
|
||||
else if (cause & CAUSEF_IP2)
|
||||
irq_dispatch_int(regs);
|
||||
else if (cause & CAUSEF_IP3)
|
||||
irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_0);
|
||||
else if (cause & CAUSEF_IP4)
|
||||
irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_1);
|
||||
else if (cause & CAUSEF_IP5)
|
||||
irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_2);
|
||||
else if (cause & CAUSEF_IP6)
|
||||
irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_3);
|
||||
unsigned long cause;
|
||||
|
||||
cause = read_c0_status() & read_c0_cause() & ST0_IM;
|
||||
if (cause & CAUSEF_IP7)
|
||||
do_IRQ(7);
|
||||
else if (cause & CAUSEF_IP2)
|
||||
irq_dispatch_int();
|
||||
else if (cause & CAUSEF_IP3)
|
||||
irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_0);
|
||||
else if (cause & CAUSEF_IP4)
|
||||
irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_1);
|
||||
else if (cause & CAUSEF_IP5)
|
||||
irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_2);
|
||||
else if (cause & CAUSEF_IP6) {
|
||||
irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_3);
|
||||
local_irq_disable();
|
||||
}
|
||||
}
|
||||
@ -239,12 +240,12 @@ unsigned int BcmHalMapInterrupt(FN_HANDLER pfunc, unsigned int param,
|
||||
if( interruptId >= INTERNAL_ISR_TABLE_OFFSET )
|
||||
{
|
||||
printk("BcmHalMapInterrupt : internal IRQ\n");
|
||||
nRet = request_irq( interruptId, pfunc, SA_SAMPLE_RANDOM | SA_INTERRUPT, devname, (void *) param );
|
||||
nRet = request_irq( interruptId, pfunc, IRQF_DISABLED, devname, (void *) param );
|
||||
}
|
||||
else if (interruptId >= INTERRUPT_ID_EXTERNAL_0 && interruptId <= INTERRUPT_ID_EXTERNAL_3)
|
||||
{
|
||||
printk("BcmHalMapInterrupt : external IRQ\n");
|
||||
nRet = request_external_irq( interruptId, pfunc, SA_SAMPLE_RANDOM | SA_INTERRUPT, devname, (void *) param );
|
||||
nRet = request_external_irq( interruptId, pfunc, IRQF_DISABLED, devname, (void *) param );
|
||||
}
|
||||
|
||||
return( nRet );
|
||||
|
||||
@ -56,15 +56,9 @@ void __init prom_init(void)
|
||||
/* Detect the bootloader */
|
||||
detect_bootloader();
|
||||
|
||||
/* Do further initialisations depending on the bootloader */
|
||||
if (boot_loader_type == BOOT_LOADER_CFE || boot_loader_type == BOOT_LOADER_CFE2) {
|
||||
cfe_setup(fw_arg0, fw_arg1, fw_arg2, fw_arg3);
|
||||
}
|
||||
/* Register 16MB RAM minus the ADSL SDRAM by default */
|
||||
add_memory_region(0, (0x01000000 - ADSL_SDRAM_IMAGE_SIZE), BOOT_MEM_RAM);
|
||||
|
||||
mips_machgroup = MACH_GROUP_BRCM;
|
||||
mips_machtype = MACH_BCM;
|
||||
}
|
||||
|
||||
void __init prom_free_prom_memory(void)
|
||||
|
||||
@ -465,7 +465,7 @@ void __init plat_mem_setup(void)
|
||||
_machine_halt = brcm_machine_halt;
|
||||
pm_power_off = brcm_machine_halt;
|
||||
|
||||
board_time_init = brcm_time_init;
|
||||
//board_time_init = brcm_time_init;
|
||||
|
||||
/* mpi initialization */
|
||||
mpi_init();
|
||||
|
||||
@ -77,6 +77,7 @@ static inline unsigned long __init cal_r4koff(void)
|
||||
* handler floating around. This one is rather different, but the algorithm
|
||||
* is provably more robust.
|
||||
*/
|
||||
#if 0
|
||||
irqreturn_t brcm_timer_interrupt(struct pt_regs *regs)
|
||||
{
|
||||
int irq = MIPS_TIMER_INT;
|
||||
@ -88,9 +89,9 @@ irqreturn_t brcm_timer_interrupt(struct pt_regs *regs)
|
||||
irq_exit();
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
void __init brcm_time_init(void)
|
||||
void __init plat_time_init(void)
|
||||
{
|
||||
unsigned int est_freq, flags;
|
||||
local_irq_save(flags);
|
||||
@ -107,10 +108,11 @@ void __init brcm_time_init(void)
|
||||
local_irq_restore(flags);
|
||||
}
|
||||
|
||||
|
||||
#if 0
|
||||
void __init plat_timer_setup(struct irqaction *irq)
|
||||
{
|
||||
r4k_cur = (read_c0_count() + r4k_offset);
|
||||
write_c0_compare(r4k_cur);
|
||||
set_c0_status(IE_IRQ5);
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -36,7 +36,7 @@ static char irq_tab_bcm96348[] __initdata = {
|
||||
#endif
|
||||
};
|
||||
|
||||
int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
return irq_tab_bcm96348[slot];
|
||||
}
|
||||
|
||||
@ -893,7 +893,7 @@ static int bcm63xx_cons_open(struct tty_struct *tty, struct file *filp)
|
||||
|
||||
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
|
||||
info->pgrp = process_group(current);
|
||||
info->pgrp = task_pgrp(current);
|
||||
#else
|
||||
info->session = current->session;
|
||||
info->pgrp = current->pgrp;
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
/*
|
||||
* This file is subject to the terms and conditions of the GNU General Public
|
||||
* License. See the file "COPYING" in the main directory of this archive
|
||||
* for more details.
|
||||
*
|
||||
* Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
|
||||
*/
|
||||
#ifndef __ASM_MIPS_MACH_BCM963XX_WAR_H
|
||||
#define __ASM_MIPS_MACH_BCM963XX_WAR_H
|
||||
|
||||
#define R4600_V1_INDEX_ICACHEOP_WAR 0
|
||||
#define R4600_V1_HIT_CACHEOP_WAR 0
|
||||
#define R4600_V2_HIT_CACHEOP_WAR 0
|
||||
#define R5432_CP0_INTERRUPT_WAR 0
|
||||
#define BCM1250_M3_WAR 0
|
||||
#define SIBYTE_1956_WAR 0
|
||||
#define MIPS4K_ICACHE_REFILL_WAR 0
|
||||
#define MIPS_CACHE_SYNC_WAR 0
|
||||
#define TX49XX_ICACHE_INDEX_INV_WAR 0
|
||||
#define RM9000_CDEX_SMP_WAR 0
|
||||
#define ICACHE_REFILLS_WORKAROUND_WAR 0
|
||||
#define R10000_LLSC_WAR 0
|
||||
#define MIPS34K_MISSED_ITLB_WAR 0
|
||||
|
||||
#endif /* __ASM_MIPS_MACH_BCM963XX_WAR_H */
|
||||
@ -1,119 +1,75 @@
|
||||
diff -urN linux-2.6.19/arch/mips/Kconfig linux-2.6.19.new/arch/mips/Kconfig
|
||||
--- linux-2.6.19/arch/mips/Kconfig 2006-11-29 22:57:37.000000000 +0100
|
||||
+++ linux-2.6.19.new/arch/mips/Kconfig 2006-12-16 18:46:31.000000000 +0100
|
||||
@@ -4,6 +4,10 @@
|
||||
# Horrible source of confusion. Die, die, die ...
|
||||
select EMBEDDED
|
||||
diff -urN linux-2.6.24/arch/mips/Kconfig linux-2.6.24.new/arch/mips/Kconfig
|
||||
--- linux-2.6.24/arch/mips/Kconfig 2008-01-24 23:58:37.000000000 +0100
|
||||
+++ linux-2.6.24.new/arch/mips/Kconfig 2008-02-13 16:20:49.000000000 +0100
|
||||
@@ -67,6 +67,17 @@
|
||||
help
|
||||
Support for BCM47XX based boards
|
||||
|
||||
+config CFE
|
||||
+ bool
|
||||
+ # Common Firmware Environment
|
||||
+config BCM963XX
|
||||
+ bool "Support for Broadcom BCM963xx SoC"
|
||||
+ select SYS_SUPPORTS_32BIT_KERNEL
|
||||
+ select SYS_SUPPORTS_BIG_ENDIAN
|
||||
+ select SYS_HAS_CPU_MIPS32_R1
|
||||
+ select HW_HAS_PCI
|
||||
+ select DMA_NONCOHERENT
|
||||
+ select IRQ_CPU
|
||||
+ help
|
||||
+ This is a fmaily of boards based on the Broadcom MIPS32
|
||||
+
|
||||
mainmenu "Linux/MIPS Kernel Configuration"
|
||||
|
||||
menu "Machine selection"
|
||||
@@ -15,6 +15,18 @@
|
||||
prompt "System type"
|
||||
default SGI_IP22
|
||||
|
||||
+config BCM963XX
|
||||
+ bool "Support for Broadcom BCM963xx SoC"
|
||||
+ select SYS_SUPPORTS_32BIT_KERNEL
|
||||
+ select SYS_SUPPORTS_BIG_ENDIAN
|
||||
+ select SYS_HAS_CPU_MIPS32_R1
|
||||
+ select HW_HAS_PCI
|
||||
+ select DMA_NONCOHERENT
|
||||
+ select IRQ_CPU
|
||||
+ select CFE
|
||||
+ help
|
||||
+ This is a fmaily of boards based on the Broadcom MIPS32
|
||||
+
|
||||
config MACH_ALCHEMY
|
||||
bool "Alchemy processor based machines"
|
||||
|
||||
diff -urN linux-2.6.19/arch/mips/Makefile linux-2.6.19.new/arch/mips/Makefile
|
||||
--- linux-2.6.19/arch/mips/Makefile 2006-12-16 17:36:29.000000000 +0100
|
||||
+++ linux-2.6.19.new/arch/mips/Makefile 2006-12-16 18:46:31.000000000 +0100
|
||||
@@ -158,6 +158,19 @@
|
||||
#
|
||||
|
||||
#
|
||||
+# Broadcom BCM963xx SoC
|
||||
+#
|
||||
+core-$(CONFIG_BCM963XX) += arch/mips/bcm963xx/
|
||||
+cflags-$(CONFIG_BCM963XX) += -Iinclude/asm-mips/mach-bcm963xx
|
||||
+load-$(CONFIG_BCM963XX) += 0xffffffff80010000
|
||||
+
|
||||
+
|
||||
+#
|
||||
+# Common Firmware Environment
|
||||
+#
|
||||
+core-$(CONFIG_CFE) += arch/mips/cfe/
|
||||
+
|
||||
+#
|
||||
# Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
|
||||
#
|
||||
core-$(CONFIG_MACH_JAZZ) += arch/mips/jazz/
|
||||
diff -urN linux-2.6.19/arch/mips/kernel/cpu-probe.c linux-2.6.19.new/arch/mips/kernel/cpu-probe.c
|
||||
--- linux-2.6.19/arch/mips/kernel/cpu-probe.c 2006-11-29 22:57:37.000000000 +0100
|
||||
+++ linux-2.6.19.new/arch/mips/kernel/cpu-probe.c 2006-12-16 18:46:31.000000000 +0100
|
||||
@@ -590,6 +590,28 @@
|
||||
return;
|
||||
}
|
||||
|
||||
+static inline void cpu_probe_broadcom(struct cpuinfo_mips *c)
|
||||
+{
|
||||
+ decode_configs(c);
|
||||
+ switch (c->processor_id & 0xff00) {
|
||||
+ case PRID_IMP_BCM6338:
|
||||
+ c->cputype = CPU_BCM6338;
|
||||
+ break;
|
||||
+ case PRID_IMP_BCM6345:
|
||||
+ c->cputype = CPU_BCM6345;
|
||||
+ break;
|
||||
+ case PRID_IMP_BCM6348:
|
||||
+ c->cputype = CPU_BCM6348;
|
||||
+ break;
|
||||
config MIPS_COBALT
|
||||
bool "Cobalt Server"
|
||||
select CEVT_R4K
|
||||
diff -urN linux-2.6.24/arch/mips/kernel/cpu-probe.c linux-2.6.24.new/arch/mips/kernel/cpu-probe.c
|
||||
--- linux-2.6.24/arch/mips/kernel/cpu-probe.c 2008-01-24 23:58:37.000000000 +0100
|
||||
+++ linux-2.6.24.new/arch/mips/kernel/cpu-probe.c 2008-02-13 16:23:21.000000000 +0100
|
||||
@@ -796,6 +796,18 @@
|
||||
case PRID_IMP_BCM4710:
|
||||
c->cputype = CPU_BCM4710;
|
||||
break;
|
||||
+// case PRID_IMP_BCM6338:
|
||||
+// c->cputype = CPU_BCM6338;
|
||||
+// break;
|
||||
+ case PRID_IMP_BCM6345:
|
||||
+ c->cputype = CPU_BCM6345;
|
||||
+ break;
|
||||
+ case PRID_IMP_BCM6348:
|
||||
+ c->cputype = CPU_BCM6348;
|
||||
+ break;
|
||||
+ case PRID_IMP_BCM6358:
|
||||
+ c->cputype = CPU_BCM6358;
|
||||
+ break;
|
||||
+ default:
|
||||
+ c->cputype = CPU_UNKNOWN;
|
||||
+ break;
|
||||
+ }
|
||||
+}
|
||||
default:
|
||||
c->cputype = CPU_UNKNOWN;
|
||||
break;
|
||||
@@ -878,6 +890,10 @@
|
||||
case CPU_SR71000: name = "Sandcraft SR71000"; break;
|
||||
case CPU_BCM3302: name = "Broadcom BCM3302"; break;
|
||||
case CPU_BCM4710: name = "Broadcom BCM4710"; break;
|
||||
+ case CPU_BCM6338: name = "Broadcom BCM6338"; break;
|
||||
+ case CPU_BCM6345: name = "Broadcom BCM6345"; break;
|
||||
+ case CPU_BCM6348: name = "Broadcom BCM6348"; break;
|
||||
+ case CPU_BCM6358: name = "Broadcom BCM6358"; break;
|
||||
case CPU_PR4450: name = "Philips PR4450"; break;
|
||||
case CPU_LOONGSON2: name = "ICT Loongson-2"; break;
|
||||
default:
|
||||
diff -urN linux-2.6.24/arch/mips/Makefile linux-2.6.24.new/arch/mips/Makefile
|
||||
--- linux-2.6.24/arch/mips/Makefile 2008-01-24 23:58:37.000000000 +0100
|
||||
+++ linux-2.6.24.new/arch/mips/Makefile 2008-02-13 16:21:21.000000000 +0100
|
||||
@@ -543,6 +543,10 @@
|
||||
cflags-$(CONFIG_BCM47XX) += -Iinclude/asm-mips/mach-bcm47xx
|
||||
load-$(CONFIG_BCM47XX) := 0xffffffff80001000
|
||||
|
||||
+core-$(CONFIG_BCM963XX) += arch/mips/bcm963xx/
|
||||
+cflags-$(CONFIG_BCM963XX) += -Iinclude/asm-mips/mach-bcm963xx
|
||||
+load-$(CONFIG_BCM963XX) := 0xffffffff8001000
|
||||
+
|
||||
static inline void cpu_probe_mips(struct cpuinfo_mips *c)
|
||||
{
|
||||
decode_configs(c);
|
||||
@@ -724,6 +743,9 @@
|
||||
case PRID_COMP_LEGACY:
|
||||
cpu_probe_legacy(c);
|
||||
break;
|
||||
+ case PRID_COMP_BROADCOM:
|
||||
+ cpu_probe_broadcom(c);
|
||||
+ break;
|
||||
case PRID_COMP_MIPS:
|
||||
cpu_probe_mips(c);
|
||||
break;
|
||||
diff -urN linux-2.6.19/arch/mips/kernel/proc.c linux-2.6.19.new/arch/mips/kernel/proc.c
|
||||
--- linux-2.6.19/arch/mips/kernel/proc.c 2006-11-29 22:57:37.000000000 +0100
|
||||
+++ linux-2.6.19.new/arch/mips/kernel/proc.c 2006-12-16 18:46:31.000000000 +0100
|
||||
@@ -84,6 +84,10 @@
|
||||
[CPU_VR4181A] = "NEC VR4181A",
|
||||
[CPU_SR71000] = "Sandcraft SR71000",
|
||||
[CPU_PR4450] = "Philips PR4450",
|
||||
+ [CPU_BCM6338] = "BCM6338",
|
||||
+ [CPU_BCM6345] = "BCM6345",
|
||||
+ [CPU_BCM6348] = "BCM6348",
|
||||
+ [CPU_BCM6358] = "BCM6358",
|
||||
};
|
||||
|
||||
|
||||
diff -urN linux-2.6.19/arch/mips/mm/c-r4k.c linux-2.6.19.new/arch/mips/mm/c-r4k.c
|
||||
--- linux-2.6.19/arch/mips/mm/c-r4k.c 2006-11-29 22:57:37.000000000 +0100
|
||||
+++ linux-2.6.19.new/arch/mips/mm/c-r4k.c 2006-12-16 18:46:31.000000000 +0100
|
||||
@@ -852,6 +852,13 @@
|
||||
#
|
||||
# SNI RM
|
||||
#
|
||||
diff -urN linux-2.6.24/arch/mips/mm/c-r4k.c linux-2.6.24.new/arch/mips/mm/c-r4k.c
|
||||
--- linux-2.6.24/arch/mips/mm/c-r4k.c 2008-01-24 23:58:37.000000000 +0100
|
||||
+++ linux-2.6.24.new/arch/mips/mm/c-r4k.c 2008-02-13 16:24:29.000000000 +0100
|
||||
@@ -878,6 +878,13 @@
|
||||
if (!(config & MIPS_CONF_M))
|
||||
panic("Don't know how to probe P-caches on this cpu.");
|
||||
|
||||
@ -127,96 +83,63 @@ diff -urN linux-2.6.19/arch/mips/mm/c-r4k.c linux-2.6.19.new/arch/mips/mm/c-r4k.
|
||||
/*
|
||||
* So we seem to be a MIPS32 or MIPS64 CPU
|
||||
* So let's probe the I-cache ...
|
||||
diff -urN linux-2.6.19/arch/mips/mm/tlbex.c linux-2.6.19.new/arch/mips/mm/tlbex.c
|
||||
--- linux-2.6.19/arch/mips/mm/tlbex.c 2006-11-29 22:57:37.000000000 +0100
|
||||
+++ linux-2.6.19.new/arch/mips/mm/tlbex.c 2006-12-16 18:46:31.000000000 +0100
|
||||
@@ -892,6 +892,10 @@
|
||||
case CPU_4KSC:
|
||||
case CPU_20KC:
|
||||
diff -urN linux-2.6.24/arch/mips/mm/tlbex.c linux-2.6.24.new/arch/mips/mm/tlbex.c
|
||||
--- linux-2.6.24/arch/mips/mm/tlbex.c 2008-01-24 23:58:37.000000000 +0100
|
||||
+++ linux-2.6.24.new/arch/mips/mm/tlbex.c 2008-02-13 16:25:08.000000000 +0100
|
||||
@@ -910,6 +910,10 @@
|
||||
case CPU_25KF:
|
||||
+ case CPU_BCM6338:
|
||||
case CPU_BCM3302:
|
||||
case CPU_BCM4710:
|
||||
+// case CPU_BCM6338:
|
||||
+ case CPU_BCM6345:
|
||||
+ case CPU_BCM6348:
|
||||
+ case CPU_BCM6358:
|
||||
tlbw(p);
|
||||
break;
|
||||
|
||||
diff -urN linux-2.6.19/arch/mips/pci/Makefile linux-2.6.19.new/arch/mips/pci/Makefile
|
||||
--- linux-2.6.19/arch/mips/pci/Makefile 2006-11-29 22:57:37.000000000 +0100
|
||||
+++ linux-2.6.19.new/arch/mips/pci/Makefile 2006-12-16 18:48:18.000000000 +0100
|
||||
@@ -16,6 +16,7 @@
|
||||
obj-$(CONFIG_PCI_VR41XX) += ops-vr41xx.o pci-vr41xx.o
|
||||
obj-$(CONFIG_NEC_CMBVR4133) += fixup-vr4133.o
|
||||
obj-$(CONFIG_MARKEINS) += ops-emma2rh.o pci-emma2rh.o fixup-emma2rh.o
|
||||
case CPU_LOONGSON2:
|
||||
if (m4kc_tlbp_war())
|
||||
i_nop(p);
|
||||
diff -urN linux-2.6.24/arch/mips/pci/Makefile linux-2.6.24.new/arch/mips/pci/Makefile
|
||||
--- linux-2.6.24/arch/mips/pci/Makefile 2008-01-24 23:58:37.000000000 +0100
|
||||
+++ linux-2.6.24.new/arch/mips/pci/Makefile 2008-02-13 16:27:33.000000000 +0100
|
||||
@@ -48,3 +48,4 @@
|
||||
obj-$(CONFIG_VICTOR_MPC30X) += fixup-mpc30x.o
|
||||
obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capcella.o
|
||||
obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o
|
||||
+obj-$(CONFIG_BCM963XX) += fixup-bcm96348.o pci-bcm96348.o ops-bcm96348.o
|
||||
diff -urN linux-2.6.24/include/asm-mips/bootinfo.h linux-2.6.24.new/include/asm-mips/bootinfo.h
|
||||
--- linux-2.6.24/include/asm-mips/bootinfo.h 2008-01-24 23:58:37.000000000 +0100
|
||||
+++ linux-2.6.24.new/include/asm-mips/bootinfo.h 2008-02-13 16:26:05.000000000 +0100
|
||||
@@ -197,6 +197,10 @@
|
||||
*/
|
||||
#define MACH_GROUP_BRCM 23 /* Broadcom */
|
||||
#define MACH_BCM47XX 1 /* Broadcom BCM47XX */
|
||||
+#define MACH_BCM96338 2
|
||||
+#define MACH_BCM96345 3
|
||||
+#define MACH_BCM96348 4
|
||||
+#define MACH_BCM96358 5
|
||||
|
||||
#
|
||||
# These are still pretty much in the old state, watch, go blind.
|
||||
diff -urN linux-2.6.19/include/asm-mips/bootinfo.h linux-2.6.19.new/include/asm-mips/bootinfo.h
|
||||
--- linux-2.6.19/include/asm-mips/bootinfo.h 2006-11-29 22:57:37.000000000 +0100
|
||||
+++ linux-2.6.19.new/include/asm-mips/bootinfo.h 2006-12-16 18:46:31.000000000 +0100
|
||||
@@ -213,6 +213,15 @@
|
||||
#define MACH_GROUP_NEC_EMMA2RH 25 /* NEC EMMA2RH (was 23) */
|
||||
#define MACH_NEC_MARKEINS 0 /* NEC EMMA2RH Mark-eins */
|
||||
|
||||
+/*
|
||||
+ * Valid machtype for group BRCM
|
||||
+ */
|
||||
+#define MACH_GROUP_BRCM 23 /* Broadcom boards */
|
||||
+#define MACH_BCM96338 0
|
||||
+#define MACH_BCM96345 1
|
||||
+#define MACH_BCM96348 2
|
||||
+#define MACH_BCM96358 3
|
||||
+
|
||||
#define CL_SIZE COMMAND_LINE_SIZE
|
||||
|
||||
const char *get_system_type(void);
|
||||
diff -urN linux-2.6.19/include/asm-mips/cpu.h linux-2.6.19.new/include/asm-mips/cpu.h
|
||||
--- linux-2.6.19/include/asm-mips/cpu.h 2006-11-29 22:57:37.000000000 +0100
|
||||
+++ linux-2.6.19.new/include/asm-mips/cpu.h 2006-12-16 18:46:31.000000000 +0100
|
||||
@@ -103,6 +103,14 @@
|
||||
diff -urN linux-2.6.24/include/asm-mips/cpu.h linux-2.6.24.new/include/asm-mips/cpu.h
|
||||
--- linux-2.6.24/include/asm-mips/cpu.h 2008-01-24 23:58:37.000000000 +0100
|
||||
+++ linux-2.6.24.new/include/asm-mips/cpu.h 2008-02-13 16:27:13.000000000 +0100
|
||||
@@ -111,6 +111,10 @@
|
||||
|
||||
#define PRID_IMP_SR71000 0x0400
|
||||
#define PRID_IMP_BCM4710 0x4000
|
||||
#define PRID_IMP_BCM3302 0x9000
|
||||
+//#define PRID_IMP_BCM6338 0x9000
|
||||
+#define PRID_IMP_BCM6345 0x8000
|
||||
+#define PRID_IMP_BCM6348 0x9100
|
||||
+#define PRID_IMP_BCM6358 0xA000
|
||||
|
||||
+/* These are the PRID's for when 23:16 == PRID_COMP_BROADCOM
|
||||
+ */
|
||||
+
|
||||
+#define PRID_IMP_BCM6338 0x9000
|
||||
+#define PRID_IMP_BCM6345 0x8000
|
||||
+#define PRID_IMP_BCM6348 0x9100
|
||||
+#define PRID_IMP_BCM6358 0xA000
|
||||
+
|
||||
/*
|
||||
* Definitions for 7:0 on legacy processors
|
||||
*/
|
||||
@@ -200,7 +207,11 @@
|
||||
#define CPU_SB1A 62
|
||||
#define CPU_74K 63
|
||||
#define CPU_R14000 64
|
||||
-#define CPU_LAST 64
|
||||
+#define CPU_BCM6338 65
|
||||
+#define CPU_BCM6345 66
|
||||
+#define CPU_BCM6348 67
|
||||
+#define CPU_BCM6358 68
|
||||
+#define CPU_LAST 68
|
||||
@@ -196,7 +200,8 @@
|
||||
*/
|
||||
CPU_4KC, CPU_4KEC, CPU_4KSC, CPU_24K, CPU_34K, CPU_74K, CPU_AU1000,
|
||||
CPU_AU1100, CPU_AU1200, CPU_AU1500, CPU_AU1550, CPU_PR4450,
|
||||
- CPU_BCM3302, CPU_BCM4710,
|
||||
+ CPU_BCM3302, CPU_BCM4710, CPU_BCM6338, CPU_BCM6345, CPU_BCM6348,
|
||||
+ CPU_BCM6358,
|
||||
|
||||
/*
|
||||
* ISA Level encodings
|
||||
diff -urN linux-2.6.19/include/asm-mips/module.h linux-2.6.19.new/include/asm-mips/module.h
|
||||
--- linux-2.6.19/include/asm-mips/module.h 2006-11-29 22:57:37.000000000 +0100
|
||||
+++ linux-2.6.19.new/include/asm-mips/module.h 2006-12-16 19:03:22.000000000 +0100
|
||||
@@ -112,6 +112,14 @@
|
||||
#define MODULE_PROC_FAMILY "RM9000 "
|
||||
#elif defined CONFIG_CPU_SB1
|
||||
#define MODULE_PROC_FAMILY "SB1 "
|
||||
+#elif defined CONFIG_CPU_BCM6338
|
||||
+#define MODULE_PROC_FAMILY "BCM6338 "
|
||||
+#elif defined CONFIG_CPU_BCM6345
|
||||
+#define MODULE_PROC_FAMILY "BCM6345 "
|
||||
+#elif defined CONFIG_CPU_BCM6348
|
||||
+#define MODULE_PROC_FAMILY "BCM6348 "
|
||||
+#elif defined CONFIG_CPU_BCM6358
|
||||
+#define MODULE_PROC_FAMILY "BCM6358 "
|
||||
#else
|
||||
#error MODULE_PROC_FAMILY undefined for your processor configuration
|
||||
#endif
|
||||
/*
|
||||
* MIPS64 class processors
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
diff -urN linux-2.6.21.1/drivers/serial/Makefile linux-2.6.21.1.new/drivers/serial/Makefile
|
||||
--- linux-2.6.21.1/drivers/serial/Makefile 2007-04-27 23:49:26.000000000 +0200
|
||||
+++ linux-2.6.21.1.new/drivers/serial/Makefile 2007-05-30 20:32:27.000000000 +0200
|
||||
@@ -62,3 +62,4 @@
|
||||
obj-$(CONFIG_SERIAL_NETX) += netx-serial.o
|
||||
diff -urN linux-2.6.24/drivers/serial/Makefile linux-2.6.24.new/drivers/serial/Makefile
|
||||
--- linux-2.6.24/drivers/serial/Makefile 2008-02-13 16:44:47.000000000 +0100
|
||||
+++ linux-2.6.24.new/drivers/serial/Makefile 2008-02-13 16:45:12.000000000 +0100
|
||||
@@ -65,3 +65,4 @@
|
||||
obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
|
||||
obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
|
||||
obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
|
||||
+obj-$(CONFIG_BCM963XX) += bcm63xx_cons.o
|
||||
|
||||
@ -15,14 +15,6 @@ diff -urN linux-2.6.19/drivers/mtd/maps/Kconfig linux-2.6.19.new/drivers/mtd/map
|
||||
config MTD_DILNETPC
|
||||
tristate "CFI Flash device mapped on DIL/Net PC"
|
||||
depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT
|
||||
diff -urN linux-2.6.19/drivers/mtd/maps/Makefile linux-2.6.19.new/drivers/mtd/maps/Makefile
|
||||
--- linux-2.6.19/drivers/mtd/maps/Makefile 2006-11-29 22:57:37.000000000 +0100
|
||||
+++ linux-2.6.19.new/drivers/mtd/maps/Makefile 2006-12-18 17:21:07.000000000 +0100
|
||||
@@ -72,3 +72,4 @@
|
||||
obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o
|
||||
obj-$(CONFIG_MTD_MTX1) += mtx-1_flash.o
|
||||
obj-$(CONFIG_MTD_TQM834x) += tqm834x.o
|
||||
+obj-$(CONFIG_MTD_BCM963XX) += bcm963xx-flash.o
|
||||
diff -urN linux-2.6.19/drivers/mtd/redboot.c linux-2.6.19.new/drivers/mtd/redboot.c
|
||||
--- linux-2.6.19/drivers/mtd/redboot.c 2006-12-18 17:09:14.000000000 +0100
|
||||
+++ linux-2.6.19.new/drivers/mtd/redboot.c 2006-12-18 17:14:26.000000000 +0100
|
||||
@ -61,3 +53,11 @@ diff -urN linux-2.6.19/drivers/mtd/redboot.c linux-2.6.19.new/drivers/mtd/redboo
|
||||
|
||||
/* I'm sure the JFFS2 code has done me permanent damage.
|
||||
* I now think the following is _normal_
|
||||
diff -urN linux-2.6.24/drivers/mtd/maps/Makefile linux-2.6.24.new/drivers/mtd/maps/Makefile
|
||||
--- linux-2.6.24/drivers/mtd/maps/Makefile 2008-01-24 23:58:37.000000000 +0100
|
||||
+++ linux-2.6.24.new/drivers/mtd/maps/Makefile 2008-02-13 16:30:02.000000000 +0100
|
||||
@@ -69,3 +69,4 @@
|
||||
obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o
|
||||
obj-$(CONFIG_MTD_MTX1) += mtx-1_flash.o
|
||||
obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o
|
||||
+obj-$(CONFIG_MTD_BCM963XX) += bcm963xx-flash.o
|
||||
|
||||
@ -1,186 +0,0 @@
|
||||
diff -urN linux-2.6.19.1/include/linux/atm.h linux-2.6.19.1.new/include/linux/atm.h
|
||||
--- linux-2.6.19.1/include/linux/atm.h 2006-12-11 20:32:53.000000000 +0100
|
||||
+++ linux-2.6.19.1.new/include/linux/atm.h 2007-01-07 18:38:50.000000000 +0100
|
||||
@@ -48,6 +48,9 @@
|
||||
#define ATM_AAL2 2 /* AAL2 (VBR) */
|
||||
#define ATM_AAL34 3 /* AAL3/4 (data) */
|
||||
#define ATM_AAL5 5 /* AAL5 (data) */
|
||||
+#if defined(CONFIG_MIPS_BCM963XX)
|
||||
+#define ATM_BCM_AAL0 14 /* "raw" ATM cells */
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* socket option name coding functions
|
||||
diff -urN linux-2.6.19.1/include/linux/atmbr2684.h linux-2.6.19.1.new/include/linux/atmbr2684.h
|
||||
--- linux-2.6.19.1/include/linux/atmbr2684.h 2006-12-11 20:32:53.000000000 +0100
|
||||
+++ linux-2.6.19.1.new/include/linux/atmbr2684.h 2007-01-07 18:24:01.000000000 +0100
|
||||
@@ -78,6 +78,10 @@
|
||||
__u8 vpn_id[7];
|
||||
int send_padding; /* unsupported */
|
||||
int min_size; /* we will pad smaller packets than this */
|
||||
+#if defined(CONFIG_MIPS_BCM963XX)
|
||||
+#define FILTER_PPPOE 1
|
||||
+ int proto_filter; /* protocol filter flag, current only PPPoE */
|
||||
+#endif
|
||||
};
|
||||
|
||||
/*
|
||||
diff -urN linux-2.6.19.1/include/linux/atmdev.h linux-2.6.19.1.new/include/linux/atmdev.h
|
||||
--- linux-2.6.19.1/include/linux/atmdev.h 2006-12-11 20:32:53.000000000 +0100
|
||||
+++ linux-2.6.19.1.new/include/linux/atmdev.h 2007-01-07 18:37:34.000000000 +0100
|
||||
@@ -29,6 +29,10 @@
|
||||
#define ATM_DS3_PCR (8000*12)
|
||||
/* DS3: 12 cells in a 125 usec time slot */
|
||||
|
||||
+#if defined(CONFIG_MIPS_BCM963XX)
|
||||
+#define atm_sk(__sk) ((struct atm_vcc *)(__sk)->sk_protinfo)
|
||||
+#define ATM_SD(s) (atm_sk((s)->sk))
|
||||
+#endif
|
||||
|
||||
#define __AAL_STAT_ITEMS \
|
||||
__HANDLE_ITEM(tx); /* TX okay */ \
|
||||
@@ -111,6 +115,9 @@
|
||||
#define ATM_BACKEND_RAW 0
|
||||
#define ATM_BACKEND_PPP 1 /* PPPoATM - RFC2364 */
|
||||
#define ATM_BACKEND_BR2684 2 /* Bridged RFC1483/2684 */
|
||||
+#if defined(CONFIG_MIPS_BCM963XX)
|
||||
+#define ATM_BACKEND_RT2684 3 /* Routed RFC1483/2684 */
|
||||
+#endif
|
||||
|
||||
/* for ATM_GETTYPE */
|
||||
#define ATM_ITFTYP_LEN 8 /* maximum length of interface type name */
|
||||
@@ -274,6 +281,9 @@
|
||||
|
||||
|
||||
enum {
|
||||
+#if defined(CONFIG_MIPS_BCM963XX)
|
||||
+ ATM_DF_CLOSE, /* close device when last VCC is closed */
|
||||
+#endif
|
||||
ATM_DF_REMOVED, /* device was removed from atm_devs list */
|
||||
};
|
||||
|
||||
@@ -285,8 +295,10 @@
|
||||
#define ATM_ATMOPT_CLP 1 /* set CLP bit */
|
||||
|
||||
struct atm_vcc {
|
||||
+#if !defined(CONFIG_MIPS_BCM963XX)
|
||||
/* struct sock has to be the first member of atm_vcc */
|
||||
struct sock sk;
|
||||
+#endif
|
||||
unsigned long flags; /* VCC flags (ATM_VF_*) */
|
||||
short vpi; /* VPI and VCI (types must be equal */
|
||||
/* with sockaddr) */
|
||||
@@ -303,6 +315,9 @@
|
||||
void *dev_data; /* per-device data */
|
||||
void *proto_data; /* per-protocol data */
|
||||
struct k_atm_aal_stats *stats; /* pointer to AAL stats group */
|
||||
+#if defined(CONFIG_MIPS_BCM963XX)
|
||||
+ struct sock *sk; /* socket backpointer */
|
||||
+#endif
|
||||
/* SVC part --- may move later ------------------------------------- */
|
||||
short itf; /* interface number */
|
||||
struct sockaddr_atmsvc local;
|
||||
@@ -332,7 +347,11 @@
|
||||
|
||||
struct atm_dev_addr {
|
||||
struct sockaddr_atmsvc addr; /* ATM address */
|
||||
+#if defined(CONFIG_MIPS_BCM963XX)
|
||||
+ struct atm_dev_addr *next; /* next address */
|
||||
+#else
|
||||
struct list_head entry; /* next address */
|
||||
+#endif
|
||||
};
|
||||
|
||||
enum atm_addr_type_t { ATM_ADDR_LOCAL, ATM_ADDR_LECS };
|
||||
@@ -346,8 +365,12 @@
|
||||
void *dev_data; /* per-device data */
|
||||
void *phy_data; /* private PHY date */
|
||||
unsigned long flags; /* device flags (ATM_DF_*) */
|
||||
+#if defined(CONFIG_MIPS_BCM963XX)
|
||||
+ struct atm_dev_addr *local; /* local ATM addresses */
|
||||
+#else
|
||||
struct list_head local; /* local ATM addresses */
|
||||
struct list_head lecs; /* LECS ATM addresses learned via ILMI */
|
||||
+#endif
|
||||
unsigned char esi[ESI_LEN]; /* ESI ("MAC" addr) */
|
||||
struct atm_cirange ci_range; /* VPI/VCI range */
|
||||
struct k_atm_dev_stats stats; /* statistics */
|
||||
@@ -359,7 +382,9 @@
|
||||
struct proc_dir_entry *proc_entry; /* proc entry */
|
||||
char *proc_name; /* proc entry name */
|
||||
#endif
|
||||
+#if !defined(CONFIG_MIPS_BCM963XX)
|
||||
struct class_device class_dev; /* sysfs class device */
|
||||
+#endif
|
||||
struct list_head dev_list; /* linkage */
|
||||
};
|
||||
|
||||
@@ -416,7 +441,13 @@
|
||||
int number,unsigned long *flags); /* number == -1: pick first available */
|
||||
struct atm_dev *atm_dev_lookup(int number);
|
||||
void atm_dev_deregister(struct atm_dev *dev);
|
||||
+#if defined(CONFIG_MIPS_BCM963XX)
|
||||
+void shutdown_atm_dev(struct atm_dev *dev);
|
||||
+#endif
|
||||
void vcc_insert_socket(struct sock *sk);
|
||||
+#if defined(CONFIG_MIPS_BCM963XX)
|
||||
+void vcc_remove_socket(struct sock *sk);
|
||||
+#endif
|
||||
|
||||
|
||||
/*
|
||||
@@ -432,20 +463,33 @@
|
||||
|
||||
static inline void atm_force_charge(struct atm_vcc *vcc,int truesize)
|
||||
{
|
||||
+#if defined(CONFIG_MIPS_BCM963XX)
|
||||
+ atomic_add(truesize, &vcc->sk->sk_rmem_alloc);
|
||||
+#else
|
||||
atomic_add(truesize, &sk_atm(vcc)->sk_rmem_alloc);
|
||||
+#endif
|
||||
}
|
||||
|
||||
|
||||
static inline void atm_return(struct atm_vcc *vcc,int truesize)
|
||||
{
|
||||
+#if defined(CONFIG_MIPS_BCM963XX)
|
||||
+ atomic_sub(truesize, &vcc->sk->sk_rmem_alloc);
|
||||
+#else
|
||||
atomic_sub(truesize, &sk_atm(vcc)->sk_rmem_alloc);
|
||||
+#endif
|
||||
}
|
||||
|
||||
|
||||
static inline int atm_may_send(struct atm_vcc *vcc,unsigned int size)
|
||||
{
|
||||
+#if defined(CONFIG_MIPS_BCM963XX)
|
||||
+ return (size + atomic_read(&vcc->sk->sk_wmem_alloc)) <
|
||||
+ vcc->sk->sk_sndbuf;
|
||||
+#else
|
||||
return (size + atomic_read(&sk_atm(vcc)->sk_wmem_alloc)) <
|
||||
sk_atm(vcc)->sk_sndbuf;
|
||||
+#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -457,12 +501,20 @@
|
||||
|
||||
static inline void atm_dev_put(struct atm_dev *dev)
|
||||
{
|
||||
+#if defined(CONFIG_MIPS_BCM963XX)
|
||||
+ atomic_dec(&dev->refcnt);
|
||||
+
|
||||
+ if ((atomic_read(&dev->refcnt) == 1) &&
|
||||
+ test_bit(ATM_DF_CLOSE,&dev->flags))
|
||||
+ shutdown_atm_dev(dev);
|
||||
+#else
|
||||
if (atomic_dec_and_test(&dev->refcnt)) {
|
||||
BUG_ON(!test_bit(ATM_DF_REMOVED, &dev->flags));
|
||||
if (dev->ops->dev_close)
|
||||
dev->ops->dev_close(dev);
|
||||
class_device_put(&dev->class_dev);
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
diff -urN linux-2.6.19.2/drivers/mtd/chips/jedec_probe.c linux-2.6.19.2.new/drivers/mtd/chips/jedec_probe.c
|
||||
--- linux-2.6.19.2/drivers/mtd/chips/jedec_probe.c 2007-01-10 20:10:37.000000000 +0100
|
||||
+++ linux-2.6.19.2.new/drivers/mtd/chips/jedec_probe.c 2007-04-09 22:33:05.000000000 +0200
|
||||
@@ -158,6 +158,7 @@
|
||||
#define SST49LF030A 0x001C
|
||||
#define SST49LF040A 0x0051
|
||||
#define SST49LF080A 0x005B
|
||||
+#define SST39VF6402B 0x236C
|
||||
|
||||
/* Toshiba */
|
||||
#define TC58FVT160 0x00C2
|
||||
@@ -1494,7 +1495,23 @@
|
||||
ERASEINFO(0x1000,256),
|
||||
ERASEINFO(0x1000,256)
|
||||
}
|
||||
-
|
||||
+ }, {
|
||||
+ .mfr_id = MANUFACTURER_SST,
|
||||
+ .dev_id = SST39VF6402B,
|
||||
+ .name = "SST 39VF6402B",
|
||||
+ .uaddr = {
|
||||
+ [0] = MTD_UADDR_0x5555_0x2AAA, /* x8 */
|
||||
+ [1] = MTD_UADDR_0x5555_0x2AAA /* x16 */
|
||||
+ },
|
||||
+ .DevSize = SIZE_8MiB,
|
||||
+ .CmdSet = P_ID_AMD_STD,
|
||||
+ .NumEraseRegions= 4,
|
||||
+ .regions = {
|
||||
+ ERASEINFO(0x2000,256),
|
||||
+ ERASEINFO(0x2000,256),
|
||||
+ ERASEINFO(0x2000,256),
|
||||
+ ERASEINFO(0x2000,256)
|
||||
+ }
|
||||
}, {
|
||||
.mfr_id = MANUFACTURER_ST, /* FIXME - CFI device? */
|
||||
.dev_id = M29W800DT,
|
||||
Loading…
Reference in New Issue
Block a user