Florian Fainelli
17 years ago
parent
c592ef61b3
commit
ebf4eb11e9
@ -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 |
||||
@ -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,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
|
||||
|
||||
@ -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