fix up remaining parts for the brcm47xx-2.6 port (tested on wgt634u), nuke the old...
[openwrt.git] / target / linux / brcm63xx-2.6 / patches / 001-bcm963xx.patch
index abf9a7b..2a33b69 100644 (file)
@@ -1,6 +1,221 @@
-diff -urN linux.old/arch/mips/bcm963xx/bcm63xx_led.c linux.dev/arch/mips/bcm963xx/bcm63xx_led.c
---- linux.old/arch/mips/bcm963xx/bcm63xx_led.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm963xx/bcm63xx_led.c 2006-08-25 00:39:38.000000000 +0200
+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
+@@ -12,6 +12,15 @@
+       prompt "System type"
+       default SGI_IP22
++config BCM963XX 
++      bool "Support for the Broadcom boards"
++      select SYS_SUPPORTS_32BIT_KERNEL
++      select SYS_SUPPORTS_BIG_ENDIAN
++      select SYS_HAS_CPU_MIPS32_R1
++      select IRQ_CPU
++      help
++       This is a fmaily of boards based on the Broadcom MIPS32
++
+ config MIPS_MTX1
+       bool "4G Systems MTX-1 board"
+       select DMA_NONCOHERENT
+@@ -766,6 +775,7 @@
+ endchoice
++source "arch/mips/bcm963xx/Kconfig"
+ source "arch/mips/ddb5xxx/Kconfig"
+ source "arch/mips/gt64120/ev64120/Kconfig"
+ source "arch/mips/jazz/Kconfig"
+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,15 @@
+ #
+ #
++# Broadcom board
++#
++core-$(CONFIG_BCM963XX)       += arch/mips/bcm963xx/
++cflags-$(CONFIG_BCM963XX)             += -Iinclude/asm-mips/mach-bcm963xx
++cflags-$(CONFIG_BCM963XX)             += -Iarch/mips/bcm963xx/include
++load-$(CONFIG_BCM963XX)       += 0xffffffff80010000
++
++
++#
+ # Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
+ #
+ core-$(CONFIG_MACH_JAZZ)      += arch/mips/jazz/
+diff -urN linux-2.6.19/arch/mips/bcm963xx/Kconfig linux-2.6.19.new/arch/mips/bcm963xx/Kconfig
+--- linux-2.6.19/arch/mips/bcm963xx/Kconfig    1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/bcm963xx/Kconfig        2006-12-16 18:46:31.000000000 +0100
+@@ -0,0 +1,138 @@
++# Kernel and Driver configuration for Broadcom Commengine ADSL board
++choice
++      prompt "Broadcom Commengine ADSL board"
++      depends on BCM963XX
++      default BCM96348
++      help
++        Select different Broadcom ADSL board
++
++config BCM96338
++      bool "96338 ADSL board"
++      select DMA_NONCOHERENT
++      select HW_HAS_PCI
++
++config BCM96345
++      bool "96345 ADSL board"
++      select DMA_NONCOHERENT
++      select HW_HAS_PCI
++
++config BCM96348
++      bool "96348 ADSL board"
++      select DMA_NONCOHERENT
++      select HW_HAS_PCI
++
++endchoice
++
++config BCM_BOARD
++      bool "Support for Broadcom Board"
++      depends on BCM96338 || BCM96345 || BCM96348
++
++config BCM_SERIAL
++      bool "Support for Serial Port"
++      depends on BCM96338 || BCM96345 || BCM96348
++
++config BCM_ENET
++      tristate "Support for Ethernet"
++      depends on BCM96338 || BCM96345 || BCM96348
++
++config BCM_USB
++      tristate "Support for USB"
++      depends on BCM96338 || BCM96345 || BCM96348
++
++config BCM_WLAN
++      tristate "Support for Wireless"
++      depends on BCM96338 || BCM96345 || BCM96348
++
++config BCM_PCI
++      bool "Support for PCI"
++      depends on BCM96338 || BCM96345 || BCM96348
++      select PCI
++
++config BCM_ATMAPI
++      tristate "Support for ATM"
++      depends on BCM96338 || BCM96345 || BCM96348
++
++config BCM_ATMTEST
++      tristate "Support for ATM Diagnostic"
++      depends on BCM96338 || BCM96345 || BCM96348
++
++config BCM_ADSL
++      tristate "Support for ADSL"
++      depends on BCM96338 || BCM96345 || BCM96348
++
++config BCM_ENDPOINT
++      tristate "Support for VOICE"
++      depends on BCM96338 || BCM96345 || BCM96348
++
++config BCM_PROCFS
++      tristate "Support for PROCFS"
++      depends on BCM96338 || BCM96345 || BCM96348
++
++config BCM_VDSL
++      tristate "Support for VDSL"
++      depends on BCM96338 || BCM96345 || BCM96348
++
++config BCM_SECURITY
++      tristate "Support for SECURITY"
++      depends on BCM96338 || BCM96345 || BCM96348
++
++config BCM_HPNA
++      tristate "Support for HPNA"
++      depends on BCM96338 || BCM96345 || BCM96348
++
++config BCM_BOARD_IMPL
++      int "Implementation index for ADSL Board"
++      depends on BCM96338 || BCM96345 || BCM96348
++
++config BCM_SERIAL_IMPL
++      int "Implementation index for Serial"
++      depends on BCM96338 || BCM96345 || BCM96348
++
++config BCM_ENET_IMPL
++      int "Implementation index for Ethernet"
++      depends on BCM96338 || BCM96345 || BCM96348
++
++config BCM_USB_IMPL
++      int "Implementation index for USB"
++      depends on BCM96338 || BCM96345 || BCM96348
++
++config BCM_WLAN_IMPL
++      int "Implementation index for WIRELESS"
++      depends on BCM96338 || BCM96345 || BCM96348
++
++config BCM_ATMAPI_IMPL
++      int "Implementation index for ATM"
++      depends on BCM96338 || BCM96345 || BCM96348
++
++config BCM_ATMTEST_IMPL
++      int "Implementation index for ATM Diagnostic"
++      depends on BCM96338 || BCM96345 || BCM96348
++
++config BCM_BLAA_IMPL
++      int "Implementation index for BLAA"
++      depends on BCM96338 || BCM96345 || BCM96348
++
++config BCM_ADSL_IMPL
++      int "Implementation index for ADSL"
++      depends on BCM96338 || BCM96345 || BCM96348
++
++config BCM_ENDPOINT_IMPL
++      int "Implementation index for VOICE"
++      depends on BCM96338 || BCM96345 || BCM96348
++
++config BCM_PROCFS_IMPL
++      int "Implementation index for PROCFS"
++      depends on BCM96338 || BCM96345 || BCM96348
++
++config BCM_VDSL_IMPL
++      int "Implementation index for VDSL"
++      depends on BCM96338 || BCM96345 || BCM96348
++
++config BCM_SECURITY_IMPL
++      int "Implementation index for SECURITY"
++      depends on BCM96338 || BCM96345 || BCM96348
++
++config BCM_HPNA_IMPL
++      int "Implementation index for HPNA"
++      depends on BCM96338 || BCM96345 || BCM96348
++
+diff -urN linux-2.6.19/arch/mips/bcm963xx/Makefile linux-2.6.19.new/arch/mips/bcm963xx/Makefile
+--- linux-2.6.19/arch/mips/bcm963xx/Makefile   1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/bcm963xx/Makefile       2006-12-16 18:46:31.000000000 +0100
+@@ -0,0 +1,23 @@
++#
++# Makefile for generic Broadcom MIPS boards
++#
++# Copyright (C) 2004 Broadcom Corporation
++#
++obj-y           := irq.o prom.o setup.o time.o ser_init.o bcm63xx_led.o  board.o  boardparms.o int-handler.o
++
++SRCBASE         := $(TOPDIR)
++EXTRA_CFLAGS    += -I$(SRCBASE)/include
++#EXTRA_CFLAGS    += -I$(INC_ADSLDRV_PATH) -DDBG
++EXTRA_CFLAGS    += -I$(INC_ADSLDRV_PATH) 
++
++
++ifeq "$(ADSL)" "ANNEX_B"
++EXTRA_CFLAGS += -DADSL_ANNEXB
++endif
++ifeq "$(ADSL)" "SADSL"
++EXTRA_CFLAGS += -DADSL_SADSL
++endif
++ifeq "$(ADSL)" "ANNEX_C"
++EXTRA_CFLAGS += -DADSL_ANNEXC
++endif
++
+diff -urN linux-2.6.19/arch/mips/bcm963xx/bcm63xx_led.c linux-2.6.19.new/arch/mips/bcm963xx/bcm63xx_led.c
+--- linux-2.6.19/arch/mips/bcm963xx/bcm63xx_led.c      1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/bcm963xx/bcm63xx_led.c  2006-12-16 18:46:31.000000000 +0100
 @@ -0,0 +1,582 @@
 +/*
 +<:copyright-gpl 
 @@ -0,0 +1,582 @@
 +/*
 +<:copyright-gpl 
@@ -584,10 +799,10 @@ diff -urN linux.old/arch/mips/bcm963xx/bcm63xx_led.c linux.dev/arch/mips/bcm963x
 +    }
 +}
 +
 +    }
 +}
 +
-diff -urN linux.old/arch/mips/bcm963xx/board.c linux.dev/arch/mips/bcm963xx/board.c
---- linux.old/arch/mips/bcm963xx/board.c       1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm963xx/board.c       2006-08-25 15:16:26.000000000 +0200
-@@ -0,0 +1,555 @@
+diff -urN linux-2.6.19/arch/mips/bcm963xx/board.c linux-2.6.19.new/arch/mips/bcm963xx/board.c
+--- linux-2.6.19/arch/mips/bcm963xx/board.c    1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/bcm963xx/board.c        2006-12-16 18:46:31.000000000 +0100
+@@ -0,0 +1,559 @@
 +/*
 +<:copyright-gpl 
 + Copyright 2002 Broadcom Corp. All Rights Reserved. 
 +/*
 +<:copyright-gpl 
 + Copyright 2002 Broadcom Corp. All Rights Reserved. 
@@ -710,7 +925,7 @@ diff -urN linux.old/arch/mips/bcm963xx/board.c linux.dev/arch/mips/bcm963xx/boar
 +
 +/* DyingGasp function prototype */
 +static void __init kerSysDyingGaspMapIntr(void);
 +
 +/* DyingGasp function prototype */
 +static void __init kerSysDyingGaspMapIntr(void);
-+static irqreturn_t kerSysDyingGaspIsr(int irq, void * dev_id, struct pt_regs * regs);
++static irqreturn_t kerSysDyingGaspIsr(int irq, void * dev_id);
 +static void __init kerSysInitDyingGaspHandler( void );
 +static void __exit kerSysDeinitDyingGaspHandler( void );
 +/* -DyingGasp function prototype - */
 +static void __init kerSysInitDyingGaspHandler( void );
 +static void __exit kerSysDeinitDyingGaspHandler( void );
 +/* -DyingGasp function prototype - */
@@ -760,17 +975,21 @@ diff -urN linux.old/arch/mips/bcm963xx/board.c linux.dev/arch/mips/bcm963xx/boar
 +    /* CMO -- Fix le problème avec les adresses mac que l'on n'arrive pas
 +     *  * à relire plusieurs fois */
 +    /* inv_xde */
 +    /* CMO -- Fix le problème avec les adresses mac que l'on n'arrive pas
 +     *  * à relire plusieurs fois */
 +    /* inv_xde */
++#if 0
 +    if (boot_loader_type == BOOT_CFE)
 +      memcpy( pucaMacAddr, g_pNvramInfo->ucaBaseMacAddr,
 +              NVRAM_MAC_ADDRESS_LEN );
 +    else {
 +    if (boot_loader_type == BOOT_CFE)
 +      memcpy( pucaMacAddr, g_pNvramInfo->ucaBaseMacAddr,
 +              NVRAM_MAC_ADDRESS_LEN );
 +    else {
++#endif
 +      pucaMacAddr[0] = 0x00;
 +      pucaMacAddr[1] = 0x07;
 +      pucaMacAddr[2] = 0x3A;
 +      pucaMacAddr[3] = 0xFF;
 +      pucaMacAddr[4] = 0xFF;
 +      pucaMacAddr[5] = 0xFF;
 +      pucaMacAddr[0] = 0x00;
 +      pucaMacAddr[1] = 0x07;
 +      pucaMacAddr[2] = 0x3A;
 +      pucaMacAddr[3] = 0xFF;
 +      pucaMacAddr[4] = 0xFF;
 +      pucaMacAddr[5] = 0xFF;
++#if 0
 +    }
 +    }
++#endif
 +
 +    return nRet;
 +} /* kerSysGetMacAddr */
 +
 +    return nRet;
 +} /* kerSysGetMacAddr */
@@ -978,7 +1197,7 @@ diff -urN linux.old/arch/mips/bcm963xx/board.c linux.dev/arch/mips/bcm963xx/boar
 +}
 +
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
 +}
 +
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
-+static irqreturn_t kerSysDyingGaspIsr(int irq, void * dev_id, struct pt_regs * regs)
++static irqreturn_t kerSysDyingGaspIsr(int irq, void * dev_id)
 +#else
 +static unsigned int kerSysDyingGaspIsr(void)
 +#endif
 +#else
 +static unsigned int kerSysDyingGaspIsr(void)
 +#endif
@@ -1143,9 +1362,9 @@ diff -urN linux.old/arch/mips/bcm963xx/board.c linux.dev/arch/mips/bcm963xx/boar
 +EXPORT_SYMBOL(kerSysSetWdTimer);
 +EXPORT_SYMBOL(kerSysWakeupMonitorTask);
 +
 +EXPORT_SYMBOL(kerSysSetWdTimer);
 +EXPORT_SYMBOL(kerSysWakeupMonitorTask);
 +
-diff -urN linux.old/arch/mips/bcm963xx/boardparms.c linux.dev/arch/mips/bcm963xx/boardparms.c
---- linux.old/arch/mips/bcm963xx/boardparms.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm963xx/boardparms.c  2006-08-25 00:39:38.000000000 +0200
+diff -urN linux-2.6.19/arch/mips/bcm963xx/boardparms.c linux-2.6.19.new/arch/mips/bcm963xx/boardparms.c
+--- linux-2.6.19/arch/mips/bcm963xx/boardparms.c       1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/bcm963xx/boardparms.c   2006-12-16 18:46:31.000000000 +0100
 @@ -0,0 +1,2391 @@
 +/*
 +<:copyright-gpl 
 @@ -0,0 +1,2391 @@
 +/*
 +<:copyright-gpl 
@@ -3538,9 +3757,9 @@ diff -urN linux.old/arch/mips/bcm963xx/boardparms.c linux.dev/arch/mips/bcm963xx
 +    return( nRet );
 +} /* BpGetVoipChipSelect */
 +
 +    return( nRet );
 +} /* BpGetVoipChipSelect */
 +
-diff -urN linux.old/arch/mips/bcm963xx/boardparms.h linux.dev/arch/mips/bcm963xx/boardparms.h
---- linux.old/arch/mips/bcm963xx/boardparms.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm963xx/boardparms.h  2006-08-25 00:39:38.000000000 +0200
+diff -urN linux-2.6.19/arch/mips/bcm963xx/boardparms.h linux-2.6.19.new/arch/mips/bcm963xx/boardparms.h
+--- linux-2.6.19/arch/mips/bcm963xx/boardparms.h       1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/bcm963xx/boardparms.h   2006-12-16 18:46:31.000000000 +0100
 @@ -0,0 +1,758 @@
 +/*
 +<:copyright-gpl 
 @@ -0,0 +1,758 @@
 +/*
 +<:copyright-gpl 
@@ -4300,9 +4519,9 @@ diff -urN linux.old/arch/mips/bcm963xx/boardparms.h linux.dev/arch/mips/bcm963xx
 +
 +#endif /* _BOARDPARMS_H */
 +
 +
 +#endif /* _BOARDPARMS_H */
 +
-diff -urN linux.old/arch/mips/bcm963xx/include/6338_intr.h linux.dev/arch/mips/bcm963xx/include/6338_intr.h
---- linux.old/arch/mips/bcm963xx/include/6338_intr.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm963xx/include/6338_intr.h   2006-08-25 00:39:38.000000000 +0200
+diff -urN linux-2.6.19/arch/mips/bcm963xx/include/6338_intr.h linux-2.6.19.new/arch/mips/bcm963xx/include/6338_intr.h
+--- linux-2.6.19/arch/mips/bcm963xx/include/6338_intr.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/bcm963xx/include/6338_intr.h    2006-12-16 18:46:31.000000000 +0100
 @@ -0,0 +1,64 @@
 +/*
 +<:copyright-gpl 
 @@ -0,0 +1,64 @@
 +/*
 +<:copyright-gpl 
@@ -4368,9 +4587,9 @@ diff -urN linux.old/arch/mips/bcm963xx/include/6338_intr.h linux.dev/arch/mips/b
 +
 +#endif  /* __BCM6338_H */
 +
 +
 +#endif  /* __BCM6338_H */
 +
-diff -urN linux.old/arch/mips/bcm963xx/include/6338_map_part.h linux.dev/arch/mips/bcm963xx/include/6338_map_part.h
---- linux.old/arch/mips/bcm963xx/include/6338_map_part.h       1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm963xx/include/6338_map_part.h       2006-08-25 00:39:38.000000000 +0200
+diff -urN linux-2.6.19/arch/mips/bcm963xx/include/6338_map_part.h linux-2.6.19.new/arch/mips/bcm963xx/include/6338_map_part.h
+--- linux-2.6.19/arch/mips/bcm963xx/include/6338_map_part.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/bcm963xx/include/6338_map_part.h        2006-12-16 18:46:31.000000000 +0100
 @@ -0,0 +1,334 @@
 +/*
 +<:copyright-gpl 
 @@ -0,0 +1,334 @@
 +/*
 +<:copyright-gpl 
@@ -4706,9 +4925,9 @@ diff -urN linux.old/arch/mips/bcm963xx/include/6338_map_part.h linux.dev/arch/mi
 +
 +#endif
 +
 +
 +#endif
 +
-diff -urN linux.old/arch/mips/bcm963xx/include/6345_intr.h linux.dev/arch/mips/bcm963xx/include/6345_intr.h
---- linux.old/arch/mips/bcm963xx/include/6345_intr.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm963xx/include/6345_intr.h   2006-08-25 00:39:38.000000000 +0200
+diff -urN linux-2.6.19/arch/mips/bcm963xx/include/6345_intr.h linux-2.6.19.new/arch/mips/bcm963xx/include/6345_intr.h
+--- linux-2.6.19/arch/mips/bcm963xx/include/6345_intr.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/bcm963xx/include/6345_intr.h    2006-12-16 18:46:31.000000000 +0100
 @@ -0,0 +1,72 @@
 +/*
 +<:copyright-gpl 
 @@ -0,0 +1,72 @@
 +/*
 +<:copyright-gpl 
@@ -4782,9 +5001,9 @@ diff -urN linux.old/arch/mips/bcm963xx/include/6345_intr.h linux.dev/arch/mips/b
 +
 +#endif  /* __BCM6345_H */
 +
 +
 +#endif  /* __BCM6345_H */
 +
-diff -urN linux.old/arch/mips/bcm963xx/include/6345_map_part.h linux.dev/arch/mips/bcm963xx/include/6345_map_part.h
---- linux.old/arch/mips/bcm963xx/include/6345_map_part.h       1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm963xx/include/6345_map_part.h       2006-08-25 00:39:38.000000000 +0200
+diff -urN linux-2.6.19/arch/mips/bcm963xx/include/6345_map_part.h linux-2.6.19.new/arch/mips/bcm963xx/include/6345_map_part.h
+--- linux-2.6.19/arch/mips/bcm963xx/include/6345_map_part.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/bcm963xx/include/6345_map_part.h        2006-12-16 18:46:31.000000000 +0100
 @@ -0,0 +1,163 @@
 +/*
 +<:copyright-gpl 
 @@ -0,0 +1,163 @@
 +/*
 +<:copyright-gpl 
@@ -4949,9 +5168,9 @@ diff -urN linux.old/arch/mips/bcm963xx/include/6345_map_part.h linux.dev/arch/mi
 +
 +#endif
 +
 +
 +#endif
 +
-diff -urN linux.old/arch/mips/bcm963xx/include/6348_intr.h linux.dev/arch/mips/bcm963xx/include/6348_intr.h
---- linux.old/arch/mips/bcm963xx/include/6348_intr.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm963xx/include/6348_intr.h   2006-08-25 00:39:38.000000000 +0200
+diff -urN linux-2.6.19/arch/mips/bcm963xx/include/6348_intr.h linux-2.6.19.new/arch/mips/bcm963xx/include/6348_intr.h
+--- linux-2.6.19/arch/mips/bcm963xx/include/6348_intr.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/bcm963xx/include/6348_intr.h    2006-12-16 18:46:31.000000000 +0100
 @@ -0,0 +1,74 @@
 +/*
 +<:copyright-gpl 
 @@ -0,0 +1,74 @@
 +/*
 +<:copyright-gpl 
@@ -5027,9 +5246,9 @@ diff -urN linux.old/arch/mips/bcm963xx/include/6348_intr.h linux.dev/arch/mips/b
 +
 +#endif  /* __BCM6348_H */
 +
 +
 +#endif  /* __BCM6348_H */
 +
-diff -urN linux.old/arch/mips/bcm963xx/include/6348_map_part.h linux.dev/arch/mips/bcm963xx/include/6348_map_part.h
---- linux.old/arch/mips/bcm963xx/include/6348_map_part.h       1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm963xx/include/6348_map_part.h       2006-08-25 00:39:38.000000000 +0200
+diff -urN linux-2.6.19/arch/mips/bcm963xx/include/6348_map_part.h linux-2.6.19.new/arch/mips/bcm963xx/include/6348_map_part.h
+--- linux-2.6.19/arch/mips/bcm963xx/include/6348_map_part.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/bcm963xx/include/6348_map_part.h        2006-12-16 18:46:31.000000000 +0100
 @@ -0,0 +1,500 @@
 +/*
 +<:copyright-gpl 
 @@ -0,0 +1,500 @@
 +/*
 +<:copyright-gpl 
@@ -5531,13 +5750,13 @@ diff -urN linux.old/arch/mips/bcm963xx/include/6348_map_part.h linux.dev/arch/mi
 +
 +#endif
 +
 +
 +#endif
 +
-diff -urN linux.old/arch/mips/bcm963xx/include/bcm_intr.h linux.dev/arch/mips/bcm963xx/include/bcm_intr.h
---- linux.old/arch/mips/bcm963xx/include/bcm_intr.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm963xx/include/bcm_intr.h    2006-08-25 00:39:38.000000000 +0200
-@@ -0,0 +1,59 @@
+diff -urN linux-2.6.19/arch/mips/bcm963xx/include/bcmTag.h linux-2.6.19.new/arch/mips/bcm963xx/include/bcmTag.h
+--- linux-2.6.19/arch/mips/bcm963xx/include/bcmTag.h   1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/bcm963xx/include/bcmTag.h       2006-12-16 18:46:31.000000000 +0100
+@@ -0,0 +1,153 @@
 +/*
 +<:copyright-gpl 
 +/*
 +<:copyright-gpl 
-+ Copyright 2003 Broadcom Corp. All Rights Reserved. 
++ Copyright 2002 Broadcom Corp. All Rights Reserved. 
 + 
 + This program is free software; you can distribute it and/or modify it 
 + under the terms of the GNU General Public License (Version 2) as 
 + 
 + This program is free software; you can distribute it and/or modify it 
 + under the terms of the GNU General Public License (Version 2) as 
@@ -5553,40 +5772,197 @@ diff -urN linux.old/arch/mips/bcm963xx/include/bcm_intr.h linux.dev/arch/mips/bc
 + 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. 
 +:>
 +*/
 + 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. 
 +:>
 +*/
++//**************************************************************************************
++// File Name  : bcmTag.h
++//
++// Description: add tag with validation system to the firmware image file to be uploaded
++//              via http
++//
++// Created    : 02/28/2002  seanl
++//**************************************************************************************
 +
 +
-+#ifndef __BCM_INTR_H
-+#define __BCM_INTR_H
++#ifndef _BCMTAG_H_
++#define _BCMTAG_H_
 +
 +
-+#ifdef __cplusplus
-+    extern "C" {
-+#endif
 +
 +
-+#if defined(CONFIG_BCM96338)
-+#include <6338_intr.h>
-+#endif
-+#if defined(CONFIG_BCM96345)
-+#include <6345_intr.h>
-+#endif
-+#if defined(CONFIG_BCM96348)
-+#include <6348_intr.h>
-+#endif
++#define BCM_SIG_1   "Broadcom Corporation"
++#define BCM_SIG_2   "ver. 2.0"          // was "firmware version 2.0" now it is split 6 char out for chip id.
 +
 +
-+/* defines */
-+struct pt_regs;
-+typedef int (*FN_HANDLER) (int, void *, struct pt_regs *);
++#define BCM_TAG_VER         "6"
++#define BCM_TAG_VER_LAST    "26"
 +
 +
-+/* prototypes */
-+extern void enable_brcm_irq(unsigned int irq);
-+extern void disable_brcm_irq(unsigned int irq);
-+extern int request_external_irq(unsigned int irq,
-+    FN_HANDLER handler, unsigned long irqflags, 
-+    const char * devname, void *dev_id);
-+extern unsigned int BcmHalMapInterrupt(FN_HANDLER isr, unsigned int param,
-+    unsigned int interruptId);
-+extern void dump_intr_regs(void);
++// file tag (head) structure all is in clear text except validationTokens (crc, md5, sha1, etc). Total: 128 unsigned chars
++#define TAG_LEN         256
++#define TAG_VER_LEN     4
++#define SIG_LEN         20
++#define SIG_LEN_2       14   // Original second SIG = 20 is now devided into 14 for SIG_LEN_2 and 6 for CHIP_ID
++#define CHIP_ID_LEN           6       
++#define IMAGE_LEN       10
++#define ADDRESS_LEN     12
++#define FLAG_LEN        2
++#define TOKEN_LEN       20
++#define BOARD_ID_LEN    16
++#define RESERVED_LEN    (TAG_LEN - TAG_VER_LEN - SIG_LEN - SIG_LEN_2 - CHIP_ID_LEN - BOARD_ID_LEN - \
++                        (4*IMAGE_LEN) - (3*ADDRESS_LEN) - (3*FLAG_LEN) - (2*TOKEN_LEN))
 +
 +
-+/* compatibility definitions */
-+#define BcmHalInterruptEnable(irq)      enable_brcm_irq( irq )
++
++// TAG for downloadable image (kernel plus file system)
++typedef struct _FILE_TAG
++{
++    unsigned char tagVersion[TAG_VER_LEN];       // tag version.  Will be 2 here.
++    unsigned char signiture_1[SIG_LEN];          // text line for company info
++    unsigned char signiture_2[SIG_LEN_2];        // additional info (can be version number)
++    unsigned char chipId[CHIP_ID_LEN];                         // chip id 
++    unsigned char boardId[BOARD_ID_LEN];         // board id
++    unsigned char bigEndian[FLAG_LEN];           // if = 1 - big, = 0 - little endia of the host
++    unsigned char totalImageLen[IMAGE_LEN];      // the sum of all the following length
++    unsigned char cfeAddress[ADDRESS_LEN];       // if non zero, cfe starting address
++    unsigned char cfeLen[IMAGE_LEN];             // if non zero, cfe size in clear ASCII text.
++    unsigned char rootfsAddress[ADDRESS_LEN];    // if non zero, filesystem starting address
++    unsigned char rootfsLen[IMAGE_LEN];          // if non zero, filesystem size in clear ASCII text.
++    unsigned char kernelAddress[ADDRESS_LEN];    // if non zero, kernel starting address
++    unsigned char kernelLen[IMAGE_LEN];          // if non zero, kernel size in clear ASCII text.
++    unsigned char dualImage[FLAG_LEN];           // if 1, dual image
++    unsigned char inactiveLen[FLAG_LEN];         // if 1, the image is INACTIVE; if 0, active 
++    unsigned char reserved[RESERVED_LEN];        // reserved for later use
++    unsigned char imageValidationToken[TOKEN_LEN];// image validation token - can be crc, md5, sha;  for
++                                                 // now will be 4 unsigned char crc
++    unsigned char tagValidationToken[TOKEN_LEN]; // validation token for tag(from signiture_1 to end of // mageValidationToken)
++} FILE_TAG, *PFILE_TAG;
++
++#define CRC32_INIT_VALUE 0xffffffff /* Initial CRC32 checksum value */
++#define CRC_LEN 4
++
++// only included if for bcmTag.exe program
++#ifdef BCMTAG_EXE_USE
++
++static unsigned long Crc32_table[256] = {
++    0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
++    0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
++    0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
++    0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
++    0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
++    0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
++    0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
++    0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
++    0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
++    0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
++    0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
++    0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
++    0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
++    0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
++    0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
++    0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
++    0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
++    0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
++    0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
++    0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
++    0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
++    0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
++    0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
++    0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
++    0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
++    0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
++    0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
++    0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
++    0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
++    0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
++    0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
++    0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
++    0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
++    0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
++    0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
++    0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
++    0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
++    0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
++    0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
++    0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
++    0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
++    0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
++    0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
++    0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
++    0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
++    0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
++    0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
++    0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
++    0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
++    0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
++    0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
++    0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
++    0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
++    0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
++    0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
++    0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
++    0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
++    0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
++    0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
++    0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
++    0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
++    0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
++    0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
++    0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
++};
++#endif // BCMTAG_USE
++
++
++#endif // _BCMTAG_H_
++
+diff -urN linux-2.6.19/arch/mips/bcm963xx/include/bcm_intr.h linux-2.6.19.new/arch/mips/bcm963xx/include/bcm_intr.h
+--- linux-2.6.19/arch/mips/bcm963xx/include/bcm_intr.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/bcm963xx/include/bcm_intr.h     2006-12-16 18:46:31.000000000 +0100
+@@ -0,0 +1,59 @@
++/*
++<:copyright-gpl 
++ Copyright 2003 Broadcom Corp. All Rights Reserved. 
++ 
++ This program is free software; you can distribute it and/or modify it 
++ under the terms of the GNU General Public License (Version 2) as 
++ published by the Free Software Foundation. 
++ 
++ This program is distributed in the hope it will be useful, but WITHOUT 
++ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
++ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License 
++ for more details. 
++ 
++ You should have received a copy of the GNU General Public License along 
++ with this program; if not, write to the Free Software Foundation, Inc., 
++ 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. 
++:>
++*/
++
++#ifndef __BCM_INTR_H
++#define __BCM_INTR_H
++
++#ifdef __cplusplus
++    extern "C" {
++#endif
++
++#if defined(CONFIG_BCM96338)
++#include <6338_intr.h>
++#endif
++#if defined(CONFIG_BCM96345)
++#include <6345_intr.h>
++#endif
++#if defined(CONFIG_BCM96348)
++#include <6348_intr.h>
++#endif
++
++/* defines */
++struct pt_regs;
++typedef int (*FN_HANDLER) (int, void *);
++
++/* prototypes */
++extern void enable_brcm_irq(unsigned int irq);
++extern void disable_brcm_irq(unsigned int irq);
++extern int request_external_irq(unsigned int irq,
++    FN_HANDLER handler, unsigned long irqflags, 
++    const char * devname, void *dev_id);
++extern unsigned int BcmHalMapInterrupt(FN_HANDLER isr, unsigned int param,
++    unsigned int interruptId);
++extern void dump_intr_regs(void);
++
++/* compatibility definitions */
++#define BcmHalInterruptEnable(irq)      enable_brcm_irq( irq )
 +#define BcmHalInterruptDisable(irq)     disable_brcm_irq( irq )
 +
 +#ifdef __cplusplus
 +#define BcmHalInterruptDisable(irq)     disable_brcm_irq( irq )
 +
 +#ifdef __cplusplus
@@ -5594,9 +5970,9 @@ diff -urN linux.old/arch/mips/bcm963xx/include/bcm_intr.h linux.dev/arch/mips/bc
 +#endif
 +
 +#endif
 +#endif
 +
 +#endif
-diff -urN linux.old/arch/mips/bcm963xx/include/bcm_map_part.h linux.dev/arch/mips/bcm963xx/include/bcm_map_part.h
---- linux.old/arch/mips/bcm963xx/include/bcm_map_part.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm963xx/include/bcm_map_part.h        2006-08-25 00:39:38.000000000 +0200
+diff -urN linux-2.6.19/arch/mips/bcm963xx/include/bcm_map_part.h linux-2.6.19.new/arch/mips/bcm963xx/include/bcm_map_part.h
+--- linux-2.6.19/arch/mips/bcm963xx/include/bcm_map_part.h     1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/bcm963xx/include/bcm_map_part.h 2006-12-16 18:46:31.000000000 +0100
 @@ -0,0 +1,34 @@
 +/*
 +<:copyright-gpl 
 @@ -0,0 +1,34 @@
 +/*
 +<:copyright-gpl 
@@ -5632,9 +6008,9 @@ diff -urN linux.old/arch/mips/bcm963xx/include/bcm_map_part.h linux.dev/arch/mip
 +
 +#endif
 +
 +
 +#endif
 +
-diff -urN linux.old/arch/mips/bcm963xx/include/bcmpci.h linux.dev/arch/mips/bcm963xx/include/bcmpci.h
---- linux.old/arch/mips/bcm963xx/include/bcmpci.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm963xx/include/bcmpci.h      2006-08-25 00:39:38.000000000 +0200
+diff -urN linux-2.6.19/arch/mips/bcm963xx/include/bcmpci.h linux-2.6.19.new/arch/mips/bcm963xx/include/bcmpci.h
+--- linux-2.6.19/arch/mips/bcm963xx/include/bcmpci.h   1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/bcm963xx/include/bcmpci.h       2006-12-16 18:46:31.000000000 +0100
 @@ -0,0 +1,87 @@
 +/*
 +<:copyright-gpl 
 @@ -0,0 +1,87 @@
 +/*
 +<:copyright-gpl 
@@ -5723,10 +6099,10 @@ diff -urN linux.old/arch/mips/bcm963xx/include/bcmpci.h linux.dev/arch/mips/bcm9
 +#define pcmciaIo            (pcmciaIoOffset   | pcmciaBase)
 +
 +#endif
 +#define pcmciaIo            (pcmciaIoOffset   | pcmciaBase)
 +
 +#endif
-diff -urN linux.old/arch/mips/bcm963xx/include/bcmTag.h linux.dev/arch/mips/bcm963xx/include/bcmTag.h
---- linux.old/arch/mips/bcm963xx/include/bcmTag.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm963xx/include/bcmTag.h      2006-08-25 00:39:38.000000000 +0200
-@@ -0,0 +1,153 @@
+diff -urN linux-2.6.19/arch/mips/bcm963xx/include/bcmtypes.h linux-2.6.19.new/arch/mips/bcm963xx/include/bcmtypes.h
+--- linux-2.6.19/arch/mips/bcm963xx/include/bcmtypes.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/bcm963xx/include/bcmtypes.h     2006-12-16 18:46:31.000000000 +0100
+@@ -0,0 +1,160 @@
 +/*
 +<:copyright-gpl 
 + Copyright 2002 Broadcom Corp. All Rights Reserved. 
 +/*
 +<:copyright-gpl 
 + Copyright 2002 Broadcom Corp. All Rights Reserved. 
@@ -5745,204 +6121,44 @@ diff -urN linux.old/arch/mips/bcm963xx/include/bcmTag.h linux.dev/arch/mips/bcm9
 + 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. 
 +:>
 +*/
 + 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. 
 +:>
 +*/
-+//**************************************************************************************
-+// File Name  : bcmTag.h
++
 +//
 +//
-+// Description: add tag with validation system to the firmware image file to be uploaded
-+//              via http
++// bcmtypes.h - misc useful typedefs
 +//
 +//
-+// Created    : 02/28/2002  seanl
-+//**************************************************************************************
++#ifndef BCMTYPES_H
++#define BCMTYPES_H
 +
 +
-+#ifndef _BCMTAG_H_
-+#define _BCMTAG_H_
++// These are also defined in typedefs.h in the application area, so I need to
++// protect against re-definition.
 +
 +
++#ifndef _TYPEDEFS_H_
++typedef unsigned char   uint8;
++typedef unsigned short  uint16;
++typedef unsigned long   uint32;
++typedef signed char     int8;
++typedef signed short    int16;
++typedef signed long     int32;
++#endif
 +
 +
-+#define BCM_SIG_1   "Broadcom Corporation"
-+#define BCM_SIG_2   "ver. 2.0"          // was "firmware version 2.0" now it is split 6 char out for chip id.
++typedef unsigned char   byte;
++// typedef unsigned long   sem_t;
 +
 +
-+#define BCM_TAG_VER         "6"
-+#define BCM_TAG_VER_LAST    "26"
++typedef unsigned long   HANDLE,*PULONG,DWORD,*PDWORD;
++typedef signed long     LONG,*PLONG;
 +
 +
-+// file tag (head) structure all is in clear text except validationTokens (crc, md5, sha1, etc). Total: 128 unsigned chars
-+#define TAG_LEN         256
-+#define TAG_VER_LEN     4
-+#define SIG_LEN         20
-+#define SIG_LEN_2       14   // Original second SIG = 20 is now devided into 14 for SIG_LEN_2 and 6 for CHIP_ID
-+#define CHIP_ID_LEN           6       
-+#define IMAGE_LEN       10
-+#define ADDRESS_LEN     12
-+#define FLAG_LEN        2
-+#define TOKEN_LEN       20
-+#define BOARD_ID_LEN    16
-+#define RESERVED_LEN    (TAG_LEN - TAG_VER_LEN - SIG_LEN - SIG_LEN_2 - CHIP_ID_LEN - BOARD_ID_LEN - \
-+                        (4*IMAGE_LEN) - (3*ADDRESS_LEN) - (3*FLAG_LEN) - (2*TOKEN_LEN))
++typedef unsigned int    *PUINT;
++typedef signed int      INT;
 +
 +
++typedef unsigned short  *PUSHORT;
++typedef signed short    SHORT,*PSHORT;
++typedef unsigned short  WORD,*PWORD;
 +
 +
-+// TAG for downloadable image (kernel plus file system)
-+typedef struct _FILE_TAG
-+{
-+    unsigned char tagVersion[TAG_VER_LEN];       // tag version.  Will be 2 here.
-+    unsigned char signiture_1[SIG_LEN];          // text line for company info
-+    unsigned char signiture_2[SIG_LEN_2];        // additional info (can be version number)
-+    unsigned char chipId[CHIP_ID_LEN];                         // chip id 
-+    unsigned char boardId[BOARD_ID_LEN];         // board id
-+    unsigned char bigEndian[FLAG_LEN];           // if = 1 - big, = 0 - little endia of the host
-+    unsigned char totalImageLen[IMAGE_LEN];      // the sum of all the following length
-+    unsigned char cfeAddress[ADDRESS_LEN];       // if non zero, cfe starting address
-+    unsigned char cfeLen[IMAGE_LEN];             // if non zero, cfe size in clear ASCII text.
-+    unsigned char rootfsAddress[ADDRESS_LEN];    // if non zero, filesystem starting address
-+    unsigned char rootfsLen[IMAGE_LEN];          // if non zero, filesystem size in clear ASCII text.
-+    unsigned char kernelAddress[ADDRESS_LEN];    // if non zero, kernel starting address
-+    unsigned char kernelLen[IMAGE_LEN];          // if non zero, kernel size in clear ASCII text.
-+    unsigned char dualImage[FLAG_LEN];           // if 1, dual image
-+    unsigned char inactiveLen[FLAG_LEN];         // if 1, the image is INACTIVE; if 0, active 
-+    unsigned char reserved[RESERVED_LEN];        // reserved for later use
-+    unsigned char imageValidationToken[TOKEN_LEN];// image validation token - can be crc, md5, sha;  for
-+                                                 // now will be 4 unsigned char crc
-+    unsigned char tagValidationToken[TOKEN_LEN]; // validation token for tag(from signiture_1 to end of // mageValidationToken)
-+} FILE_TAG, *PFILE_TAG;
++typedef unsigned char   *PUCHAR;
++typedef signed char     *PCHAR;
 +
 +
-+#define CRC32_INIT_VALUE 0xffffffff /* Initial CRC32 checksum value */
-+#define CRC_LEN 4
++typedef void            *PVOID;
 +
 +
-+// only included if for bcmTag.exe program
-+#ifdef BCMTAG_EXE_USE
-+
-+static unsigned long Crc32_table[256] = {
-+    0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
-+    0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
-+    0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
-+    0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
-+    0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
-+    0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
-+    0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
-+    0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
-+    0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
-+    0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
-+    0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
-+    0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
-+    0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
-+    0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
-+    0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
-+    0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
-+    0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
-+    0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
-+    0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
-+    0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
-+    0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
-+    0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
-+    0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
-+    0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
-+    0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
-+    0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
-+    0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
-+    0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
-+    0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
-+    0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
-+    0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
-+    0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
-+    0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
-+    0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
-+    0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
-+    0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
-+    0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
-+    0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
-+    0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
-+    0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
-+    0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
-+    0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
-+    0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
-+    0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
-+    0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
-+    0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
-+    0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
-+    0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
-+    0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
-+    0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
-+    0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
-+    0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
-+    0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
-+    0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
-+    0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
-+    0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
-+    0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
-+    0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
-+    0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
-+    0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
-+    0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
-+    0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
-+    0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
-+    0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
-+};
-+#endif // BCMTAG_USE
-+
-+
-+#endif // _BCMTAG_H_
-+
-diff -urN linux.old/arch/mips/bcm963xx/include/bcmtypes.h linux.dev/arch/mips/bcm963xx/include/bcmtypes.h
---- linux.old/arch/mips/bcm963xx/include/bcmtypes.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm963xx/include/bcmtypes.h    2006-08-25 00:39:38.000000000 +0200
-@@ -0,0 +1,163 @@
-+/*
-+<:copyright-gpl 
-+ Copyright 2002 Broadcom Corp. All Rights Reserved. 
-+ 
-+ This program is free software; you can distribute it and/or modify it 
-+ under the terms of the GNU General Public License (Version 2) as 
-+ published by the Free Software Foundation. 
-+ 
-+ This program is distributed in the hope it will be useful, but WITHOUT 
-+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
-+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License 
-+ for more details. 
-+ 
-+ You should have received a copy of the GNU General Public License along 
-+ with this program; if not, write to the Free Software Foundation, Inc., 
-+ 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. 
-+:>
-+*/
-+
-+//
-+// bcmtypes.h - misc useful typedefs
-+//
-+#ifndef BCMTYPES_H
-+#define BCMTYPES_H
-+
-+// These are also defined in typedefs.h in the application area, so I need to
-+// protect against re-definition.
-+
-+#ifndef _TYPEDEFS_H_
-+typedef unsigned char   uint8;
-+typedef unsigned short  uint16;
-+typedef unsigned long   uint32;
-+typedef signed char     int8;
-+typedef signed short    int16;
-+typedef signed long     int32;
-+#if !defined(__cplusplus)
-+typedef       int     bool;
-+#endif
-+#endif
-+
-+typedef unsigned char   byte;
-+// typedef unsigned long   sem_t;
-+
-+typedef unsigned long   HANDLE,*PULONG,DWORD,*PDWORD;
-+typedef signed long     LONG,*PLONG;
-+
-+typedef unsigned int    *PUINT;
-+typedef signed int      INT;
-+
-+typedef unsigned short  *PUSHORT;
-+typedef signed short    SHORT,*PSHORT;
-+typedef unsigned short  WORD,*PWORD;
-+
-+typedef unsigned char   *PUCHAR;
-+typedef signed char     *PCHAR;
-+
-+typedef void            *PVOID;
-+
-+typedef unsigned char   BOOLEAN, *PBOOL, *PBOOLEAN;
++typedef unsigned char   BOOLEAN, *PBOOL, *PBOOLEAN;
 +
 +typedef unsigned char   BYTE,*PBYTE;
 +
 +
 +typedef unsigned char   BYTE,*PBYTE;
 +
@@ -6047,9 +6263,9 @@ diff -urN linux.old/arch/mips/bcm963xx/include/bcmtypes.h linux.dev/arch/mips/bc
 +#define READ8(addr)         (*(volatile UINT8  *)((ULONG)&addr))
 +
 +#endif
 +#define READ8(addr)         (*(volatile UINT8  *)((ULONG)&addr))
 +
 +#endif
-diff -urN linux.old/arch/mips/bcm963xx/include/board.h linux.dev/arch/mips/bcm963xx/include/board.h
---- linux.old/arch/mips/bcm963xx/include/board.h       1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm963xx/include/board.h       2006-08-25 01:52:34.000000000 +0200
+diff -urN linux-2.6.19/arch/mips/bcm963xx/include/board.h linux-2.6.19.new/arch/mips/bcm963xx/include/board.h
+--- linux-2.6.19/arch/mips/bcm963xx/include/board.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/bcm963xx/include/board.h        2006-12-16 18:46:31.000000000 +0100
 @@ -0,0 +1,373 @@
 +/*
 +<:copyright-gpl 
 @@ -0,0 +1,373 @@
 +/*
 +<:copyright-gpl 
@@ -6424,9 +6640,9 @@ diff -urN linux.old/arch/mips/bcm963xx/include/board.h linux.dev/arch/mips/bcm96
 +
 +#endif /* _BOARD_H */
 +
 +
 +#endif /* _BOARD_H */
 +
-diff -urN linux.old/arch/mips/bcm963xx/int-handler.S linux.dev/arch/mips/bcm963xx/int-handler.S
---- linux.old/arch/mips/bcm963xx/int-handler.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm963xx/int-handler.S 2006-08-25 02:13:33.000000000 +0200
+diff -urN linux-2.6.19/arch/mips/bcm963xx/int-handler.S linux-2.6.19.new/arch/mips/bcm963xx/int-handler.S
+--- linux-2.6.19/arch/mips/bcm963xx/int-handler.S      1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/bcm963xx/int-handler.S  2006-12-16 18:46:31.000000000 +0100
 @@ -0,0 +1,59 @@
 +/*
 +<:copyright-gpl 
 @@ -0,0 +1,59 @@
 +/*
 +<:copyright-gpl 
@@ -6450,7 +6666,7 @@ diff -urN linux.old/arch/mips/bcm963xx/int-handler.S linux.dev/arch/mips/bcm963x
 + * Generic interrupt handler for Broadcom MIPS boards
 + */
 +
 + * Generic interrupt handler for Broadcom MIPS boards
 + */
 +
-+#include <linux/config.h>
++#include <linux/autoconf.h>
 +
 +#include <asm/asm.h>
 +#include <asm/mipsregs.h>
 +
 +#include <asm/asm.h>
 +#include <asm/mipsregs.h>
@@ -6487,9 +6703,9 @@ diff -urN linux.old/arch/mips/bcm963xx/int-handler.S linux.dev/arch/mips/bcm963x
 +      nop
 +              
 +      END(brcmIRQ)
 +      nop
 +              
 +      END(brcmIRQ)
-diff -urN linux.old/arch/mips/bcm963xx/irq.c linux.dev/arch/mips/bcm963xx/irq.c
---- linux.old/arch/mips/bcm963xx/irq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm963xx/irq.c 2006-08-25 03:54:34.000000000 +0200
+diff -urN linux-2.6.19/arch/mips/bcm963xx/irq.c linux-2.6.19.new/arch/mips/bcm963xx/irq.c
+--- linux-2.6.19/arch/mips/bcm963xx/irq.c      1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/bcm963xx/irq.c  2006-12-16 18:46:31.000000000 +0100
 @@ -0,0 +1,256 @@
 +/*
 +<:copyright-gpl 
 @@ -0,0 +1,256 @@
 +/*
 +<:copyright-gpl 
@@ -6551,13 +6767,13 @@ diff -urN linux.old/arch/mips/bcm963xx/irq.c linux.dev/arch/mips/bcm963xx/irq.c
 +      }
 +      if (pendingIrqs & irqBit) {
 +                      PERF->IrqMask &= ~irqBit; // mask
 +      }
 +      if (pendingIrqs & irqBit) {
 +                      PERF->IrqMask &= ~irqBit; // mask
-+                      do_IRQ(isrNumber + INTERNAL_ISR_TABLE_OFFSET, regs);
++                      do_IRQ(isrNumber + INTERNAL_ISR_TABLE_OFFSET);
 +              break;
 +      }
 +      }
 +}
 +
 +              break;
 +      }
 +      }
 +}
 +
-+static void irq_dispatch_ext(uint32 irq, struct pt_regs *regs)
++static void irq_dispatch_ext(uint32 irq)
 +{
 +      if (!(PERF->ExtIrqCfg & (1 << (irq - INTERRUPT_ID_EXTERNAL_0 + EI_MASK_SHFT)))) {
 +      printk("**** Ext IRQ mask. Should not dispatch ****\n");
 +{
 +      if (!(PERF->ExtIrqCfg & (1 << (irq - INTERRUPT_ID_EXTERNAL_0 + EI_MASK_SHFT)))) {
 +      printk("**** Ext IRQ mask. Should not dispatch ****\n");
@@ -6565,7 +6781,7 @@ diff -urN linux.old/arch/mips/bcm963xx/irq.c linux.dev/arch/mips/bcm963xx/irq.c
 +      /* disable and clear interrupt in the controller */
 +      PERF->ExtIrqCfg |= (1 << (irq - INTERRUPT_ID_EXTERNAL_0 + EI_CLEAR_SHFT));
 +      PERF->ExtIrqCfg &= ~(1 << (irq - INTERRUPT_ID_EXTERNAL_0 + EI_MASK_SHFT));
 +      /* disable and clear interrupt in the controller */
 +      PERF->ExtIrqCfg |= (1 << (irq - INTERRUPT_ID_EXTERNAL_0 + EI_CLEAR_SHFT));
 +      PERF->ExtIrqCfg &= ~(1 << (irq - INTERRUPT_ID_EXTERNAL_0 + EI_MASK_SHFT));
-+      do_IRQ(irq, regs);
++      do_IRQ(irq);
 +}
 +
 +
 +}
 +
 +
@@ -6580,13 +6796,13 @@ diff -urN linux.old/arch/mips/bcm963xx/irq.c linux.dev/arch/mips/bcm963xx/irq.c
 +              else if (cause & CAUSEF_IP2)
 +                      irq_dispatch_int(regs);
 +              else if (cause & CAUSEF_IP3)
 +              else if (cause & CAUSEF_IP2)
 +                      irq_dispatch_int(regs);
 +              else if (cause & CAUSEF_IP3)
-+                      irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_0, regs);
++                      irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_0);
 +              else if (cause & CAUSEF_IP4)
 +              else if (cause & CAUSEF_IP4)
-+                      irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_1, regs);
++                      irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_1);
 +              else if (cause & CAUSEF_IP5)
 +              else if (cause & CAUSEF_IP5)
-+                      irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_2, regs);
++                      irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_2);
 +              else if (cause & CAUSEF_IP6)
 +              else if (cause & CAUSEF_IP6)
-+                      irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_3, regs);
++                      irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_3);
 +              local_irq_disable();
 +      }
 +}
 +              local_irq_disable();
 +      }
 +}
@@ -6683,7 +6899,7 @@ diff -urN linux.old/arch/mips/bcm963xx/irq.c linux.dev/arch/mips/bcm963xx/irq.c
 +              irq_desc[i].status = IRQ_DISABLED;
 +              irq_desc[i].action = 0;
 +              irq_desc[i].depth = 1;
 +              irq_desc[i].status = IRQ_DISABLED;
 +              irq_desc[i].action = 0;
 +              irq_desc[i].depth = 1;
-+              irq_desc[i].handler = &brcm_irq_type;
++              irq_desc[i].chip = &brcm_irq_type;
 +      }
 +}
 +
 +      }
 +}
 +
@@ -6725,7 +6941,7 @@ diff -urN linux.old/arch/mips/bcm963xx/irq.c linux.dev/arch/mips/bcm963xx/irq.c
 +       * explicitly call BcmHalInterruptEnable or enable_brcm_irq.  This behavior
 +       * is consistent with interrupt handling on VxWorks.
 +       */
 +       * explicitly call BcmHalInterruptEnable or enable_brcm_irq.  This behavior
 +       * is consistent with interrupt handling on VxWorks.
 +       */
-+      irq_desc[interruptId].handler = &brcm_irq_no_end_type;
++      irq_desc[interruptId].chip = &brcm_irq_no_end_type;
 +
 +      if( interruptId >= INTERNAL_ISR_TABLE_OFFSET )
 +      {
 +
 +      if( interruptId >= INTERNAL_ISR_TABLE_OFFSET )
 +      {
@@ -6747,280 +6963,124 @@ diff -urN linux.old/arch/mips/bcm963xx/irq.c linux.dev/arch/mips/bcm963xx/irq.c
 +EXPORT_SYMBOL(request_external_irq);
 +EXPORT_SYMBOL(BcmHalMapInterrupt);
 +
 +EXPORT_SYMBOL(request_external_irq);
 +EXPORT_SYMBOL(BcmHalMapInterrupt);
 +
-diff -urN linux.old/arch/mips/bcm963xx/Kconfig linux.dev/arch/mips/bcm963xx/Kconfig
---- linux.old/arch/mips/bcm963xx/Kconfig       1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm963xx/Kconfig       2006-08-25 01:22:39.000000000 +0200
-@@ -0,0 +1,138 @@
-+# Kernel and Driver configuration for Broadcom Commengine ADSL board
-+choice
-+      prompt "Broadcom Commengine ADSL board"
-+      depends on MIPS_BRCM
-+      default BCM96345
-+      help
-+        Select different Broadcom ADSL board
+diff -urN linux-2.6.19/arch/mips/bcm963xx/prom.c linux-2.6.19.new/arch/mips/bcm963xx/prom.c
+--- linux-2.6.19/arch/mips/bcm963xx/prom.c     1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/bcm963xx/prom.c 2006-12-16 18:46:31.000000000 +0100
+@@ -0,0 +1,143 @@
++/*
++<:copyright-gpl
++ Copyright 2004 Broadcom Corp. All Rights Reserved.
 +
 +
-+config BCM96338
-+      bool "96338 ADSL board"
-+      select DMA_NONCOHERENT
-+      select HW_HAS_PCI
++ This program is free software; you can distribute it and/or modify it
++ under the terms of the GNU General Public License (Version 2) as
++ published by the Free Software Foundation.
 +
 +
-+config BCM96345
-+      bool "96345 ADSL board"
-+      select DMA_NONCOHERENT
-+      select HW_HAS_PCI
++ This program is distributed in the hope it will be useful, but WITHOUT
++ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++ for more details.
 +
 +
-+config BCM96348
-+      bool "96348 ADSL board"
-+      select DMA_NONCOHERENT
-+      select HW_HAS_PCI
++ You should have received a copy of the GNU General Public License along
++ with this program; if not, write to the Free Software Foundation, Inc.,
++ 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
++:>
++*/
++/*
++ * prom.c: PROM library initialization code.
++ *
++ */
++#include <linux/init.h>
++#include <linux/mm.h>
++#include <linux/sched.h>
++#include <linux/bootmem.h>
++#include <linux/blkdev.h>
++#include <asm/addrspace.h>
++#include <asm/bootinfo.h>
++#include <asm/cpu.h>
++#include <asm/time.h>
 +
 +
-+endchoice
++#include <bcm_map_part.h>
++#include <board.h>
++#include "boardparms.h"
++#include "softdsl/AdslCoreDefs.h"
 +
 +
-+config BCM_BOARD
-+      bool "Support for Broadcom Board"
-+      depends on BCM96338 || BCM96345 || BCM96348
 +
 +
-+config BCM_SERIAL
-+      bool "Support for Serial Port"
-+      depends on BCM96338 || BCM96345 || BCM96348
++//char arcs_cmdline[CL_SIZE] __initdata = {0};
++/* inv_xde */
++int boot_loader_type;
++int prom_argc;
++char **prom_argv, **prom_envp;
 +
 +
-+config BCM_ENET
-+      tristate "Support for Ethernet"
-+      depends on BCM96338 || BCM96345 || BCM96348
++extern int  do_syslog(int, char *, int);
++extern void serial_init(void);
++extern void __init InitNvramInfo( void );
++extern void kerSysFlashInit( void );
++extern unsigned long get_nvram_start_addr(void);
++void __init create_root_nfs_cmdline( char *cmdline );
 +
 +
-+config BCM_USB
-+      tristate "Support for USB"
-+      depends on BCM96338 || BCM96345 || BCM96348
++#define MACH_BCM                    MACH_BCM96348
 +
 +
-+config BCM_WLAN
-+      tristate "Support for Wireless"
-+      depends on BCM96338 || BCM96345 || BCM96348
++const char *get_system_type(void)
++{
++    /*PNVRAM_DATA pNvramData = (PNVRAM_DATA) get_nvram_start_addr();
 +
 +
-+config BCM_PCI
-+      bool "Support for PCI"
-+      depends on BCM96338 || BCM96345 || BCM96348
-+      select PCI
++    return( pNvramData->szBoardId );*/
++    return "brcm63xx";
++}
 +
 +
-+config BCM_ATMAPI
-+      tristate "Support for ATM"
-+      depends on BCM96338 || BCM96345 || BCM96348
++unsigned long getMemorySize(void)
++{
++    unsigned long ulSdramType = BOARD_SDRAM_TYPE;
 +
 +
-+config BCM_ATMTEST
-+      tristate "Support for ATM Diagnostic"
-+      depends on BCM96338 || BCM96345 || BCM96348
++    unsigned long ulSdramSize;
 +
 +
-+config BCM_ADSL
-+      tristate "Support for ADSL"
-+      depends on BCM96338 || BCM96345 || BCM96348
++    switch( ulSdramType )
++    {
++    case BP_MEMORY_16MB_1_CHIP:
++    case BP_MEMORY_16MB_2_CHIP:
++        ulSdramSize = 16 * 1024 * 1024;
++        break;
++    case BP_MEMORY_32MB_1_CHIP:
++    case BP_MEMORY_32MB_2_CHIP:
++        ulSdramSize = 32 * 1024 * 1024;
++        break;
++    case BP_MEMORY_64MB_2_CHIP:
++        ulSdramSize = 64 * 1024 * 1024;
++        break;
++    default:
++        ulSdramSize = 8 * 1024 * 1024;
++        break;
++    }
++    if (boot_loader_type == BOOT_CFE)
++      return ulSdramSize;
++    else
++      // assume that there is one contiguous memory map
++      return boot_mem_map.map[0].size;
++}
 +
 +
-+config BCM_ENDPOINT
-+      tristate "Support for VOICE"
-+      depends on BCM96338 || BCM96345 || BCM96348
++/* --------------------------------------------------------------------------
++    Name: prom_init
++ -------------------------------------------------------------------------- */
++void __init prom_init(void)
++{
++    extern ulong r4k_interval;
 +
 +
-+config BCM_PROCFS
-+      tristate "Support for PROCFS"
-+      depends on BCM96338 || BCM96345 || BCM96348
++    serial_init();
 +
 +
-+config BCM_VDSL
-+      tristate "Support for VDSL"
-+      depends on BCM96338 || BCM96345 || BCM96348
++    prom_argc = fw_arg0;
++    prom_argv = (char **) fw_arg1;
++    prom_envp = (char **) fw_arg2;
 +
 +
-+config BCM_SECURITY
-+      tristate "Support for SECURITY"
-+      depends on BCM96338 || BCM96345 || BCM96348
++    if ((prom_argv > 0x80000000) && (prom_argv < 0x82000000)) {
++      strncpy(arcs_cmdline, prom_argv[1], CL_SIZE);
++    }
 +
 +
-+config BCM_HPNA
-+      tristate "Support for HPNA"
-+      depends on BCM96338 || BCM96345 || BCM96348
-+
-+config BCM_BOARD_IMPL
-+      int "Implementation index for ADSL Board"
-+      depends on BCM96338 || BCM96345 || BCM96348
-+
-+config BCM_SERIAL_IMPL
-+      int "Implementation index for Serial"
-+      depends on BCM96338 || BCM96345 || BCM96348
-+
-+config BCM_ENET_IMPL
-+      int "Implementation index for Ethernet"
-+      depends on BCM96338 || BCM96345 || BCM96348
-+
-+config BCM_USB_IMPL
-+      int "Implementation index for USB"
-+      depends on BCM96338 || BCM96345 || BCM96348
-+
-+config BCM_WLAN_IMPL
-+      int "Implementation index for WIRELESS"
-+      depends on BCM96338 || BCM96345 || BCM96348
-+
-+config BCM_ATMAPI_IMPL
-+      int "Implementation index for ATM"
-+      depends on BCM96338 || BCM96345 || BCM96348
-+
-+config BCM_ATMTEST_IMPL
-+      int "Implementation index for ATM Diagnostic"
-+      depends on BCM96338 || BCM96345 || BCM96348
-+
-+config BCM_BLAA_IMPL
-+      int "Implementation index for BLAA"
-+      depends on BCM96338 || BCM96345 || BCM96348
-+
-+config BCM_ADSL_IMPL
-+      int "Implementation index for ADSL"
-+      depends on BCM96338 || BCM96345 || BCM96348
-+
-+config BCM_ENDPOINT_IMPL
-+      int "Implementation index for VOICE"
-+      depends on BCM96338 || BCM96345 || BCM96348
-+
-+config BCM_PROCFS_IMPL
-+      int "Implementation index for PROCFS"
-+      depends on BCM96338 || BCM96345 || BCM96348
-+
-+config BCM_VDSL_IMPL
-+      int "Implementation index for VDSL"
-+      depends on BCM96338 || BCM96345 || BCM96348
-+
-+config BCM_SECURITY_IMPL
-+      int "Implementation index for SECURITY"
-+      depends on BCM96338 || BCM96345 || BCM96348
-+
-+config BCM_HPNA_IMPL
-+      int "Implementation index for HPNA"
-+      depends on BCM96338 || BCM96345 || BCM96348
-+
-diff -urN linux.old/arch/mips/bcm963xx/Makefile linux.dev/arch/mips/bcm963xx/Makefile
---- linux.old/arch/mips/bcm963xx/Makefile      1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm963xx/Makefile      2006-08-25 02:04:27.000000000 +0200
-@@ -0,0 +1,23 @@
-+#
-+# Makefile for generic Broadcom MIPS boards
-+#
-+# Copyright (C) 2004 Broadcom Corporation
-+#
-+obj-y           := irq.o prom.o setup.o time.o ser_init.o bcm63xx_led.o  board.o  boardparms.o int-handler.o
-+
-+SRCBASE         := $(TOPDIR)
-+EXTRA_CFLAGS    += -I$(SRCBASE)/include
-+#EXTRA_CFLAGS    += -I$(INC_ADSLDRV_PATH) -DDBG
-+EXTRA_CFLAGS    += -I$(INC_ADSLDRV_PATH) 
-+
-+
-+ifeq "$(ADSL)" "ANNEX_B"
-+EXTRA_CFLAGS += -DADSL_ANNEXB
-+endif
-+ifeq "$(ADSL)" "SADSL"
-+EXTRA_CFLAGS += -DADSL_SADSL
-+endif
-+ifeq "$(ADSL)" "ANNEX_C"
-+EXTRA_CFLAGS += -DADSL_ANNEXC
-+endif
-+
-diff -urN linux.old/arch/mips/bcm963xx/prom.c linux.dev/arch/mips/bcm963xx/prom.c
---- linux.old/arch/mips/bcm963xx/prom.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm963xx/prom.c        2006-08-25 01:49:57.000000000 +0200
-@@ -0,0 +1,128 @@
-+/*
-+<:copyright-gpl 
-+ Copyright 2004 Broadcom Corp. All Rights Reserved. 
-+ 
-+ This program is free software; you can distribute it and/or modify it 
-+ under the terms of the GNU General Public License (Version 2) as 
-+ published by the Free Software Foundation. 
-+ 
-+ This program is distributed in the hope it will be useful, but WITHOUT 
-+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
-+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License 
-+ for more details. 
-+ 
-+ You should have received a copy of the GNU General Public License along 
-+ with this program; if not, write to the Free Software Foundation, Inc., 
-+ 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. 
-+:>
-+*/
-+/*
-+ * prom.c: PROM library initialization code.
-+ *
-+ */
-+#include <linux/init.h>
-+#include <linux/mm.h>
-+#include <linux/sched.h>
-+#include <linux/bootmem.h>
-+#include <linux/blkdev.h>
-+#include <asm/addrspace.h>
-+#include <asm/bootinfo.h>
-+#include <asm/cpu.h>
-+#include <asm/time.h>
-+
-+#include <bcm_map_part.h>
-+#include <board.h>
-+#include "boardparms.h"
-+#include "softdsl/AdslCoreDefs.h"
-+
-+
-+//char arcs_cmdline[CL_SIZE] __initdata = {0};
-+/* inv_xde */
-+int boot_loader_type;
-+
-+extern int  do_syslog(int, char *, int);
-+extern void serial_init(void);
-+extern void __init InitNvramInfo( void );
-+extern void kerSysFlashInit( void );
-+extern unsigned long get_nvram_start_addr(void);
-+void __init create_root_nfs_cmdline( char *cmdline );
-+
-+#define MACH_BCM                    MACH_BCM96348
-+
-+const char *get_system_type(void)
-+{
-+    /*PNVRAM_DATA pNvramData = (PNVRAM_DATA) get_nvram_start_addr();
-+
-+    return( pNvramData->szBoardId );*/
-+    return "brcm63xx";
-+}
-+
-+unsigned long getMemorySize(void)
-+{
-+    unsigned long ulSdramType = BOARD_SDRAM_TYPE;
-+
-+    unsigned long ulSdramSize;
-+
-+    switch( ulSdramType )
-+    {
-+    case BP_MEMORY_16MB_1_CHIP:
-+    case BP_MEMORY_16MB_2_CHIP:
-+        ulSdramSize = 16 * 1024 * 1024;
-+        break;
-+    case BP_MEMORY_32MB_1_CHIP:
-+    case BP_MEMORY_32MB_2_CHIP:
-+        ulSdramSize = 32 * 1024 * 1024;
-+        break;
-+    case BP_MEMORY_64MB_2_CHIP:
-+        ulSdramSize = 64 * 1024 * 1024;
-+        break;
-+    default:
-+        ulSdramSize = 8 * 1024 * 1024;
-+        break;
-+    }
-+    if (boot_loader_type == BOOT_CFE)
-+      return ulSdramSize;
-+    else
-+      // assume that there is one contiguous memory map
-+      return boot_mem_map.map[0].size;
-+}
-+
-+/* --------------------------------------------------------------------------
-+    Name: prom_init
-+ -------------------------------------------------------------------------- */
-+void __init prom_init(void)
-+{
-+    extern ulong r4k_interval;
-+
-+    serial_init();
-+
-+    /* Need to fixup boot loader detection code 
-+     * whithout changing prom_init prototype  
-+     */
++    if (strncmp(arcs_cmdline, "boot_loader=RedBoot", 19) != 0) {
++      boot_loader_type =  BOOT_CFE;
++    }
++    else {
++      boot_loader_type = BOOT_REDBOOT;
++    }
 +
 +    do_syslog(8, NULL, 8);
 +
 +
 +    do_syslog(8, NULL, 8);
 +
@@ -7030,27 +7090,29 @@ diff -urN linux.old/arch/mips/bcm963xx/prom.c linux.dev/arch/mips/bcm963xx/prom.
 +
 +    arcs_cmdline[0] = '\0';
 +
 +
 +    arcs_cmdline[0] = '\0';
 +
-+      if (boot_loader_type == BOOT_CFE)
++       if (boot_loader_type == BOOT_CFE)
 +      add_memory_region(0, (getMemorySize() - ADSL_SDRAM_IMAGE_SIZE), BOOT_MEM_RAM);
 +    else
 +      add_memory_region(0, (getMemorySize() - ADSL_SDRAM_IMAGE_SIZE), BOOT_MEM_RAM);
 +    else
-+      add_memory_region(0, (0x01000000 - ADSL_SDRAM_IMAGE_SIZE), BOOT_MEM_RAM);
++       add_memory_region(0, (0x01000000 - ADSL_SDRAM_IMAGE_SIZE), BOOT_MEM_RAM);
 +
 +    mips_machgroup = MACH_GROUP_BRCM;
 +    mips_machtype = MACH_BCM;
 +
 +    mips_machgroup = MACH_GROUP_BRCM;
 +    mips_machtype = MACH_BCM;
++
++       BpSetBoardId("96348GW-10");
 +}
 +
 +/* --------------------------------------------------------------------------
 +    Name: prom_free_prom_memory
 +}
 +
 +/* --------------------------------------------------------------------------
 +    Name: prom_free_prom_memory
-+Abstract: 
++Abstract:
 + -------------------------------------------------------------------------- */
 +void __init prom_free_prom_memory(void)
 +{
 +
 +}
 +
 + -------------------------------------------------------------------------- */
 +void __init prom_free_prom_memory(void)
 +{
 +
 +}
 +
-diff -urN linux.old/arch/mips/bcm963xx/ser_init.c linux.dev/arch/mips/bcm963xx/ser_init.c
---- linux.old/arch/mips/bcm963xx/ser_init.c    1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm963xx/ser_init.c    2006-08-25 00:39:38.000000000 +0200
+diff -urN linux-2.6.19/arch/mips/bcm963xx/ser_init.c linux-2.6.19.new/arch/mips/bcm963xx/ser_init.c
+--- linux-2.6.19/arch/mips/bcm963xx/ser_init.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/bcm963xx/ser_init.c     2006-12-16 18:46:31.000000000 +0100
 @@ -0,0 +1,180 @@
 +/*
 +<:copyright-gpl 
 @@ -0,0 +1,180 @@
 +/*
 +<:copyright-gpl 
@@ -7076,7 +7138,7 @@ diff -urN linux.old/arch/mips/bcm963xx/ser_init.c linux.dev/arch/mips/bcm963xx/s
 + *   
 + */
 +
 + *   
 + */
 +
-+#include <linux/config.h>
++#include <linux/autoconf.h>
 +#include <linux/init.h>
 +#include <linux/interrupt.h>
 +#include <linux/kernel.h>
 +#include <linux/init.h>
 +#include <linux/interrupt.h>
 +#include <linux/kernel.h>
@@ -7232,10 +7294,10 @@ diff -urN linux.old/arch/mips/bcm963xx/ser_init.c linux.dev/arch/mips/bcm963xx/s
 +      prom_puts(ptr);
 +}
 +#endif
 +      prom_puts(ptr);
 +}
 +#endif
-diff -urN linux.old/arch/mips/bcm963xx/setup.c linux.dev/arch/mips/bcm963xx/setup.c
---- linux.old/arch/mips/bcm963xx/setup.c       1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm963xx/setup.c       2006-08-25 02:26:58.000000000 +0200
-@@ -0,0 +1,525 @@
+diff -urN linux-2.6.19/arch/mips/bcm963xx/setup.c linux-2.6.19.new/arch/mips/bcm963xx/setup.c
+--- linux-2.6.19/arch/mips/bcm963xx/setup.c    1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/bcm963xx/setup.c        2006-12-16 18:46:31.000000000 +0100
+@@ -0,0 +1,523 @@
 +/*
 +<:copyright-gpl 
 + Copyright 2002 Broadcom Corp. All Rights Reserved. 
 +/*
 +<:copyright-gpl 
 + Copyright 2002 Broadcom Corp. All Rights Reserved. 
@@ -7258,7 +7320,7 @@ diff -urN linux.old/arch/mips/bcm963xx/setup.c linux.dev/arch/mips/bcm963xx/setu
 + * Generic setup routines for Broadcom 963xx MIPS boards
 + */
 +
 + * Generic setup routines for Broadcom 963xx MIPS boards
 + */
 +
-+#include <linux/config.h>
++#include <linux/autoconf.h>
 +#include <linux/init.h>
 +#include <linux/interrupt.h>
 +#include <linux/kernel.h>
 +#include <linux/init.h>
 +#include <linux/interrupt.h>
 +#include <linux/kernel.h>
@@ -7279,7 +7341,6 @@ diff -urN linux.old/arch/mips/bcm963xx/setup.c linux.dev/arch/mips/bcm963xx/setu
 +#include <asm/gdb-stub.h>
 +
 +extern void brcm_time_init(void);
 +#include <asm/gdb-stub.h>
 +
 +extern void brcm_time_init(void);
-+extern void brcm_timer_setup(struct irqaction *irq);
 +extern unsigned long getMemorySize(void);
 +
 +#if defined(CONFIG_BCM96348) && defined(CONFIG_PCI)
 +extern unsigned long getMemorySize(void);
 +
 +#if defined(CONFIG_BCM96348) && defined(CONFIG_PCI)
@@ -7704,7 +7765,6 @@ diff -urN linux.old/arch/mips/bcm963xx/setup.c linux.dev/arch/mips/bcm963xx/setu
 +    pm_power_off = brcm_machine_halt;
 +
 +    board_time_init = brcm_time_init;
 +    pm_power_off = brcm_machine_halt;
 +
 +    board_time_init = brcm_time_init;
-+    board_timer_setup = brcm_timer_setup;
 +
 +    panic_timeout = 5;
 +
 +
 +    panic_timeout = 5;
 +
@@ -7715,7 +7775,7 @@ diff -urN linux.old/arch/mips/bcm963xx/setup.c linux.dev/arch/mips/bcm963xx/setu
 +    return 0;
 +}
 +
 +    return 0;
 +}
 +
-+void plat_setup(void)
++void __init plat_mem_setup(void)
 +{
 +    brcm63xx_setup();
 +}
 +{
 +    brcm63xx_setup();
 +}
@@ -7761,15 +7821,15 @@ diff -urN linux.old/arch/mips/bcm963xx/setup.c linux.dev/arch/mips/bcm963xx/setu
 +EXPORT_SYMBOL(_ZdlPv);
 +EXPORT_SYMBOL(_ZdaPv);
 +
 +EXPORT_SYMBOL(_ZdlPv);
 +EXPORT_SYMBOL(_ZdaPv);
 +
-diff -urN linux.old/arch/mips/bcm963xx/softdsl/AdslCoreDefs.h linux.dev/arch/mips/bcm963xx/softdsl/AdslCoreDefs.h
---- linux.old/arch/mips/bcm963xx/softdsl/AdslCoreDefs.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm963xx/softdsl/AdslCoreDefs.h        2006-08-25 00:39:38.000000000 +0200
+diff -urN linux-2.6.19/arch/mips/bcm963xx/softdsl/AdslCoreDefs.h linux-2.6.19.new/arch/mips/bcm963xx/softdsl/AdslCoreDefs.h
+--- linux-2.6.19/arch/mips/bcm963xx/softdsl/AdslCoreDefs.h     1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/bcm963xx/softdsl/AdslCoreDefs.h 2006-12-16 18:46:31.000000000 +0100
 @@ -0,0 +1,2 @@
 +#define ADSL_SDRAM_IMAGE_SIZE (384*1024)
 +
 @@ -0,0 +1,2 @@
 +#define ADSL_SDRAM_IMAGE_SIZE (384*1024)
 +
-diff -urN linux.old/arch/mips/bcm963xx/time.c linux.dev/arch/mips/bcm963xx/time.c
---- linux.old/arch/mips/bcm963xx/time.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm963xx/time.c        2006-08-25 03:58:22.000000000 +0200
+diff -urN linux-2.6.19/arch/mips/bcm963xx/time.c linux-2.6.19.new/arch/mips/bcm963xx/time.c
+--- linux-2.6.19/arch/mips/bcm963xx/time.c     1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/bcm963xx/time.c 2006-12-16 18:46:31.000000000 +0100
 @@ -0,0 +1,114 @@
 +/*
 +<:copyright-gpl
 @@ -0,0 +1,114 @@
 +/*
 +<:copyright-gpl
@@ -7793,7 +7853,7 @@ diff -urN linux.old/arch/mips/bcm963xx/time.c linux.dev/arch/mips/bcm963xx/time.
 + * Setup time for Broadcom 963xx MIPS boards
 + */
 +
 + * Setup time for Broadcom 963xx MIPS boards
 + */
 +
-+#include <linux/config.h>
++#include <linux/autoconf.h>
 +#include <linux/init.h>
 +#include <linux/kernel_stat.h>
 +#include <linux/sched.h>
 +#include <linux/init.h>
 +#include <linux/kernel_stat.h>
 +#include <linux/sched.h>
@@ -7855,7 +7915,7 @@ diff -urN linux.old/arch/mips/bcm963xx/time.c linux.dev/arch/mips/bcm963xx/time.
 +      irq_enter();
 +      kstat_this_cpu.irqs[irq]++;
 +
 +      irq_enter();
 +      kstat_this_cpu.irqs[irq]++;
 +
-+      timer_interrupt(irq, NULL, regs);
++      timer_interrupt(irq, regs);
 +      irq_exit();
 +      return IRQ_HANDLED;
 +}
 +      irq_exit();
 +      return IRQ_HANDLED;
 +}
@@ -7879,43 +7939,16 @@ diff -urN linux.old/arch/mips/bcm963xx/time.c linux.dev/arch/mips/bcm963xx/time.
 +}
 +
 +
 +}
 +
 +
-+void __init brcm_timer_setup(struct irqaction *irq)
++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);
 +}
 +{
 +      r4k_cur = (read_c0_count() + r4k_offset);
 +      write_c0_compare(r4k_cur);
 +      set_c0_status(IE_IRQ5);
 +}
-diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig
---- linux.old/arch/mips/Kconfig        2006-08-25 00:43:39.000000000 +0200
-+++ linux.dev/arch/mips/Kconfig        2006-08-25 01:57:46.000000000 +0200
-@@ -12,6 +12,15 @@
-       prompt "System type"
-       default SGI_IP22
-+config MIPS_BRCM
-+      bool "Support for the Broadcom boards"
-+      select SYS_SUPPORTS_32BIT_KERNEL
-+      select SYS_SUPPORTS_BIG_ENDIAN
-+      select SYS_HAS_CPU_MIPS32_R1
-+      select IRQ_CPU
-+      help
-+       This is a fmaily of boards based on the Broadcom MIPS32
-+
- config MIPS_MTX1
-       bool "4G Systems MTX-1 board"
-       select DMA_NONCOHERENT
-@@ -780,6 +789,7 @@
- endchoice
-+source "arch/mips/bcm963xx/Kconfig"
- source "arch/mips/ddb5xxx/Kconfig"
- source "arch/mips/gt64120/ev64120/Kconfig"
- source "arch/mips/jazz/Kconfig"
-diff -urN linux.old/arch/mips/kernel/cpu-probe.c linux.dev/arch/mips/kernel/cpu-probe.c
---- linux.old/arch/mips/kernel/cpu-probe.c     2006-08-25 00:43:39.000000000 +0200
-+++ linux.dev/arch/mips/kernel/cpu-probe.c     2006-08-25 00:39:38.000000000 +0200
-@@ -568,6 +568,25 @@
+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
+@@ -602,6 +602,25 @@
                return;
  }
  
                return;
  }
  
@@ -7941,7 +7974,7 @@ diff -urN linux.old/arch/mips/kernel/cpu-probe.c linux.dev/arch/mips/kernel/cpu-
  static inline void cpu_probe_mips(struct cpuinfo_mips *c)
  {
        decode_configs(c);
  static inline void cpu_probe_mips(struct cpuinfo_mips *c)
  {
        decode_configs(c);
-@@ -704,6 +723,9 @@
+@@ -736,6 +755,9 @@
        case PRID_COMP_LEGACY:
                cpu_probe_legacy(c);
                break;
        case PRID_COMP_LEGACY:
                cpu_probe_legacy(c);
                break;
@@ -7951,10 +7984,10 @@ diff -urN linux.old/arch/mips/kernel/cpu-probe.c linux.dev/arch/mips/kernel/cpu-
        case PRID_COMP_MIPS:
                cpu_probe_mips(c);
                break;
        case PRID_COMP_MIPS:
                cpu_probe_mips(c);
                break;
-diff -urN linux.old/arch/mips/kernel/proc.c linux.dev/arch/mips/kernel/proc.c
---- linux.old/arch/mips/kernel/proc.c  2006-08-25 00:43:39.000000000 +0200
-+++ linux.dev/arch/mips/kernel/proc.c  2006-08-25 00:39:38.000000000 +0200
-@@ -85,6 +85,9 @@
+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,9 @@
        [CPU_VR4181A]   = "NEC VR4181A",
        [CPU_SR71000]   = "Sandcraft SR71000",
        [CPU_PR4450]    = "Philips PR4450",
        [CPU_VR4181A]   = "NEC VR4181A",
        [CPU_SR71000]   = "Sandcraft SR71000",
        [CPU_PR4450]    = "Philips PR4450",
@@ -7964,33 +7997,10 @@ diff -urN linux.old/arch/mips/kernel/proc.c linux.dev/arch/mips/kernel/proc.c
  };
  
  
  };
  
  
-diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile
---- linux.old/arch/mips/Makefile       2006-08-25 00:43:39.000000000 +0200
-+++ linux.dev/arch/mips/Makefile       2006-08-25 11:36:41.000000000 +0200
-@@ -145,6 +145,19 @@
- #
- #
-+# Broadcom board
-+#
-+core-$(CONFIG_MIPS_BRCM)      += arch/mips/bcm963xx/
-+core-$(CONFIG_MIPS_BRCM)      += bcmdrivers/opensource/char/serial/impl1/
-+#core-$(CONFIG_MIPS_BRCM)     += bcmdrivers/opensource/char/board/bcm963xx/impl1/
-+#core-$(CONFIG_MIPS_BRCM)     += boardparms/bcm963xx/
-+#cflags-$(CONFIG_MIPS_BRCM)           += -Iinclude/asm-mips/mach-bcm963xx
-+cflags-$(CONFIG_MIPS_BRCM)            += -Iarch/mips/bcm963xx/include
-+cflags-$(CONFIG_MIPS_BRCM)            += -Iboardparms/bcm963xx
-+load-$(CONFIG_MIPS_BRCM)      += 0xffffffff80010000
-+
-+
-+#
- # Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
- #
- core-$(CONFIG_MACH_JAZZ)      += arch/mips/jazz/
-diff -urN linux.old/arch/mips/mm/c-r4k.c linux.dev/arch/mips/mm/c-r4k.c
---- linux.old/arch/mips/mm/c-r4k.c     2006-08-25 00:43:39.000000000 +0200
-+++ linux.dev/arch/mips/mm/c-r4k.c     2006-08-25 00:39:38.000000000 +0200
-@@ -914,6 +914,13 @@
+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 @@
                if (!(config & MIPS_CONF_M))
                        panic("Don't know how to probe P-caches on this cpu.");
  
                if (!(config & MIPS_CONF_M))
                        panic("Don't know how to probe P-caches on this cpu.");
  
@@ -8004,10 +8014,10 @@ diff -urN linux.old/arch/mips/mm/c-r4k.c linux.dev/arch/mips/mm/c-r4k.c
                /*
                 * So we seem to be a MIPS32 or MIPS64 CPU
                 * So let's probe the I-cache ...
                /*
                 * So we seem to be a MIPS32 or MIPS64 CPU
                 * So let's probe the I-cache ...
-diff -urN linux.old/arch/mips/mm/tlbex.c linux.dev/arch/mips/mm/tlbex.c
---- linux.old/arch/mips/mm/tlbex.c     2006-08-25 00:43:39.000000000 +0200
-+++ linux.dev/arch/mips/mm/tlbex.c     2006-08-25 00:39:38.000000000 +0200
-@@ -882,6 +882,9 @@
+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
+@@ -880,6 +880,9 @@
        case CPU_4KSC:
        case CPU_20KC:
        case CPU_25KF:
        case CPU_4KSC:
        case CPU_20KC:
        case CPU_25KF:
@@ -8017,26 +8027,37 @@ diff -urN linux.old/arch/mips/mm/tlbex.c linux.dev/arch/mips/mm/tlbex.c
                tlbw(p);
                break;
  
                tlbw(p);
                break;
  
-diff -urN linux.old/arch/mips/pci/fixup-bcm96348.c linux.dev/arch/mips/pci/fixup-bcm96348.c
---- linux.old/arch/mips/pci/fixup-bcm96348.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/pci/fixup-bcm96348.c   2006-08-25 00:39:38.000000000 +0200
-@@ -0,0 +1,85 @@
+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
+@@ -17,6 +17,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
++obj-$(CONFIG_BCM_PCI)         += fixup-bcm96348.o pci-bcm96348.o ops-bcm96348.o
+ #
+ # These are still pretty much in the old state, watch, go blind.
+diff -urN linux-2.6.19/arch/mips/pci/fixup-bcm96348.c linux-2.6.19.new/arch/mips/pci/fixup-bcm96348.c
+--- linux-2.6.19/arch/mips/pci/fixup-bcm96348.c        1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/pci/fixup-bcm96348.c    2006-12-16 18:46:31.000000000 +0100
+@@ -0,0 +1,93 @@
 +/*
 +/*
-+<:copyright-gpl 
-+ Copyright 2002 Broadcom Corp. All Rights Reserved. 
-+ 
-+ This program is free software; you can distribute it and/or modify it 
-+ under the terms of the GNU General Public License (Version 2) as 
-+ published by the Free Software Foundation. 
-+ 
-+ This program is distributed in the hope it will be useful, but WITHOUT 
-+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
-+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License 
-+ for more details. 
-+ 
-+ You should have received a copy of the GNU General Public License along 
-+ with this program; if not, write to the Free Software Foundation, Inc., 
-+ 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. 
++<:copyright-gpl
++ Copyright 2002 Broadcom Corp. All Rights Reserved.
++
++ This program is free software; you can distribute it and/or modify it
++ under the terms of the GNU General Public License (Version 2) as
++ published by the Free Software Foundation.
++
++ This program is distributed in the hope it will be useful, but WITHOUT
++ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++ for more details.
++
++ You should have received a copy of the GNU General Public License along
++ with this program; if not, write to the Free Software Foundation, Inc.,
++ 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 +:>
 +*/
 +#include <linux/init.h>
 +:>
 +*/
 +#include <linux/init.h>
@@ -8076,10 +8097,10 @@ diff -urN linux.old/arch/mips/pci/fixup-bcm96348.c linux.dev/arch/mips/pci/fixup
 +            // Memory Window 1. Mask determines which bits are decoded.
 +            mpi->l2pmrange1 = ~(size-1);
 +            // UBUS to PCI Memory base address. This is akin to the ChipSelect base
 +            // Memory Window 1. Mask determines which bits are decoded.
 +            mpi->l2pmrange1 = ~(size-1);
 +            // UBUS to PCI Memory base address. This is akin to the ChipSelect base
-+            // register. 
++            // register.
 +            mpi->l2pmbase1 = memaddr & BCM_PCI_ADDR_MASK;
 +            // UBUS to PCI Remap Address. Replaces the masked address bits in the
 +            mpi->l2pmbase1 = memaddr & BCM_PCI_ADDR_MASK;
 +            // UBUS to PCI Remap Address. Replaces the masked address bits in the
-+            // range register with this setting. 
++            // range register with this setting.
 +            // Also, enable direct I/O and direct Memory accesses
 +            mpi->l2pmremap1 = (memaddr | MEM_WINDOW_EN);
 +            break;
 +            // Also, enable direct I/O and direct Memory accesses
 +            mpi->l2pmremap1 = (memaddr | MEM_WINDOW_EN);
 +            break;
@@ -8087,7 +8108,7 @@ diff -urN linux.old/arch/mips/pci/fixup-bcm96348.c linux.dev/arch/mips/pci/fixup
 +        case 1:
 +            // Memory Window 2
 +            mpi->l2pmrange2 = ~(size-1);
 +        case 1:
 +            // Memory Window 2
 +            mpi->l2pmrange2 = ~(size-1);
-+            // UBUS to PCI Memory base address. 
++            // UBUS to PCI Memory base address.
 +            mpi->l2pmbase2 = memaddr & BCM_PCI_ADDR_MASK;
 +            // UBUS to PCI Remap Address
 +            mpi->l2pmremap2 = (memaddr | MEM_WINDOW_EN);
 +            mpi->l2pmbase2 = memaddr & BCM_PCI_ADDR_MASK;
 +            // UBUS to PCI Remap Address
 +            mpi->l2pmremap2 = (memaddr | MEM_WINDOW_EN);
@@ -8102,24 +8123,21 @@ diff -urN linux.old/arch/mips/pci/fixup-bcm96348.c linux.dev/arch/mips/pci/fixup
 +    }
 +}
 +
 +    }
 +}
 +
-+struct pci_fixup pcibios_fixups[] = {
++int pcibios_plat_dev_init(struct pci_dev *dev)
++{
++        return 0;
++}
++
++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_BROADCOM, PCI_ANY_ID,
++          bcm96348_fixup);
++
++/*struct pci_fixup pcibios_fixups[] = {
 +    { PCI_FIXUP_FINAL, PCI_ANY_ID, PCI_ANY_ID, bcm96348_fixup },
 +    {0}
 +    { PCI_FIXUP_FINAL, PCI_ANY_ID, PCI_ANY_ID, bcm96348_fixup },
 +    {0}
-+};
-diff -urN linux.old/arch/mips/pci/Makefile linux.dev/arch/mips/pci/Makefile
---- linux.old/arch/mips/pci/Makefile   2006-08-25 00:43:29.000000000 +0200
-+++ linux.dev/arch/mips/pci/Makefile   2006-08-25 00:39:38.000000000 +0200
-@@ -18,6 +18,7 @@
- obj-$(CONFIG_MIPS_TX3927)     += ops-tx3927.o
- obj-$(CONFIG_PCI_VR41XX)      += ops-vr41xx.o pci-vr41xx.o
- obj-$(CONFIG_NEC_CMBVR4133)   += fixup-vr4133.o
-+obj-$(CONFIG_BCM_PCI)         += fixup-bcm96348.o pci-bcm96348.o ops-bcm96348.o
- #
- # These are still pretty much in the old state, watch, go blind.
-diff -urN linux.old/arch/mips/pci/ops-bcm96348.c linux.dev/arch/mips/pci/ops-bcm96348.c
---- linux.old/arch/mips/pci/ops-bcm96348.c     1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/pci/ops-bcm96348.c     2006-08-25 00:39:38.000000000 +0200
++};*/
+diff -urN linux-2.6.19/arch/mips/pci/ops-bcm96348.c linux-2.6.19.new/arch/mips/pci/ops-bcm96348.c
+--- linux-2.6.19/arch/mips/pci/ops-bcm96348.c  1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/pci/ops-bcm96348.c      2006-12-16 18:46:31.000000000 +0100
 @@ -0,0 +1,276 @@
 +/*
 +<:copyright-gpl 
 @@ -0,0 +1,276 @@
 +/*
 +<:copyright-gpl 
@@ -8397,26 +8415,26 @@ diff -urN linux.old/arch/mips/pci/ops-bcm96348.c linux.dev/arch/mips/pci/ops-bcm
 +    .read   = bcm96348_pcibios_read,
 +    .write  = bcm96348_pcibios_write
 +};
 +    .read   = bcm96348_pcibios_read,
 +    .write  = bcm96348_pcibios_write
 +};
-diff -urN linux.old/arch/mips/pci/pci-bcm96348.c linux.dev/arch/mips/pci/pci-bcm96348.c
---- linux.old/arch/mips/pci/pci-bcm96348.c     1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/pci/pci-bcm96348.c     2006-08-25 00:39:38.000000000 +0200
+diff -urN linux-2.6.19/arch/mips/pci/pci-bcm96348.c linux-2.6.19.new/arch/mips/pci/pci-bcm96348.c
+--- linux-2.6.19/arch/mips/pci/pci-bcm96348.c  1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/arch/mips/pci/pci-bcm96348.c      2006-12-16 18:46:31.000000000 +0100
 @@ -0,0 +1,54 @@
 +/*
 @@ -0,0 +1,54 @@
 +/*
-+<:copyright-gpl 
-+ Copyright 2002 Broadcom Corp. All Rights Reserved. 
-+ 
-+ This program is free software; you can distribute it and/or modify it 
-+ under the terms of the GNU General Public License (Version 2) as 
-+ published by the Free Software Foundation. 
-+ 
-+ This program is distributed in the hope it will be useful, but WITHOUT 
-+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
-+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License 
-+ for more details. 
-+ 
-+ You should have received a copy of the GNU General Public License along 
-+ with this program; if not, write to the Free Software Foundation, Inc., 
-+ 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. 
++<:copyright-gpl
++ Copyright 2002 Broadcom Corp. All Rights Reserved.
++
++ This program is free software; you can distribute it and/or modify it
++ under the terms of the GNU General Public License (Version 2) as
++ published by the Free Software Foundation.
++
++ This program is distributed in the hope it will be useful, but WITHOUT
++ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++ for more details.
++
++ You should have received a copy of the GNU General Public License along
++ with this program; if not, write to the Free Software Foundation, Inc.,
++ 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 +:>
 +*/
 +#include <linux/types.h>
 +:>
 +*/
 +#include <linux/types.h>
@@ -8424,7 +8442,7 @@ diff -urN linux.old/arch/mips/pci/pci-bcm96348.c linux.dev/arch/mips/pci/pci-bcm
 +#include <linux/kernel.h>
 +#include <linux/init.h>
 +
 +#include <linux/kernel.h>
 +#include <linux/init.h>
 +
-+#include <asm/pci_channel.h>
++//#include <asm/pci_channel.h>
 +#include <bcmpci.h>
 +
 +static struct resource bcm_pci_io_resource = {
 +#include <bcmpci.h>
 +
 +static struct resource bcm_pci_io_resource = {
@@ -8444,9 +8462,9 @@ diff -urN linux.old/arch/mips/pci/pci-bcm96348.c linux.dev/arch/mips/pci/pci-bcm
 +extern struct pci_ops bcm96348_pci_ops;
 +
 +struct pci_controller bcm96348_controller = {
 +extern struct pci_ops bcm96348_pci_ops;
 +
 +struct pci_controller bcm96348_controller = {
-+    .pci_ops  = &bcm96348_pci_ops,
-+    .io_resource      = &bcm_pci_io_resource,
-+    .mem_resource     = &bcm_pci_mem_resource,
++    .pci_ops   = &bcm96348_pci_ops,
++    .io_resource       = &bcm_pci_io_resource,
++    .mem_resource      = &bcm_pci_mem_resource,
 +};
 +
 +static void bcm96348_pci_init(void)
 +};
 +
 +static void bcm96348_pci_init(void)
@@ -8455,10 +8473,18 @@ diff -urN linux.old/arch/mips/pci/pci-bcm96348.c linux.dev/arch/mips/pci/pci-bcm
 +}
 +
 +arch_initcall(bcm96348_pci_init);
 +}
 +
 +arch_initcall(bcm96348_pci_init);
-diff -urN linux.old/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c linux.dev/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c
---- linux.old/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c   2006-08-25 00:39:38.000000000 +0200
-@@ -0,0 +1,1056 @@
+diff -urN linux-2.6.19/drivers/serial/Makefile linux-2.6.19.new/drivers/serial/Makefile
+--- linux-2.6.19/drivers/serial/Makefile       2006-11-29 22:57:37.000000000 +0100
++++ linux-2.6.19.new/drivers/serial/Makefile   2006-12-16 18:49:17.000000000 +0100
+@@ -56,3 +56,4 @@
+ obj-$(CONFIG_SERIAL_SGI_IOC3) += ioc3_serial.o
+ obj-$(CONFIG_SERIAL_ATMEL) += atmel_serial.o
+ obj-$(CONFIG_SERIAL_NETX) += netx-serial.o
++obj-$(CONFIG_BCM_SERIAL) += bcm63xx_cons.o
+diff -urN linux-2.6.19/drivers/serial/bcm63xx_cons.c linux-2.6.19.new/drivers/serial/bcm63xx_cons.c
+--- linux-2.6.19/drivers/serial/bcm63xx_cons.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/drivers/serial/bcm63xx_cons.c     2006-12-16 18:46:31.000000000 +0100
+@@ -0,0 +1,1049 @@
 +/*
 +<:copyright-gpl 
 + Copyright 2002 Broadcom Corp. All Rights Reserved. 
 +/*
 +<:copyright-gpl 
 + Copyright 2002 Broadcom Corp. All Rights Reserved. 
@@ -8498,6 +8524,7 @@ diff -urN linux.old/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c linux
 +#include <linux/tty.h>
 +#include <linux/tty_flip.h>
 +#include <linux/serial.h>
 +#include <linux/tty.h>
 +#include <linux/tty_flip.h>
 +#include <linux/serial.h>
++#include <linux/serialP.h>
 +#include <asm/uaccess.h>
 +
 +#include <bcmtypes.h>
 +#include <asm/uaccess.h>
 +
 +#include <bcmtypes.h>
@@ -8564,11 +8591,9 @@ diff -urN linux.old/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c linux
 +
 +static struct bcm_serial multi[BCM_NUM_UARTS];
 +static struct bcm_serial *lines[BCM_NUM_UARTS];
 +
 +static struct bcm_serial multi[BCM_NUM_UARTS];
 +static struct bcm_serial *lines[BCM_NUM_UARTS];
-+static struct tty_driver serial_driver;
-+static struct tty_struct *serial_table[BCM_NUM_UARTS];
++static struct tty_driver *serial_driver;
 +static struct termios *serial_termios[BCM_NUM_UARTS];
 +static struct termios *serial_termios_locked[BCM_NUM_UARTS];
 +static struct termios *serial_termios[BCM_NUM_UARTS];
 +static struct termios *serial_termios_locked[BCM_NUM_UARTS];
-+static int serial_refcount;
 +
 +
 +static void bcm_stop (struct tty_struct *tty);
 +
 +
 +static void bcm_stop (struct tty_struct *tty);
@@ -8578,7 +8603,7 @@ diff -urN linux.old/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c linux
 +static void shutdown (struct bcm_serial * info);
 +static void change_speed( volatile Uart *pUart, tcflag_t cFlag );
 +static void bcm63xx_cons_flush_chars (struct tty_struct *tty);
 +static void shutdown (struct bcm_serial * info);
 +static void change_speed( volatile Uart *pUart, tcflag_t cFlag );
 +static void bcm63xx_cons_flush_chars (struct tty_struct *tty);
-+static int bcm63xx_cons_write (struct tty_struct *tty, int from_user,
++static int bcm63xx_cons_write (struct tty_struct *tty, 
 +    const unsigned char *buf, int count);
 +static int bcm63xx_cons_write_room (struct tty_struct *tty);
 +static int bcm_chars_in_buffer (struct tty_struct *tty);
 +    const unsigned char *buf, int count);
 +static int bcm63xx_cons_write_room (struct tty_struct *tty);
 +static int bcm_chars_in_buffer (struct tty_struct *tty);
@@ -8634,7 +8659,7 @@ diff -urN linux.old/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c linux
 +    UCHAR ch = 0;
 +    while ((status = info->port->intStatus) & RXINT)
 +    {
 +    UCHAR ch = 0;
 +    while ((status = info->port->intStatus) & RXINT)
 +    {
-+      char flag_char = 0;
++              char flag_char = TTY_NORMAL;
 +
 +        if (status & RXFIFONE)
 +            ch = info->port->Data;  // Read the character
 +
 +        if (status & RXFIFONE)
 +            ch = info->port->Data;  // Read the character
@@ -8694,9 +8719,10 @@ diff -urN linux.old/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c linux
 +        }
 +      tty_insert_flip_char(tty, ch, flag_char);
 +    }
 +        }
 +      tty_insert_flip_char(tty, ch, flag_char);
 +    }
-+ignore_char:
-+    if (tty)
-+        tty_flip_buffer_push(tty);
++ignore_char:;
++      tty_flip_buffer_push(tty);
++      tty_schedule_flip(tty);
++
 +}
 +
 +
 +}
 +
 +
@@ -8709,7 +8735,7 @@ diff -urN linux.old/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c linux
 + * ------------------------------------------------------------
 + */
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 + * ------------------------------------------------------------
 + */
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+static irqreturn_t bcm_interrupt (int irq, void * dev, struct pt_regs * regs)
++static irqreturn_t bcm_interrupt (int irq, void * dev)
 +#else
 +static void bcm_interrupt (int irq, void * dev, struct pt_regs * regs)
 +#endif
 +#else
 +static void bcm_interrupt (int irq, void * dev, struct pt_regs * regs)
 +#endif
@@ -8768,9 +8794,6 @@ diff -urN linux.old/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c linux
 +    if (!info->is_initialized)
 +        return;
 +
 +    if (!info->is_initialized)
 +        return;
 +
-+      
-+    /*save_flags (flags);
-+    cli ();*/
 +    spin_lock_irqsave(&bcm963xx_serial_lock, flags);
 +
 +    info->port->control &= ~(BRGEN|TXEN|RXEN);
 +    spin_lock_irqsave(&bcm963xx_serial_lock, flags);
 +
 +    info->port->control &= ~(BRGEN|TXEN|RXEN);
@@ -8778,7 +8801,6 @@ diff -urN linux.old/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c linux
 +        set_bit (TTY_IO_ERROR, &info->tty->flags);
 +    info->is_initialized = 0;
 +
 +        set_bit (TTY_IO_ERROR, &info->tty->flags);
 +    info->is_initialized = 0;
 +
-+    //restore_flags (flags);
 +    spin_unlock_irqrestore(&bcm963xx_serial_lock, flags);
 +}
 +/* 
 +    spin_unlock_irqrestore(&bcm963xx_serial_lock, flags);
 +}
 +/* 
@@ -8791,10 +8813,8 @@ diff -urN linux.old/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c linux
 +static void change_speed( volatile Uart *pUart, tcflag_t cFlag )
 +{
 +    unsigned long ulFlags, ulBaud, ulClockFreqHz, ulTmp;
 +static void change_speed( volatile Uart *pUart, tcflag_t cFlag )
 +{
 +    unsigned long ulFlags, ulBaud, ulClockFreqHz, ulTmp;
-+    /*save_flags(ulFlags);
-+    cli();*/
++      
 +    spin_lock_irqsave(&bcm963xx_serial_lock, ulFlags);
 +    spin_lock_irqsave(&bcm963xx_serial_lock, ulFlags);
-+
 +    switch( cFlag & (CBAUD | CBAUDEX) )
 +    {
 +    case B115200:
 +    switch( cFlag & (CBAUD | CBAUDEX) )
 +    {
 +    case B115200:
@@ -8874,7 +8894,6 @@ diff -urN linux.old/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c linux
 +    case CS7:
 +        ulTmp = BITS7SYM; /* select transmit 7 bit data size */
 +        break;
 +    case CS7:
 +        ulTmp = BITS7SYM; /* select transmit 7 bit data size */
 +        break;
-+    /*case CS8:*/
 +    default:
 +        ulTmp = BITS8SYM; /* select transmit 8 bit data size */
 +        break;
 +    default:
 +        ulTmp = BITS8SYM; /* select transmit 8 bit data size */
 +        break;
@@ -8902,7 +8921,6 @@ diff -urN linux.old/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c linux
 +
 +    /* Reset and flush uart */
 +    pUart->fifoctl = RSTTXFIFOS | RSTRXFIFOS;
 +
 +    /* Reset and flush uart */
 +    pUart->fifoctl = RSTTXFIFOS | RSTRXFIFOS;
-+    //restore_flags( ulFlags );
 +    spin_unlock_irqrestore(&bcm963xx_serial_lock, ulFlags);
 +}
 +
 +    spin_unlock_irqrestore(&bcm963xx_serial_lock, ulFlags);
 +}
 +
@@ -8926,7 +8944,7 @@ diff -urN linux.old/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c linux
 + * Main output routine using polled I/O.
 + * ------------------------------------------------------------------- 
 + */
 + * Main output routine using polled I/O.
 + * ------------------------------------------------------------------- 
 + */
-+static int bcm63xx_cons_write (struct tty_struct *tty, int from_user,
++static int bcm63xx_cons_write (struct tty_struct *tty, 
 +    const unsigned char *buf, int count)
 +{
 +    int c;
 +    const unsigned char *buf, int count)
 +{
 +    int c;
@@ -8970,6 +8988,7 @@ diff -urN linux.old/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c linux
 + */
 +static void bcm_flush_buffer (struct tty_struct *tty)
 +{
 + */
 +static void bcm_flush_buffer (struct tty_struct *tty)
 +{
++      tty_wakeup(tty);
 +}
 +
 +/*
 +}
 +
 +/*
@@ -9343,6 +9362,7 @@ diff -urN linux.old/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c linux
 +
 +    info = lines[line];
 +
 +
 +    info = lines[line];
 +
++    tty->low_latency=1;
 +    info->port->intMask  = 0;     /* Clear any pending interrupts */
 +    info->port->intMask  = RXINT; /* Enable RX */
 +
 +    info->port->intMask  = 0;     /* Clear any pending interrupts */
 +    info->port->intMask  = RXINT; /* Enable RX */
 +
@@ -9372,6 +9392,25 @@ diff -urN linux.old/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c linux
 +    return 0;
 +}
 +
 +    return 0;
 +}
 +
++
++static struct tty_operations rs_ops = {
++      .open = bcm63xx_cons_open,
++      .close = bcm63xx_cons_close,
++      .write = bcm63xx_cons_write,
++      .flush_chars = bcm63xx_cons_flush_chars,
++      .write_room = bcm63xx_cons_write_room,
++      .chars_in_buffer = bcm_chars_in_buffer,
++      .flush_buffer = bcm_flush_buffer,
++      .ioctl = bcm_ioctl,
++      .throttle = bcm_throttle,
++      .unthrottle = bcm_unthrottle,
++      .send_xchar = bcm_send_xchar,
++      .set_termios = bcm_set_termios,
++      .stop = bcm_stop,
++      .start = bcm_start,
++      .hangup = bcm_hangup,
++};
++
 +/* --------------------------------------------------------------------------
 +    Name: bcm63xx_serialinit
 + Purpose: Initialize our BCM63xx serial driver
 +/* --------------------------------------------------------------------------
 +    Name: bcm63xx_serialinit
 + Purpose: Initialize our BCM63xx serial driver
@@ -9383,49 +9422,29 @@ diff -urN linux.old/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c linux
 +
 +    // Print the driver version information
 +    printk(VER_STR);
 +
 +    // Print the driver version information
 +    printk(VER_STR);
++    serial_driver = alloc_tty_driver(BCM_NUM_UARTS);
++    if (!serial_driver)
++      return -ENOMEM;
++
++      serial_driver->owner        = THIS_MODULE;
++      serial_driver->devfs_name           = "tts/";
++//    serial_driver.magic             = TTY_DRIVER_MAGIC;
++    serial_driver->name              = "ttyS";
++    serial_driver->major             = TTY_MAJOR;
++    serial_driver->minor_start       = 64;
++//    serial_driver.num               = BCM_NUM_UARTS;
++    serial_driver->type              = TTY_DRIVER_TYPE_SERIAL;
++    serial_driver->subtype           = SERIAL_TYPE_NORMAL;
++    serial_driver->init_termios      = tty_std_termios;
++    serial_driver->init_termios.c_cflag = B115200 | CS8 | CREAD | HUPCL | CLOCAL;
++    serial_driver->flags             = TTY_DRIVER_REAL_RAW;
++
++    serial_driver->termios           = serial_termios;
++    serial_driver->termios_locked    = serial_termios_locked;
++    
++    tty_set_operations(serial_driver, &rs_ops);
 +
 +
-+    memset(&serial_driver, 0, sizeof(struct tty_driver));
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)     
-+    serial_driver.owner           = THIS_MODULE;
-+    serial_driver.devfs_name      = "tts/";
-+#endif    
-+    serial_driver.magic             = TTY_DRIVER_MAGIC;
-+    serial_driver.name              = "ttyS";
-+    serial_driver.major             = TTY_MAJOR;
-+    serial_driver.minor_start       = 64;
-+    serial_driver.num               = BCM_NUM_UARTS;
-+    serial_driver.type              = TTY_DRIVER_TYPE_SERIAL;
-+    serial_driver.subtype           = SERIAL_TYPE_NORMAL;
-+    serial_driver.init_termios      = tty_std_termios;
-+    serial_driver.init_termios.c_cflag = B115200 | CS8 | CREAD | CLOCAL;
-+    serial_driver.flags             = TTY_DRIVER_REAL_RAW;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)    
-+    serial_driver.refcount          = serial_refcount;
-+    serial_driver.ttys                    = serial_table;    
-+#else
-+    serial_driver.refcount          = &serial_refcount;
-+    serial_driver.table             = serial_table;    
-+#endif    
-+
-+    serial_driver.termios           = serial_termios;
-+    serial_driver.termios_locked    = serial_termios_locked;
-+    serial_driver.open              = bcm63xx_cons_open;
-+    serial_driver.close             = bcm63xx_cons_close;
-+    serial_driver.write             = bcm63xx_cons_write;
-+    serial_driver.flush_chars       = bcm63xx_cons_flush_chars;
-+    serial_driver.write_room        = bcm63xx_cons_write_room;
-+    serial_driver.chars_in_buffer   = bcm_chars_in_buffer;
-+    serial_driver.flush_buffer      = bcm_flush_buffer;
-+    serial_driver.ioctl             = bcm_ioctl;
-+    serial_driver.throttle          = bcm_throttle;
-+    serial_driver.unthrottle        = bcm_unthrottle;
-+    serial_driver.send_xchar        = bcm_send_xchar;
-+    serial_driver.set_termios       = bcm_set_termios;
-+    serial_driver.stop              = bcm_stop;
-+    serial_driver.start             = bcm_start;
-+    serial_driver.hangup            = bcm_hangup;
-+
-+    if (tty_register_driver (&serial_driver))
++    if (tty_register_driver (serial_driver))
 +        panic("Couldn't register serial driver\n");
 +
 +    //save_flags(flags); cli();
 +        panic("Couldn't register serial driver\n");
 +
 +    //save_flags(flags); cli();
@@ -9435,17 +9454,18 @@ diff -urN linux.old/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c linux
 +    {
 +        info = &multi[i]; 
 +        lines[i] = info;
 +    {
 +        info = &multi[i]; 
 +        lines[i] = info;
++        info->magic = SERIAL_MAGIC;
 +        info->port                  = (Uart *) ((char *)UART_BASE + (i * 0x20));
 +        info->port                  = (Uart *) ((char *)UART_BASE + (i * 0x20));
++        info->tty                   = 0;
 +        info->irq                   = (2 - i) + 8;
 +        info->line                  = i;
 +        info->irq                   = (2 - i) + 8;
 +        info->line                  = i;
-+        info->tty                   = 0;
 +        info->close_delay           = 50;
 +        info->closing_wait          = 3000;
 +        info->x_char                = 0;
 +        info->event                 = 0;
 +        info->count                 = 0;
 +        info->blocked_open          = 0;      
 +        info->close_delay           = 50;
 +        info->closing_wait          = 3000;
 +        info->x_char                = 0;
 +        info->event                 = 0;
 +        info->count                 = 0;
 +        info->blocked_open          = 0;      
-+        info->normal_termios        = serial_driver.init_termios;
++        info->normal_termios        = serial_driver->init_termios;
 +        init_waitqueue_head(&info->open_wait); 
 +        init_waitqueue_head(&info->close_wait); 
 +
 +        init_waitqueue_head(&info->open_wait); 
 +        init_waitqueue_head(&info->close_wait); 
 +
@@ -9461,7 +9481,6 @@ diff -urN linux.old/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c linux
 +     * is updated... in request_irq - to immediatedly obliterate
 +     * it is unwise. 
 +     */
 +     * is updated... in request_irq - to immediatedly obliterate
 +     * it is unwise. 
 +     */
-+    //restore_flags(flags);
 +    spin_unlock_irqrestore(&bcm963xx_serial_lock, flags);
 +    return 0;
 +}
 +    spin_unlock_irqrestore(&bcm963xx_serial_lock, flags);
 +    return 0;
 +}
@@ -9491,7 +9510,7 @@ diff -urN linux.old/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c linux
 +static struct tty_driver * bcm_console_device(struct console * c, int *index)
 +{
 +    *index = c->index;
 +static struct tty_driver * bcm_console_device(struct console * c, int *index)
 +{
 +    *index = c->index;
-+    return &serial_driver;
++    return serial_driver;
 +}
 +
 +static int __init bcm_console_setup(struct console * co, char * options)
 +}
 +
 +static int __init bcm_console_setup(struct console * co, char * options)
@@ -9504,7 +9523,7 @@ diff -urN linux.old/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c linux
 +    .write    = bcm_console_print,
 +    .device   = bcm_console_device,
 +    .setup    = bcm_console_setup,
 +    .write    = bcm_console_print,
 +    .device   = bcm_console_device,
 +    .setup    = bcm_console_setup,
-+    .flags    = CON_PRINTBUFFER, // CON_CONSDEV, CONSOLE_LINE,
++    .flags    = CON_PRINTBUFFER,
 +    .index    = -1,
 +};
 +
 +    .index    = -1,
 +};
 +
@@ -9515,3311 +9534,97 @@ diff -urN linux.old/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c linux
 +}
 +
 +console_initcall(bcm63xx_console_init);
 +}
 +
 +console_initcall(bcm63xx_console_init);
-diff -urN linux.old/bcmdrivers/opensource/char/serial/impl1/Makefile linux.dev/bcmdrivers/opensource/char/serial/impl1/Makefile
---- linux.old/bcmdrivers/opensource/char/serial/impl1/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/bcmdrivers/opensource/char/serial/impl1/Makefile 2006-08-25 00:39:38.000000000 +0200
-@@ -0,0 +1,13 @@
-+# File: bcmdrivers/opensource/char/serial
-+#
-+# Makefile for the BCM63xx serial/console driver
-+
-+obj-$(CONFIG_BCM_SERIAL) += bcm63xx_cons.o
-+
-+EXTRA_CFLAGS += -I$(INC_BRCMDRIVER_PUB_PATH)/$(BRCM_BOARD)
-+
-+-include $(TOPDIR)/Rules.make
-+
-+clean:
-+      rm -f core *.o *.a *.s
-+
-diff -urN linux.old/boardparms/bcm963xx/boardparms.c linux.dev/boardparms/bcm963xx/boardparms.c
---- linux.old/boardparms/bcm963xx/boardparms.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/boardparms/bcm963xx/boardparms.c 2006-08-25 00:39:38.000000000 +0200
-@@ -0,0 +1,2392 @@
+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
+@@ -212,6 +212,14 @@
+ #define MACH_GROUP_NEC_EMMA2RH 25     /* NEC EMMA2RH (was 23)         */
+ #define  MACH_NEC_MARKEINS    0       /* NEC EMMA2RH Mark-eins        */
 +/*
 +/*
-+<:copyright-gpl 
-+
-+ Copyright 2003 Broadcom Corp. All Rights Reserved. 
-+ 
-+ This program is free software; you can distribute it and/or modify it 
-+ under the terms of the GNU General Public License (Version 2) as 
-+ published by the Free Software Foundation. 
-+ 
-+ This program is distributed in the hope it will be useful, but WITHOUT 
-+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
-+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License 
-+ for more details. 
-+ 
-+ You should have received a copy of the GNU General Public License along 
-+ with this program; if not, write to the Free Software Foundation, Inc., 
-+ 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. 
-+
-+:>
-+*/
-+/**************************************************************************
-+ * File Name  : boardparms.c
-+ *
-+ * Description: This file contains the implementation for the BCM63xx board
-+ *              parameter access functions.
-+ * 
-+ * Updates    : 07/14/2003  Created.
-+ ***************************************************************************/
++ * Valid machtype for group BRCM
++ */
++#define MACH_GROUP_BRCM        23      /* Broadcom boards              */
++#define MACH_BCM96338          0
++#define MACH_BCM96345          1
++#define MACH_BCM96348          2
 +
 +
-+/* Includes. */
-+#include <linux/config.h>
-+#include "boardparms.h"
+ #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,13 @@
+ #define PRID_IMP_SR71000        0x0400
++/* These are the PRID's for when 23:16 == PRID_COMP_BROADCOM
++ */
 +
 +
-+/* Defines. */
++#define PRID_IMP_BCM6338              0x9000
++#define PRID_IMP_BCM6345              0x8000
++#define PRID_IMP_BCM6348              0x9100
 +
 +
-+/* Default psi size in K bytes */
-+#define BP_PSI_DEFAULT_SIZE                     24   
+ /*
+  * Definitions for 7:0 on legacy processors
+  */
+@@ -200,7 +207,10 @@
+ #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_LAST              67
+ /*
+  * ISA Level encodings
+diff -urN linux-2.6.19/include/asm-mips/mach-bcm963xx/cpu-feature-overrides.h linux-2.6.19.new/include/asm-mips/mach-bcm963xx/cpu-feature-overrides.h
+--- linux-2.6.19/include/asm-mips/mach-bcm963xx/cpu-feature-overrides.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.new/include/asm-mips/mach-bcm963xx/cpu-feature-overrides.h    2006-12-16 18:52:30.000000000 +0100
+@@ -0,0 +1,36 @@
++#ifndef __ASM_MACH_BCM963XX_CPU_FEATURE_OVERRIDES_H
++#define __ASM_MACH_BCM963XX_CPU_FEATURE_OVERRIDES_H
 +
 +
-+/* Typedefs */
-+typedef struct boardparameters
-+{
-+    char szBoardId[BP_BOARD_ID_LEN];        /* board id string */
-+    ETHERNET_MAC_INFO EnetMacInfos[BP_MAX_ENET_MACS];
-+    VOIP_DSP_INFO VoIPDspInfo[BP_MAX_VOIP_DSP];
-+    unsigned short usSdramSize;             /* SDRAM size and type */
-+    unsigned short usPsiSize;               /* persistent storage in K bytes */
-+    unsigned short usGpioRj11InnerPair;     /* GPIO pin or not defined */
-+    unsigned short usGpioRj11OuterPair;     /* GPIO pin or not defined */
-+    unsigned short usGpioPressAndHoldReset; /* GPIO pin or not defined */
-+    unsigned short usGpioPcmciaReset;       /* GPIO pin or not defined */
-+    unsigned short usGpioUartRts;           /* GPIO pin or not defined */
-+    unsigned short usGpioUartCts;           /* GPIO pin or not defined */
-+    unsigned short usGpioLedAdsl;           /* GPIO pin or not defined */
-+    unsigned short usGpioLedAdslFail;       /* GPIO pin or not defined */
-+    unsigned short usGpioLedWireless;       /* GPIO pin or not defined */
-+    unsigned short usGpioLedUsb;            /* GPIO pin or not defined */
-+    unsigned short usGpioLedHpna;           /* GPIO pin or not defined */
-+    unsigned short usGpioLedWanData;        /* GPIO pin or not defined */
-+    unsigned short usGpioLedPpp;            /* GPIO pin or not defined */
-+    unsigned short usGpioLedPppFail;        /* GPIO pin or not defined */
-+    unsigned short usGpioLedBlPowerOn;      /* GPIO pin or not defined */
-+    unsigned short usGpioLedBlAlarm;        /* GPIO pin or not defined */
-+    unsigned short usGpioLedBlResetCfg;     /* GPIO pin or not defined */
-+    unsigned short usGpioLedBlStop;         /* GPIO pin or not defined */
-+    unsigned short usExtIntrWireless;       /* ext intr or not defined */
-+    unsigned short usExtIntrAdslDyingGasp;  /* ext intr or not defined */
-+    unsigned short usExtIntrHpna;           /* ext intr or not defined */
-+    unsigned short usCsHpna;                /* chip select not defined */
-+    unsigned short usAntInUseWireless;            /* antenna in use or not defined */
-+    unsigned short usGpioSesBtnWireless;    /* GPIO pin or not defined */
-+    unsigned short usExtIntrSesBtnWireless; /* ext intr or not defined */        
-+    unsigned short usGpioLedSesWireless;    /* GPIO pin or not defined */        
-+} BOARD_PARAMETERS, *PBOARD_PARAMETERS;
-+
-+/* Variables */
-+#if defined(_BCM96338_) || defined(CONFIG_BCM96338)
-+static BOARD_PARAMETERS g_bcm96338sv =
-+{
-+    "96338SV",                               /* szBoardId */
-+    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-+      0x01,                                 /* ucPhyAddress */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-+      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-+      0x01,                                 /* numSwitchPorts */
-+      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-+      BP_NOT_DEFINED},                      /* usReverseMii */
-+     {BP_ENET_NO_PHY}},                     /* ucPhyType */
-+    {{BP_VOIP_NO_DSP},                      /* ucDspType */
-+     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-+    BP_MEMORY_16MB_1_CHIP,                  /* usSdramSize */
-+    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-+    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-+    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-+    BP_NOT_DEFINED,                         /* usGpioPressAndHoldReset */
-+    BP_NOT_DEFINED,                         /* usGpioPcmciaReset */
-+    BP_NOT_DEFINED,                         /* usGpioUartRts */
-+    BP_NOT_DEFINED,                         /* usGpioUartCts */
-+    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-+    BP_NOT_DEFINED,                         /* usGpioLedAdslFail */
-+    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-+    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-+    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-+    BP_NOT_DEFINED,                         /* usGpioLedWanData */
-+    BP_NOT_DEFINED,                         /* usGpioLedPpp */
-+    BP_NOT_DEFINED,                         /* usGpioLedPppFail */
-+    BP_NOT_DEFINED,                         /* usGpioLedBlPowerOn */
-+    BP_NOT_DEFINED,                         /* usGpioLedBlAlarm */
-+    BP_NOT_DEFINED,                         /* usGpioLedBlResetCfg */
-+    BP_NOT_DEFINED,                         /* usGpioLedBlStop */
-+    BP_NOT_DEFINED,                         /* usExtIntrWireless */
-+    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-+    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-+    BP_NOT_DEFINED,                         /* usCsHpna */
-+    BP_NOT_DEFINED,                         /* usAntInUseWireless */
-+    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */
-+    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-+    BP_NOT_DEFINED                          /* usGpioLedSesWireless */     
-+};
-+static BOARD_PARAMETERS g_bcm96338l2m8m =
-+{
-+    "96338L-2M-8M",                         /* szBoardId */
-+    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-+      0x01,                                 /* ucPhyAddress */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-+      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-+      0x01,                                 /* numSwitchPorts */
-+      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-+      BP_NOT_DEFINED},                      /* usReverseMii */
-+     {BP_ENET_NO_PHY}},                     /* ucPhyType */
-+    {{BP_VOIP_NO_DSP},                      /* ucDspType */
-+     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-+    BP_MEMORY_8MB_1_CHIP,                   /* usSdramSize */
-+    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-+    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-+    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-+    BP_NOT_DEFINED,                         /* usGpioPressAndHoldReset */
-+    BP_NOT_DEFINED,                         /* usGpioPcmciaReset */
-+    BP_NOT_DEFINED,                         /* usGpioUartRts */
-+    BP_NOT_DEFINED,                         /* usGpioUartCts */
-+    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-+    BP_GPIO_2_AL,                           /* usGpioLedAdslFail */
-+    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-+    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-+    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-+    BP_GPIO_3_AL,                           /* usGpioLedWanData */
-+    BP_GPIO_3_AL,                           /* usGpioLedPpp */
-+    BP_GPIO_4_AL,                           /* usGpioLedPppFail */
-+    BP_GPIO_0_AL,                           /* usGpioLedBlPowerOn */
-+    BP_NOT_DEFINED,                         /* usGpioLedBlAlarm */
-+    BP_GPIO_3_AL,                           /* usGpioLedBlResetCfg */
-+    BP_GPIO_1_AL,                           /* usGpioLedBlStop */
-+    BP_NOT_DEFINED,                         /* usExtIntrWireless */
-+    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-+    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-+    BP_NOT_DEFINED,                         /* usCsHpna */
-+    BP_NOT_DEFINED,                         /* usAntInUseWireless */
-+    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */    
-+    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-+    BP_NOT_DEFINED                          /* usGpioLedSesWireless */         
-+};
-+static PBOARD_PARAMETERS g_BoardParms[] =
-+    {&g_bcm96338sv, &g_bcm96338l2m8m, 0};
-+#endif
-+
-+#if defined(_BCM96345_) || defined(CONFIG_BCM96345)
-+static BOARD_PARAMETERS g_bcm96345r =
-+{
-+    "96345R",                               /* szBoardId */
-+    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-+      0x01,                                 /* ucPhyAddress */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-+      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-+      0x01,                                 /* numSwitchPorts */
-+      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-+      BP_NOT_DEFINED},                      /* usReverseMii */
-+     {BP_ENET_NO_PHY}},                     /* ucPhyType */
-+    {{BP_VOIP_NO_DSP},                      /* ucDspType */
-+     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-+    BP_MEMORY_8MB_1_CHIP,                   /* usSdramSize */
-+    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-+    BP_GPIO_11_AH,                          /* usGpioRj11InnerPair */
-+    BP_GPIO_12_AH,                          /* usGpioRj11OuterPair */
-+    BP_GPIO_13_AH,                          /* usGpioPressAndHoldReset */
-+    BP_NOT_DEFINED,                         /* usGpioPcmciaReset */
-+    BP_NOT_DEFINED,                         /* usGpioUartRts */
-+    BP_NOT_DEFINED,                         /* usGpioUartCts */
-+    BP_GPIO_8_AH,                           /* usGpioLedAdsl */
-+    BP_NOT_DEFINED,                         /* usGpioLedAdslFail */
-+    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-+    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-+    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-+    BP_GPIO_8_AH,                           /* usGpioLedWanData */
-+    BP_GPIO_9_AH,                           /* usGpioLedPpp */
-+    BP_NOT_DEFINED,                         /* usGpioLedPppFail */
-+    BP_NOT_DEFINED,                         /* usGpioLedBlPowerOn */
-+    BP_GPIO_10_AH,                          /* usGpioLedBlAlarm */
-+    BP_GPIO_9_AH,                           /* usGpioLedBlResetCfg */
-+    BP_GPIO_8_AH,                           /* usGpioLedBlStop */
-+    BP_NOT_DEFINED,                         /* usExtIntrWireless */
-+    BP_EXT_INTR_0,                          /* usExtIntrAdslDyingGasp */
-+    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-+    BP_NOT_DEFINED,                         /* usCsHpna */
-+    BP_NOT_DEFINED,                         /* usAntInUseWireless */
-+    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */
-+    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-+    BP_NOT_DEFINED                          /* usGpioLedSesWireless */
-+};
-+
-+static BOARD_PARAMETERS g_bcm96345gw2 =
-+{
-+    /* A hardware jumper determines whether GPIO 13 is used for Press and Hold
-+     * Reset or RTS.
-+     */
-+    "96345GW2",                             /* szBoardId */
-+    {{BP_ENET_EXTERNAL_SWITCH,              /* ucPhyType */
-+      0x00,                                 /* ucPhyAddress */
-+      BP_GPIO_0_AH,                         /* usGpioPhySpiSck */
-+      BP_GPIO_4_AH,                         /* usGpioPhySpiSs */
-+      BP_GPIO_12_AH,                        /* usGpioPhySpiMosi */
-+      BP_GPIO_11_AH,                        /* usGpioPhySpiMiso */
-+      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-+      0x04,                                 /* numSwitchPorts */
-+      BP_ENET_CONFIG_GPIO,                  /* usConfigType */
-+      BP_ENET_REVERSE_MII},                 /* usReverseMii */
-+     {BP_ENET_NO_PHY}},                     /* ucPhyType */
-+    {{BP_VOIP_DSP,                          /* ucDspType */
-+      0x00,                                 /* ucDspAddress */
-+      BP_EXT_INTR_1,                        /* usExtIntrVoip */
-+      BP_GPIO_6_AH,                         /* usGpioVoipReset */
-+      BP_GPIO_15_AH,                        /* usGpioVoipIntr */
-+      BP_NOT_DEFINED,                       /* usGpioLedVoip */
-+      BP_CS_2},                             /* usCsVoip */
-+     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-+    BP_MEMORY_16MB_1_CHIP,                  /* usSdramSize */
-+    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-+    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-+    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-+    BP_GPIO_13_AH,                          /* usGpioPressAndHoldReset */
-+    BP_GPIO_2_AH,                           /* usGpioPcmciaReset */
-+    BP_GPIO_13_AH,                          /* usGpioUartRts */
-+    BP_GPIO_9_AH,                           /* usGpioUartCts */
-+    BP_GPIO_8_AH,                           /* usGpioLedAdsl */
-+    BP_NOT_DEFINED,                         /* usGpioLedAdslFail */
-+    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-+    BP_GPIO_7_AH,                           /* usGpioLedUsb */
-+    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-+    BP_GPIO_8_AH,                           /* usGpioLedWanData */
-+    BP_NOT_DEFINED,                         /* usGpioLedPpp */
-+    BP_NOT_DEFINED,                         /* usGpioLedPppFail */
-+    BP_NOT_DEFINED,                         /* usGpioLedBlPowerOn */
-+    BP_GPIO_10_AH,                          /* usGpioLedBlAlarm */
-+    BP_GPIO_7_AH,                           /* usGpioLedBlResetCfg */
-+    BP_GPIO_8_AH,                           /* usGpioLedBlStop */
-+    BP_EXT_INTR_2,                          /* usExtIntrWireless */
-+    BP_EXT_INTR_0,                          /* usExtIntrAdslDyingGasp */
-+    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-+    BP_NOT_DEFINED,                         /* usCsHpna */
-+    BP_WLAN_ANT_MAIN,                       /* usAntInUseWireless */
-+    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */
-+    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-+    BP_NOT_DEFINED                          /* usGpioLedSesWireless */    
-+};
-+
-+static BOARD_PARAMETERS g_bcm96345gw =
-+{
-+    "96345GW",                              /* szBoardId */
-+    {{BP_ENET_EXTERNAL_SWITCH,              /* ucPhyType */
-+      0x00,                                 /* ucPhyAddress */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-+      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-+      0x04,                                 /* numSwitchPorts */
-+      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-+      BP_ENET_NO_REVERSE_MII},              /* usReverseMii */
-+     {BP_ENET_NO_PHY}},                     /* ucPhyType */
-+    {{BP_VOIP_DSP,                          /* ucDspType */
-+      0x00,                                 /* ucDspAddress */
-+      BP_EXT_INTR_1,                        /* usExtIntrVoip */
-+      BP_GPIO_6_AH,                         /* usGpioVoipReset */
-+      BP_GPIO_15_AH,                        /* usGpioVoipIntr */
-+      BP_NOT_DEFINED,                       /* usGpioLedVoip */
-+      BP_CS_2},                             /* usCsVoip */
-+     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-+    BP_MEMORY_16MB_1_CHIP,                  /* usSdramSize */
-+    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-+    BP_GPIO_11_AH,                          /* usGpioRj11InnerPair */
-+    BP_GPIO_1_AH,                           /* usGpioRj11OuterPair */
-+    BP_GPIO_13_AH,                          /* usGpioPressAndHoldReset */
-+    BP_GPIO_2_AH,                           /* usGpioPcmciaReset */
-+    BP_NOT_DEFINED,                         /* usGpioUartRts */
-+    BP_NOT_DEFINED,                         /* usGpioUartCts */
-+    BP_GPIO_8_AH,                           /* usGpioLedAdsl */
-+    BP_NOT_DEFINED,                         /* usGpioLedAdslFail */
-+    BP_GPIO_10_AH,                          /* usGpioLedWireless */
-+    BP_GPIO_7_AH,                           /* usGpioLedUsb */
-+    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-+    BP_GPIO_8_AH,                           /* usGpioLedWanData */
-+    BP_NOT_DEFINED,                         /* usGpioLedPpp */
-+    BP_NOT_DEFINED,                         /* usGpioLedPppFail */
-+    BP_NOT_DEFINED,                         /* usGpioLedBlPowerOn */
-+    BP_GPIO_9_AH,                           /* usGpioLedBlAlarm */
-+    BP_GPIO_10_AH,                          /* usGpioLedBlResetCfg */
-+    BP_GPIO_8_AH,                           /* usGpioLedBlStop */
-+    BP_EXT_INTR_2,                          /* usExtIntrWireless */
-+    BP_EXT_INTR_0,                          /* usExtIntrAdslDyingGasp */
-+    BP_EXT_INTR_3,                          /* usExtIntrHpna */
-+    BP_CS_1,                                /* usCsHpna */
-+    BP_WLAN_ANT_MAIN,                       /* usAntInUseWireless */
-+    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */
-+    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-+    BP_NOT_DEFINED                          /* usGpioLedSesWireless */
-+};
-+
-+static BOARD_PARAMETERS g_bcm96335r =
-+{
-+    "96335R",                               /* szBoardId */
-+    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-+      0x01,                                 /* ucPhyAddress */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-+      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-+      0x01,                                 /* numSwitchPorts */
-+      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-+      BP_NOT_DEFINED},                      /* usReverseMii */
-+     {BP_ENET_NO_PHY}},                     /* ucPhyType */
-+    {{BP_VOIP_NO_DSP},                      /* ucDspType */
-+     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-+    BP_MEMORY_8MB_1_CHIP,                   /* usSdramSize */
-+    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-+    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-+    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-+    BP_GPIO_14_AH,                          /* usGpioPressAndHoldReset */
-+    BP_NOT_DEFINED,                         /* usGpioPcmciaReset */
-+    BP_NOT_DEFINED,                         /* usGpioUartRts */
-+    BP_NOT_DEFINED,                         /* usGpioUartCts */
-+    BP_GPIO_9_AH,                           /* usGpioLedAdsl */
-+    BP_NOT_DEFINED,                         /* usGpioLedAdslFail */
-+    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-+    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-+    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-+    BP_GPIO_9_AH,                           /* usGpioLedWanData */
-+    BP_GPIO_8_AH,                           /* usGpioLedPpp */
-+    BP_NOT_DEFINED,                         /* usGpioLedPppFail */
-+    BP_NOT_DEFINED,                         /* usGpioLedBlPowerOn */
-+    BP_GPIO_10_AH,                          /* usGpioLedBlAlarm */
-+    BP_GPIO_8_AH,                           /* usGpioLedBlResetCfg */
-+    BP_GPIO_9_AH,                           /* usGpioLedBlStop */
-+    BP_NOT_DEFINED,                         /* usExtIntrWireless */
-+    BP_NOT_DEFINED,                         /* usExtIntrAdslDyingGasp */
-+    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-+    BP_NOT_DEFINED,                         /* usCsHpna */
-+    BP_NOT_DEFINED,                         /* usAntInUseWireless */
-+    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */
-+    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-+    BP_NOT_DEFINED                          /* usGpioLedSesWireless */
-+};
-+
-+static BOARD_PARAMETERS g_bcm96345r0 =
-+{
-+    "96345R0",                              /* szBoardId */
-+    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-+      0x01,                                 /* ucPhyAddress */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-+      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-+      0x01,                                 /* numSwitchPorts */
-+      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-+      BP_NOT_DEFINED},                      /* usReverseMii */
-+     {BP_ENET_NO_PHY}},                     /* ucPhyType */
-+    {{BP_VOIP_NO_DSP},                      /* ucDspType */
-+     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-+    BP_MEMORY_8MB_1_CHIP,                   /* usSdramSize */
-+    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-+    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-+    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-+    BP_NOT_DEFINED,                         /* usGpioPressAndHoldReset */
-+    BP_NOT_DEFINED,                         /* usGpioPcmciaReset */
-+    BP_NOT_DEFINED,                         /* usGpioUartRts */
-+    BP_NOT_DEFINED,                         /* usGpioUartCts */
-+    BP_GPIO_8_AH,                           /* usGpioLedAdsl */
-+    BP_NOT_DEFINED,                         /* usGpioLedAdslFail */
-+    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-+    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-+    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-+    BP_GPIO_9_AH,                           /* usGpioLedWanData */
-+    BP_GPIO_9_AH,                           /* usGpioLedPpp */
-+    BP_NOT_DEFINED,                         /* usGpioLedPppFail */
-+    BP_NOT_DEFINED,                         /* usGpioLedBlPowerOn */
-+    BP_GPIO_9_AH,                           /* usGpioLedBlAlarm */
-+    BP_GPIO_8_AH,                           /* usGpioLedBlResetCfg */
-+    BP_GPIO_8_AH,                           /* usGpioLedBlStop */
-+    BP_NOT_DEFINED,                         /* usExtIntrWireless */
-+    BP_NOT_DEFINED,                         /* usExtIntrAdslDyingGasp */
-+    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-+    BP_NOT_DEFINED,                         /* usCsHpna */
-+    BP_NOT_DEFINED,                         /* usAntInUseWireless */
-+    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */     
-+    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-+    BP_NOT_DEFINED                          /* usGpioLedSesWireless */    
-+};
-+
-+static BOARD_PARAMETERS g_bcm96345rs =
-+{
-+    "96345RS",                              /* szBoardId */
-+    {{BP_ENET_EXTERNAL_SWITCH,              /* ucPhyType */
-+      0x00,                                 /* ucPhyAddress */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-+      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-+      0x01,                                 /* numSwitchPorts */
-+      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-+      BP_ENET_NO_REVERSE_MII},              /* usReverseMii */
-+     {BP_ENET_NO_PHY}},                     /* ucPhyType */
-+    {{BP_VOIP_NO_DSP},                      /* ucDspType */
-+     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-+    BP_MEMORY_8MB_1_CHIP,                   /* usSdramSize */
-+    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-+    BP_GPIO_11_AH,                          /* usGpioRj11InnerPair */
-+    BP_GPIO_12_AH,                          /* usGpioRj11OuterPair */
-+    BP_GPIO_13_AH,                          /* usGpioPressAndHoldReset */
-+    BP_NOT_DEFINED,                         /* usGpioPcmciaReset */
-+    BP_NOT_DEFINED,                         /* usGpioUartRts */
-+    BP_NOT_DEFINED,                         /* usGpioUartCts */
-+    BP_GPIO_8_AH,                           /* usGpioLedAdsl */
-+    BP_NOT_DEFINED,                         /* usGpioLedAdslFail */
-+    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-+    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-+    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-+    BP_GPIO_8_AH,                           /* usGpioLedWanData */
-+    BP_GPIO_9_AH,                           /* usGpioLedPpp */
-+    BP_NOT_DEFINED,                         /* usGpioLedPppFail */
-+    BP_NOT_DEFINED,                         /* usGpioLedBlPowerOn */
-+    BP_GPIO_10_AH,                          /* usGpioLedBlAlarm */
-+    BP_GPIO_9_AH,                           /* usGpioLedBlResetCfg */
-+    BP_GPIO_8_AH,                           /* usGpioLedBlStop */
-+    BP_NOT_DEFINED,                         /* usExtIntrWireless */
-+    BP_EXT_INTR_0,                          /* usExtIntrAdslDyingGasp */
-+    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-+    BP_NOT_DEFINED,                         /* usCsHpna */
-+    BP_NOT_DEFINED,                         /* usAntInUseWireless */
-+    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */
-+    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-+    BP_NOT_DEFINED                          /* usGpioLedSesWireless */
-+};
-+
-+static PBOARD_PARAMETERS g_BoardParms[] =
-+    {&g_bcm96345r, &g_bcm96345gw2, &g_bcm96345gw, &g_bcm96335r, &g_bcm96345r0,
-+     &g_bcm96345rs, 0};
-+#endif
-+
-+#if defined(_BCM96348_) || defined(CONFIG_BCM96348)
-+
-+static BOARD_PARAMETERS g_bcm96348r =
-+{
-+    "96348R",                               /* szBoardId */
-+    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-+      0x01,                                 /* ucPhyAddress */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-+      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-+      0x01,                                 /* numSwitchPorts */
-+      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-+      BP_NOT_DEFINED},                      /* usReverseMii */
-+     {BP_ENET_NO_PHY}},                     /* ucPhyType */
-+    {{BP_VOIP_NO_DSP},                      /* ucDspType */
-+     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-+    BP_MEMORY_8MB_1_CHIP,                   /* usSdramSize */
-+    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-+    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-+    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-+    BP_GPIO_7_AH,                           /* usGpioPressAndHoldReset */
-+    BP_NOT_DEFINED,                         /* usGpioPcmciaReset */
-+    BP_NOT_DEFINED,                         /* usGpioUartRts */
-+    BP_NOT_DEFINED,                         /* usGpioUartCts */
-+    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-+    BP_GPIO_2_AL,                           /* usGpioLedAdslFail */
-+    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-+    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-+    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-+    BP_GPIO_3_AL,                           /* usGpioLedWanData */
-+    BP_GPIO_3_AL,                           /* usGpioLedPpp */
-+    BP_GPIO_4_AL,                           /* usGpioLedPppFail */
-+    BP_GPIO_0_AL,                           /* usGpioLedBlPowerOn */
-+    BP_NOT_DEFINED,                         /* usGpioLedBlAlarm */
-+    BP_GPIO_3_AL,                           /* usGpioLedBlResetCfg */
-+    BP_GPIO_1_AL,                           /* usGpioLedBlStop */
-+    BP_NOT_DEFINED,                         /* usExtIntrWireless */
-+    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-+    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-+    BP_NOT_DEFINED,                         /* usCsHpna */
-+    BP_NOT_DEFINED,                         /* usAntInUseWireless */
-+    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */
-+    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-+    BP_NOT_DEFINED                          /* usGpioLedSesWireless */    
-+};
-+
-+static BOARD_PARAMETERS g_bcm96348lv =
-+{
-+    "96348LV",                               /* szBoardId */
-+    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-+      0x01,                                 /* ucPhyAddress */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-+      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-+      0x01,                                 /* numSwitchPorts */
-+      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-+      BP_NOT_DEFINED},                      /* usReverseMii */
-+     {BP_ENET_EXTERNAL_PHY,                 /* ucPhyType */
-+      0x02,                                 /* ucPhyAddress */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-+      BP_GPIO_5_AL,                         /* usGpioPhyReset */
-+      0x01,                                 /* numSwitchPorts */
-+      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-+      BP_NOT_DEFINED}},                     /* usReverseMii */
-+    {{BP_VOIP_NO_DSP},                      /* ucDspType */
-+     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-+    BP_MEMORY_16MB_2_CHIP,                  /* usSdramSize */
-+    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-+    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-+    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-+    BP_GPIO_7_AH,                           /* usGpioPressAndHoldReset */
-+    BP_NOT_DEFINED,                         /* usGpioPcmciaReset */
-+    BP_NOT_DEFINED,                         /* usGpioUartRts */
-+    BP_NOT_DEFINED,                         /* usGpioUartCts */
-+    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-+    BP_GPIO_2_AL,                           /* usGpioLedAdslFail */
-+    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-+    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-+    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-+    BP_GPIO_3_AL,                           /* usGpioLedWanData */
-+    BP_GPIO_3_AL,                           /* usGpioLedPpp */
-+    BP_GPIO_4_AL,                           /* usGpioLedPppFail */
-+    BP_GPIO_0_AL,                           /* usGpioLedBlPowerOn */
-+    BP_NOT_DEFINED,                         /* usGpioLedBlAlarm */
-+    BP_GPIO_3_AL,                           /* usGpioLedBlResetCfg */
-+    BP_GPIO_1_AL,                           /* usGpioLedBlStop */
-+    BP_NOT_DEFINED,                         /* usExtIntrWireless */
-+    BP_NOT_DEFINED,                         /* usExtIntrAdslDyingGasp */
-+    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-+    BP_NOT_DEFINED,                         /* usCsHpna */
-+    BP_NOT_DEFINED,                         /* usAntInUseWireless */
-+    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */
-+    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-+    BP_NOT_DEFINED                          /* usGpioLedSesWireless */
-+};
-+
-+static BOARD_PARAMETERS g_bcm96348gw =
-+{
-+    "96348GW",                              /* szBoardId */
-+    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-+      0x01,                                 /* ucPhyAddress */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-+      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-+      0x01,                                 /* numSwitchPorts */
-+      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-+      BP_NOT_DEFINED},                      /* usReverseMii */
-+     {BP_ENET_EXTERNAL_SWITCH,              /* ucPhyType */
-+      0x00,                                 /* ucPhyAddress */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-+      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-+      0x03,                                 /* numSwitchPorts */
-+      BP_ENET_CONFIG_SPI_SSB_0,             /* usConfigType */
-+      BP_ENET_REVERSE_MII}},                /* usReverseMii */
-+    {{BP_VOIP_DSP,                          /* ucDspType */
-+      0x00,                                 /* ucDspAddress */
-+      BP_EXT_INTR_2,                        /* usExtIntrVoip */
-+      BP_GPIO_6_AH,                         /* usGpioVoipReset */
-+      BP_GPIO_34_AH,                        /* usGpioVoipIntr */
-+      BP_NOT_DEFINED,                       /* usGpioLedVoip */
-+      BP_CS_2},                             /* usCsVoip */
-+     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-+    BP_MEMORY_16MB_2_CHIP,                  /* usSdramSize */
-+    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-+    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-+    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-+    BP_GPIO_33_AL,                          /* usGpioPressAndHoldReset */
-+    BP_NOT_DEFINED,                         /* usGpioPcmciaReset */
-+    BP_NOT_DEFINED,                         /* usGpioUartRts */
-+    BP_NOT_DEFINED,                         /* usGpioUartCts */
-+    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-+    BP_GPIO_2_AL,                           /* usGpioLedAdslFail */
-+    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-+    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-+    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-+    BP_GPIO_3_AL,                           /* usGpioLedWanData */
-+    BP_GPIO_3_AL,                           /* usGpioLedPpp */
-+    BP_GPIO_4_AL,                           /* usGpioLedPppFail */
-+    BP_GPIO_0_AL,                           /* usGpioLedBlPowerOn */
-+    BP_NOT_DEFINED,                         /* usGpioLedBlAlarm */
-+    BP_GPIO_3_AL,                           /* usGpioLedBlResetCfg */
-+    BP_GPIO_1_AL,                           /* usGpioLedBlStop */
-+    BP_NOT_DEFINED,                         /* usExtIntrWireless */
-+    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-+    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-+    BP_NOT_DEFINED,                         /* usCsHpna */
-+    BP_WLAN_ANT_MAIN,                       /* usAntInUseWireless */
-+    BP_NOT_DEFINED, /* BP_GPIO_35_AH, */    /* usGpioSesBtnWireless */
-+    BP_NOT_DEFINED, /* BP_EXT_INTR_3, */    /* usExtIntrSesBtnWireless */
-+    BP_NOT_DEFINED  /* BP_GPIO_0_AL   */    /* usGpioLedSesWireless */
-+};
-+
-+
-+static BOARD_PARAMETERS g_bcm96348gw_10 =
-+{
-+    "96348GW-10",                           /* szBoardId */
-+    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-+      0x01,                                 /* ucPhyAddress */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-+      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-+      0x01,                                 /* numSwitchPorts */
-+      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-+      BP_NOT_DEFINED},                      /* usReverseMii */
-+     {BP_ENET_EXTERNAL_SWITCH,              /* ucPhyType */
-+      0x00,                                 /* ucPhyAddress */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-+      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-+      0x03,                                 /* numSwitchPorts */
-+      BP_ENET_CONFIG_SPI_SSB_1,             /* usConfigType */
-+      BP_ENET_REVERSE_MII}},                /* usReverseMii */
-+    {{BP_VOIP_DSP,                          /* ucDspType */
-+      0x00,                                 /* ucDspAddress */
-+      BP_EXT_INTR_2,                        /* usExtIntrVoip */
-+      BP_GPIO_6_AH,                         /* usGpioVoipReset */
-+      BP_GPIO_34_AH,                        /* usGpioVoipIntr */
-+      BP_NOT_DEFINED,                       /* usGpioLedVoip */
-+      BP_CS_2},                             /* usCsVoip */
-+     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-+    BP_MEMORY_16MB_2_CHIP,                  /* usSdramSize */
-+    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-+    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-+    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-+    BP_GPIO_33_AL,                          /* usGpioPressAndHoldReset */
-+    BP_NOT_DEFINED,                         /* usGpioPcmciaReset */
-+    BP_NOT_DEFINED,                         /* usGpioUartRts */
-+    BP_NOT_DEFINED,                         /* usGpioUartCts */
-+    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-+    BP_GPIO_2_AL,                           /* usGpioLedAdslFail */
-+    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-+    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-+    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-+    BP_GPIO_3_AL,                           /* usGpioLedWanData */
-+    BP_GPIO_3_AL,                           /* usGpioLedPpp */
-+    BP_GPIO_4_AL,                           /* usGpioLedPppFail */
-+    BP_GPIO_0_AL,                           /* usGpioLedBlPowerOn */
-+    BP_NOT_DEFINED,                         /* usGpioLedBlAlarm */
-+    BP_GPIO_3_AL,                           /* usGpioLedBlResetCfg */
-+    BP_GPIO_1_AL,                           /* usGpioLedBlStop */
-+    BP_NOT_DEFINED,                         /* usExtIntrWireless */
-+    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-+    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-+    BP_NOT_DEFINED,                         /* usCsHpna */
-+    BP_WLAN_ANT_MAIN,                       /* usAntInUseWireless */
-+    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */
-+    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-+    BP_NOT_DEFINED                          /* usGpioLedSesWireless */
-+};
-+
-+static BOARD_PARAMETERS g_bcm96348gw_11 =
-+{
-+    "96348GW-11",                           /* szBoardId */
-+    {{BP_ENET_NO_PHY},                      /* ucPhyType */
-+     {BP_ENET_EXTERNAL_SWITCH,              /* ucPhyType */
-+      0x00,                                 /* ucPhyAddress */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-+      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-+      0x04,                                 /* numSwitchPorts */
-+      BP_ENET_CONFIG_SPI_SSB_1,             /* usConfigType */
-+      BP_ENET_REVERSE_MII}},                /* usReverseMii */
-+    {{BP_VOIP_NO_DSP},                      /* ucDspType */
-+     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-+    BP_MEMORY_16MB_2_CHIP,                  /* usSdramSize */
-+    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-+    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-+    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-+    BP_GPIO_33_AL,                          /* usGpioPressAndHoldReset */
-+    BP_NOT_DEFINED,                         /* usGpioPcmciaReset */
-+    BP_NOT_DEFINED,                         /* usGpioUartRts */
-+    BP_NOT_DEFINED,                         /* usGpioUartCts */
-+    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-+    BP_GPIO_2_AL,                           /* usGpioLedAdslFail */
-+    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-+    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-+    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-+    BP_GPIO_3_AL,                           /* usGpioLedWanData */
-+    BP_GPIO_3_AL,                           /* usGpioLedPpp */
-+    BP_GPIO_4_AL,                           /* usGpioLedPppFail */
-+    BP_GPIO_0_AL,                           /* usGpioLedBlPowerOn */
-+    BP_NOT_DEFINED,                         /* usGpioLedBlAlarm */
-+    BP_GPIO_3_AL,                           /* usGpioLedBlResetCfg */
-+    BP_GPIO_1_AL,                           /* usGpioLedBlStop */
-+    BP_NOT_DEFINED,                         /* usExtIntrWireless */
-+    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-+    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-+    BP_NOT_DEFINED,                         /* usCsHpna */
-+    BP_NOT_DEFINED,                         /* usAntInUseWireless */
-+    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */
-+    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-+    BP_NOT_DEFINED                          /* usGpioLedSesWireless */    
-+};
-+
-+static BOARD_PARAMETERS g_bcm96348sv =
-+{
-+    "96348SV",                              /* szBoardId */
-+    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-+      0x01,                                 /* ucPhyAddress */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-+      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-+      0x01,                                 /* numSwitchPorts */
-+      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-+      BP_NOT_DEFINED},                      /* usReverseMii */
-+     {BP_ENET_EXTERNAL_PHY,                 /* ucPhyType */
-+      0x1f,                                 /* ucPhyAddress */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-+      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-+      0x01,                                 /* numSwitchPorts */
-+      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-+      BP_NOT_DEFINED}},                     /* usReverseMii */
-+    {{BP_VOIP_NO_DSP},                      /* ucDspType */
-+     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-+    BP_MEMORY_32MB_2_CHIP,                  /* usSdramSize */
-+    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-+    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-+    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-+    BP_NOT_DEFINED,                         /* usGpioPressAndHoldReset */
-+    BP_NOT_DEFINED,                         /* usGpioPcmciaReset */
-+    BP_NOT_DEFINED,                         /* usGpioUartRts */
-+    BP_NOT_DEFINED,                         /* usGpioUartCts */
-+    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-+    BP_NOT_DEFINED,                         /* usGpioLedAdslFail */
-+    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-+    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-+    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-+    BP_NOT_DEFINED,                         /* usGpioLedWanData */
-+    BP_NOT_DEFINED,                         /* usGpioLedPpp */
-+    BP_NOT_DEFINED,                         /* usGpioLedPppFail */
-+    BP_NOT_DEFINED,                         /* usGpioLedBlPowerOn */
-+    BP_NOT_DEFINED,                         /* usGpioLedBlAlarm */
-+    BP_NOT_DEFINED,                         /* usGpioLedBlResetCfg */
-+    BP_NOT_DEFINED,                         /* usGpioLedBlStop */
-+    BP_NOT_DEFINED,                         /* usExtIntrWireless */
-+    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-+    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-+    BP_NOT_DEFINED,                         /* usCsHpna */
-+    BP_NOT_DEFINED,                         /* usAntInUseWireless */
-+    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */
-+    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-+    BP_NOT_DEFINED                          /* usGpioLedSesWireless */
-+};
-+
-+
-+static BOARD_PARAMETERS g_bcm96348gw_dualDsp =
-+{
-+    "96348GW-DualDSP",                      /* szBoardId */
-+    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-+      0x01,                                 /* ucPhyAddress */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-+      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-+      0x01,                                 /* numSwitchPorts */
-+      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-+      BP_NOT_DEFINED},                      /* usReverseMii */
-+     {BP_ENET_EXTERNAL_SWITCH,              /* ucPhyType */
-+      0x00,                                 /* ucPhyAddress */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-+      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-+      0x03,                                 /* numSwitchPorts */
-+      BP_ENET_CONFIG_SPI_SSB_1,             /* usConfigType */
-+      BP_ENET_REVERSE_MII}},                /* usReverseMii */
-+    {{BP_VOIP_DSP,                          /* ucDspType */
-+      0x00,                                 /* ucDspAddress */
-+      BP_EXT_INTR_2,                        /* usExtIntrVoip */
-+      BP_UNEQUIPPED,                        /* usGpioVoipReset */
-+      BP_GPIO_34_AH,                        /* usGpioVoipIntr */
-+      BP_NOT_DEFINED,                       /* usGpioLedVoip */
-+      BP_CS_2},                             /* usCsVoip */
-+     {BP_VOIP_DSP,                          /* ucDspType */
-+      0x01,                                 /* ucDspAddress */
-+      BP_EXT_INTR_3,                        /* usExtIntrVoip */
-+      BP_UNEQUIPPED ,                       /* usGpioVoipReset */
-+      BP_GPIO_35_AH,                        /* usGpioVoipIntr */
-+      BP_NOT_DEFINED,                       /* usGpioLedVoip */
-+      BP_CS_3}},                            /* usCsVoip */
-+    BP_MEMORY_16MB_2_CHIP,                  /* usSdramSize */
-+    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-+    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-+    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-+    BP_GPIO_33_AL,                          /* usGpioPressAndHoldReset */
-+    BP_NOT_DEFINED,                         /* usGpioPcmciaReset */
-+    BP_NOT_DEFINED,                         /* usGpioUartRts */
-+    BP_NOT_DEFINED,                         /* usGpioUartCts */
-+    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-+    BP_GPIO_2_AL,                           /* usGpioLedAdslFail */
-+    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-+    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-+    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-+    BP_GPIO_3_AL,                           /* usGpioLedWanData */
-+    BP_GPIO_3_AL,                           /* usGpioLedPpp */
-+    BP_GPIO_4_AL,                           /* usGpioLedPppFail */
-+    BP_GPIO_0_AL,                           /* usGpioLedBlPowerOn */
-+    BP_NOT_DEFINED,                         /* usGpioLedBlAlarm */
-+    BP_GPIO_3_AL,                           /* usGpioLedBlResetCfg */
-+    BP_GPIO_1_AL,                           /* usGpioLedBlStop */
-+    BP_NOT_DEFINED,                         /* usExtIntrWireless */
-+    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-+    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-+    BP_NOT_DEFINED,                         /* usCsHpna */
-+    BP_WLAN_ANT_MAIN,                       /* usAntInUseWireless */
-+    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */
-+    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-+    BP_NOT_DEFINED                          /* usGpioLedSesWireless */
-+};
-+
-+
-+static BOARD_PARAMETERS g_bcmCustom_01 =
-+{
-+     "BCMCUST_01",                          /* szBoardId */
-+    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-+      0x01,                                 /* ucPhyAddress */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-+      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-+      0x01,                                 /* numSwitchPorts */
-+      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-+      BP_NOT_DEFINED},                      /* usReverseMii */
-+     {BP_ENET_NO_PHY,                       /* ucPhyType */
-+      0x00,                                 /* ucPhyAddress */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-+      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-+      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-+      0x01,                                 /* numSwitchPorts */
-+      BP_ENET_CONFIG_SPI_SSB_1,             /* usConfigType */
-+      BP_ENET_REVERSE_MII}},                /* usReverseMii */
-+    {{BP_VOIP_DSP,                          /* ucDspType */
-+      0x00,                                 /* ucDspAddress */
-+      BP_EXT_INTR_2,                        /* usExtIntrVoip */
-+      BP_GPIO_36_AH,                        /* usGpioVoipReset */
-+      BP_GPIO_34_AL,                        /* usGpioVoipIntr */
-+      BP_NOT_DEFINED,                       /* usGpioLedVoip */
-+      BP_CS_2},                             /* usCsVoip */
-+     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-+    BP_MEMORY_16MB_2_CHIP,                  /* usSdramSize */
-+    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-+    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-+    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-+    BP_GPIO_33_AL,                          /* usGpioPressAndHoldReset */
-+    BP_NOT_DEFINED,                         /* usGpioPcmciaReset */
-+    BP_NOT_DEFINED,                         /* usGpioUartRts */
-+    BP_NOT_DEFINED,                         /* usGpioUartCts */
-+    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-+    BP_GPIO_2_AL,                           /* usGpioLedAdslFail */
-+    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-+    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-+    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-+    BP_GPIO_3_AL,                           /* usGpioLedWanData */
-+    BP_GPIO_3_AL,                           /* usGpioLedPpp */
-+    BP_GPIO_4_AL,                           /* usGpioLedPppFail */
-+    BP_GPIO_0_AL,                           /* usGpioLedBlPowerOn */
-+    BP_NOT_DEFINED,                         /* usGpioLedBlAlarm */
-+    BP_GPIO_3_AL,                           /* usGpioLedBlResetCfg */
-+    BP_GPIO_1_AL,                           /* usGpioLedBlStop */
-+    BP_NOT_DEFINED,                         /* usExtIntrWireless */
-+    BP_NOT_DEFINED,                         /* usExtIntrAdslDyingGasp */
-+    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-+    BP_NOT_DEFINED,                         /* usCsHpna */
-+    BP_NOT_DEFINED,                         /* usAntInUseWireless */
-+    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */
-+    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-+    BP_NOT_DEFINED                          /* usGpioLedSesWireless */
-+};
-+
-+static PBOARD_PARAMETERS g_BoardParms[] =
-+    {&g_bcm96348r, &g_bcm96348lv, &g_bcm96348gw, &g_bcm96348gw_10,
-+     &g_bcm96348gw_11, &g_bcm96348sv, &g_bcm96348gw_dualDsp,
-+     &g_bcmCustom_01, 0};
-+#endif
-+
-+static PBOARD_PARAMETERS g_pCurrentBp = 0;
-+
-+/**************************************************************************
-+ * Name       : bpstrcmp
-+ *
-+ * Description: String compare for this file so it does not depend on an OS.
-+ *              (Linux kernel and CFE share this source file.)
-+ *
-+ * Parameters : [IN] dest - destination string
-+ *              [IN] src - source string
-+ *
-+ * Returns    : -1 - dest < src, 1 - dest > src, 0 dest == src
-+ ***************************************************************************/
-+static int bpstrcmp(const char *dest,const char *src);
-+static int bpstrcmp(const char *dest,const char *src)
-+{
-+    while (*src && *dest)
-+    {
-+        if (*dest < *src) return -1;
-+        if (*dest > *src) return 1;
-+        dest++;
-+        src++;
-+    }
-+
-+    if (*dest && !*src) return 1;
-+    if (!*dest && *src) return -1;
-+    return 0;
-+} /* bpstrcmp */
-+
-+/**************************************************************************
-+ * Name       : BpGetVoipDspConfig
-+ *
-+ * Description: Gets the DSP configuration from the board parameter
-+ *              structure for a given DSP index.
-+ *
-+ * Parameters : [IN] dspNum - DSP index (number)
-+ *
-+ * Returns    : Pointer to DSP configuration block if found/valid, NULL
-+ *              otherwise.
-+ ***************************************************************************/
-+VOIP_DSP_INFO *BpGetVoipDspConfig( unsigned char dspNum );
-+VOIP_DSP_INFO *BpGetVoipDspConfig( unsigned char dspNum )
-+{
-+    VOIP_DSP_INFO *pDspConfig = 0;
-+    int i;
-+
-+    if( g_pCurrentBp )
-+    {
-+        for( i = 0 ; i < BP_MAX_VOIP_DSP ; i++ )
-+        {
-+            if( g_pCurrentBp->VoIPDspInfo[i].ucDspType != BP_VOIP_NO_DSP &&
-+                g_pCurrentBp->VoIPDspInfo[i].ucDspAddress == dspNum )
-+            {
-+                pDspConfig = &g_pCurrentBp->VoIPDspInfo[i];
-+                break;
-+            }
-+        }
-+    }
-+
-+    return pDspConfig;
-+}
-+
-+
-+/**************************************************************************
-+ * Name       : BpSetBoardId
-+ *
-+ * Description: This function find the BOARD_PARAMETERS structure for the
-+ *              specified board id string and assigns it to a global, static
-+ *              variable.
-+ *
-+ * Parameters : [IN] pszBoardId - Board id string that is saved into NVRAM.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_FOUND - Error, board id input string does not
-+ *                  have a board parameters configuration record.
-+ ***************************************************************************/
-+int BpSetBoardId( char *pszBoardId )
-+{
-+    int nRet = BP_BOARD_ID_NOT_FOUND;
-+    PBOARD_PARAMETERS *ppBp;
-+
-+    for( ppBp = g_BoardParms; *ppBp; ppBp++ )
-+    {
-+        if( !bpstrcmp((*ppBp)->szBoardId, pszBoardId) )
-+        {
-+            g_pCurrentBp = *ppBp;
-+            nRet = BP_SUCCESS;
-+            break;
-+        }
-+    }
-+
-+    return( nRet );
-+} /* BpSetBoardId */
-+
-+/**************************************************************************
-+ * Name       : BpGetBoardIds
-+ *
-+ * Description: This function returns all of the supported board id strings.
-+ *
-+ * Parameters : [OUT] pszBoardIds - Address of a buffer that the board id
-+ *                  strings are returned in.  Each id starts at BP_BOARD_ID_LEN
-+ *                  boundary.
-+ *              [IN] nBoardIdsSize - Number of BP_BOARD_ID_LEN elements that
-+ *                  were allocated in pszBoardIds.
-+ *
-+ * Returns    : Number of board id strings returned.
-+ ***************************************************************************/
-+int BpGetBoardIds( char *pszBoardIds, int nBoardIdsSize )
-+{
-+    PBOARD_PARAMETERS *ppBp;
-+    int i;
-+    char *src;
-+    char *dest;
-+
-+    for( i = 0, ppBp = g_BoardParms; *ppBp && nBoardIdsSize;
-+        i++, ppBp++, nBoardIdsSize--, pszBoardIds += BP_BOARD_ID_LEN )
-+    {
-+        dest = pszBoardIds;
-+        src = (*ppBp)->szBoardId;
-+        while( *src )
-+            *dest++ = *src++;
-+        *dest = '\0';
-+    }
-+
-+    return( i );
-+} /* BpGetBoardIds */
-+
-+/**************************************************************************
-+ * Name       : BpGetEthernetMacInfo
-+ *
-+ * Description: This function returns all of the supported board id strings.
-+ *
-+ * Parameters : [OUT] pEnetInfos - Address of an array of ETHERNET_MAC_INFO
-+ *                  buffers.
-+ *              [IN] nNumEnetInfos - Number of ETHERNET_MAC_INFO elements that
-+ *                  are pointed to by pEnetInfos.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ ***************************************************************************/
-+int BpGetEthernetMacInfo( PETHERNET_MAC_INFO pEnetInfos, int nNumEnetInfos )
-+{
-+    int i, nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        for( i = 0; i < nNumEnetInfos; i++, pEnetInfos++ )
-+        {
-+            if( i < BP_MAX_ENET_MACS )
-+            {
-+                unsigned char *src = (unsigned char *)
-+                    &g_pCurrentBp->EnetMacInfos[i];
-+                unsigned char *dest = (unsigned char *) pEnetInfos;
-+                int len = sizeof(ETHERNET_MAC_INFO);
-+                while( len-- )
-+                    *dest++ = *src++;
-+            }
-+            else
-+                pEnetInfos->ucPhyType = BP_ENET_NO_PHY;
-+        }
-+
-+        nRet = BP_SUCCESS;
-+    }
-+    else
-+    {
-+        for( i = 0; i < nNumEnetInfos; i++, pEnetInfos++ )
-+            pEnetInfos->ucPhyType = BP_ENET_NO_PHY;
-+
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetEthernetMacInfo */
-+
-+/**************************************************************************
-+ * Name       : BpGetSdramSize
-+ *
-+ * Description: This function returns a constant that describees the board's
-+ *              SDRAM type and size.
-+ *
-+ * Parameters : [OUT] pulSdramSize - Address of short word that the SDRAM size
-+ *                  is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ ***************************************************************************/
-+int BpGetSdramSize( unsigned long *pulSdramSize )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        *pulSdramSize = g_pCurrentBp->usSdramSize;
-+        nRet = BP_SUCCESS;
-+    }
-+    else
-+    {
-+        *pulSdramSize = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetSdramSize */
-+
-+/**************************************************************************
-+ * Name       : BpGetPsiSize
-+ *
-+ * Description: This function returns the persistent storage size in K bytes.
-+ *
-+ * Parameters : [OUT] pulPsiSize - Address of short word that the persistent
-+ *                  storage size is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ ***************************************************************************/
-+int BpGetPsiSize( unsigned long *pulPsiSize )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        *pulPsiSize = g_pCurrentBp->usPsiSize;
-+        nRet = BP_SUCCESS;
-+    }
-+    else
-+    {
-+        *pulPsiSize = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetPsiSize */
-+
-+/**************************************************************************
-+ * Name       : BpGetRj11InnerOuterPairGpios
-+ *
-+ * Description: This function returns the GPIO pin assignments for changing
-+ *              between the RJ11 inner pair and RJ11 outer pair.
-+ *
-+ * Parameters : [OUT] pusInner - Address of short word that the RJ11 inner pair
-+ *                  GPIO pin is returned in.
-+ *              [OUT] pusOuter - Address of short word that the RJ11 outer pair
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, values are returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetRj11InnerOuterPairGpios( unsigned short *pusInner,
-+    unsigned short *pusOuter )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        *pusInner = g_pCurrentBp->usGpioRj11InnerPair;
-+        *pusOuter = g_pCurrentBp->usGpioRj11OuterPair;
-+
-+        if( g_pCurrentBp->usGpioRj11InnerPair != BP_NOT_DEFINED &&
-+            g_pCurrentBp->usGpioRj11OuterPair != BP_NOT_DEFINED )
-+        {
-+            nRet = BP_SUCCESS;
-+        }
-+        else
-+        {
-+            nRet = BP_VALUE_NOT_DEFINED;
-+        }
-+    }
-+    else
-+    {
-+        *pusInner = *pusOuter = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetRj11InnerOuterPairGpios */
-+
-+/**************************************************************************
-+ * Name       : BpGetPressAndHoldResetGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the press
-+ *              and hold reset button.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the press and hold
-+ *                  reset button GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetPressAndHoldResetGpio( unsigned short *pusValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        *pusValue = g_pCurrentBp->usGpioPressAndHoldReset;
-+
-+        if( g_pCurrentBp->usGpioPressAndHoldReset != BP_NOT_DEFINED )
-+        {
-+            nRet = BP_SUCCESS;
-+        }
-+        else
-+        {
-+            nRet = BP_VALUE_NOT_DEFINED;
-+        }
-+    }
-+    else
-+    {
-+        *pusValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetPressAndHoldResetGpio */
-+
-+/**************************************************************************
-+ * Name       : BpGetVoipResetGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the VOIP
-+ *              Reset operation.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the VOIP reset
-+ *                  GPIO pin is returned in.
-+ *              [IN] dspNum - Address of the DSP to query.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetVoipResetGpio( unsigned char dspNum, unsigned short *pusValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        VOIP_DSP_INFO *pDspInfo = BpGetVoipDspConfig( dspNum );
-+
-+        if( pDspInfo )
-+        {
-+           *pusValue = pDspInfo->usGpioVoipReset;
-+
-+           if( *pusValue != BP_NOT_DEFINED ||
-+               *pusValue == BP_UNEQUIPPED )
-+           {
-+              nRet = BP_SUCCESS;
-+           }
-+           else
-+           {
-+              nRet = BP_VALUE_NOT_DEFINED;
-+           }
-+        }
-+        else
-+        {
-+           *pusValue = BP_NOT_DEFINED;
-+           nRet = BP_BOARD_ID_NOT_FOUND;
-+        }
-+    }
-+    else
-+    {
-+        *pusValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetVoipResetGpio */
-+
-+/**************************************************************************
-+ * Name       : BpGetVoipIntrGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for VoIP interrupt.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the VOIP interrupt
-+ *                  GPIO pin is returned in.
-+ *              [IN] dspNum - Address of the DSP to query.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetVoipIntrGpio( unsigned char dspNum, unsigned short *pusValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        VOIP_DSP_INFO *pDspInfo = BpGetVoipDspConfig( dspNum );
-+
-+        if( pDspInfo )
-+        {
-+           *pusValue = pDspInfo->usGpioVoipIntr;
-+
-+           if( *pusValue != BP_NOT_DEFINED )
-+           {
-+              nRet = BP_SUCCESS;
-+           }
-+           else
-+           {
-+              nRet = BP_VALUE_NOT_DEFINED;
-+           }
-+        }
-+        else
-+        {
-+           *pusValue = BP_NOT_DEFINED;
-+           nRet = BP_BOARD_ID_NOT_FOUND;
-+        }
-+    }
-+    else
-+    {
-+        *pusValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetVoipIntrGpio */
-+
-+/**************************************************************************
-+ * Name       : BpGetPcmciaResetGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the PCMCIA
-+ *              Reset operation.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the PCMCIA reset
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetPcmciaResetGpio( unsigned short *pusValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        *pusValue = g_pCurrentBp->usGpioPcmciaReset;
-+
-+        if( g_pCurrentBp->usGpioPcmciaReset != BP_NOT_DEFINED )
-+        {
-+            nRet = BP_SUCCESS;
-+        }
-+        else
-+        {
-+            nRet = BP_VALUE_NOT_DEFINED;
-+        }
-+    }
-+    else
-+    {
-+        *pusValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetPcmciaResetGpio */
-+
-+/**************************************************************************
-+ * Name       : BpGetUartRtsCtsGpios
-+ *
-+ * Description: This function returns the GPIO pin assignments for RTS and CTS
-+ *              UART signals.
-+ *
-+ * Parameters : [OUT] pusRts - Address of short word that the UART RTS GPIO
-+ *                  pin is returned in.
-+ *              [OUT] pusCts - Address of short word that the UART CTS GPIO
-+ *                  pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, values are returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, board id input string does not
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetRtsCtsUartGpios( unsigned short *pusRts, unsigned short *pusCts )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        *pusRts = g_pCurrentBp->usGpioUartRts;
-+        *pusCts = g_pCurrentBp->usGpioUartCts;
-+
-+        if( g_pCurrentBp->usGpioUartRts != BP_NOT_DEFINED &&
-+            g_pCurrentBp->usGpioUartCts != BP_NOT_DEFINED )
-+        {
-+            nRet = BP_SUCCESS;
-+        }
-+        else
-+        {
-+            nRet = BP_VALUE_NOT_DEFINED;
-+        }
-+    }
-+    else
-+    {
-+        *pusRts = *pusCts = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetUartRtsCtsGpios */
-+
-+/**************************************************************************
-+ * Name       : BpGetAdslLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the ADSL
-+ *              LED.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the ADSL LED
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetAdslLedGpio( unsigned short *pusValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        *pusValue = g_pCurrentBp->usGpioLedAdsl;
-+
-+        if( g_pCurrentBp->usGpioLedAdsl != BP_NOT_DEFINED )
-+        {
-+            nRet = BP_SUCCESS;
-+        }
-+        else
-+        {
-+            nRet = BP_VALUE_NOT_DEFINED;
-+        }
-+    }
-+    else
-+    {
-+        *pusValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetAdslLedGpio */
-+
-+/**************************************************************************
-+ * Name       : BpGetAdslFailLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the ADSL
-+ *              LED that is used when there is a DSL connection failure.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the ADSL LED
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetAdslFailLedGpio( unsigned short *pusValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        *pusValue = g_pCurrentBp->usGpioLedAdslFail;
-+
-+        if( g_pCurrentBp->usGpioLedAdslFail != BP_NOT_DEFINED )
-+        {
-+            nRet = BP_SUCCESS;
-+        }
-+        else
-+        {
-+            nRet = BP_VALUE_NOT_DEFINED;
-+        }
-+    }
-+    else
-+    {
-+        *pusValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetAdslFailLedGpio */
-+
-+/**************************************************************************
-+ * Name       : BpGetWirelessLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the Wireless
-+ *              LED.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the Wireless LED
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetWirelessLedGpio( unsigned short *pusValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        *pusValue = g_pCurrentBp->usGpioLedWireless;
-+
-+        if( g_pCurrentBp->usGpioLedWireless != BP_NOT_DEFINED )
-+        {
-+            nRet = BP_SUCCESS;
-+        }
-+        else
-+        {
-+            nRet = BP_VALUE_NOT_DEFINED;
-+        }
-+    }
-+    else
-+    {
-+        *pusValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetWirelessLedGpio */
-+
-+/**************************************************************************
-+ * Name       : BpGetWirelessAntInUse
-+ *
-+ * Description: This function returns the antennas in use for wireless
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the Wireless Antenna
-+ *                  is in use.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetWirelessAntInUse( unsigned short *pusValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        *pusValue = g_pCurrentBp->usAntInUseWireless;
-+
-+        if( g_pCurrentBp->usAntInUseWireless != BP_NOT_DEFINED )
-+        {
-+            nRet = BP_SUCCESS;
-+        }
-+        else
-+        {
-+            nRet = BP_VALUE_NOT_DEFINED;
-+        }
-+    }
-+    else
-+    {
-+        *pusValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );   
-+} /* BpGetWirelessAntInUse */
-+
-+/**************************************************************************
-+ * Name       : BpGetWirelessSesBtnGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the Wireless
-+ *              Ses Button.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the Wireless LED
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetWirelessSesBtnGpio( unsigned short *pusValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        *pusValue = g_pCurrentBp->usGpioSesBtnWireless;
-+
-+        if( g_pCurrentBp->usGpioSesBtnWireless != BP_NOT_DEFINED )
-+        {
-+            nRet = BP_SUCCESS;
-+        }
-+        else
-+        {
-+            nRet = BP_VALUE_NOT_DEFINED;
-+        }
-+    }
-+    else
-+    {
-+        *pusValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );   
-+} /* BpGetWirelessSesBtnGpio */
-+
-+/**************************************************************************
-+ * Name       : BpGetWirelessSesExtIntr
-+ *
-+ * Description: This function returns the external interrupt number for the 
-+ *              Wireless Ses Button.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the Wireless Ses
-+ *                  external interrup is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetWirelessSesExtIntr( unsigned short *pusValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        *pusValue = g_pCurrentBp->usExtIntrSesBtnWireless;
-+
-+        if( g_pCurrentBp->usExtIntrSesBtnWireless != BP_NOT_DEFINED )
-+        {
-+            nRet = BP_SUCCESS;
-+        }
-+        else
-+        {
-+            nRet = BP_VALUE_NOT_DEFINED;
-+        }
-+    }
-+    else
-+    {
-+        *pusValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );   
-+              
-+} /* BpGetWirelessSesExtIntr */
-+
-+/**************************************************************************
-+ * Name       : BpGetWirelessSesLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the Wireless
-+ *              Ses Led.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the Wireless Ses
-+ *                  Led GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetWirelessSesLedGpio( unsigned short *pusValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        *pusValue = g_pCurrentBp->usGpioLedSesWireless;
-+
-+        if( g_pCurrentBp->usGpioLedSesWireless != BP_NOT_DEFINED )
-+        {
-+            nRet = BP_SUCCESS;
-+        }
-+        else
-+        {
-+            nRet = BP_VALUE_NOT_DEFINED;
-+        }
-+    }
-+    else
-+    {
-+        *pusValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+      
-+} /* BpGetWirelessSesLedGpio */
-+
-+/**************************************************************************
-+ * Name       : BpGetUsbLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the USB
-+ *              LED.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the USB LED
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetUsbLedGpio( unsigned short *pusValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        *pusValue = g_pCurrentBp->usGpioLedUsb;
-+
-+        if( g_pCurrentBp->usGpioLedUsb != BP_NOT_DEFINED )
-+        {
-+            nRet = BP_SUCCESS;
-+        }
-+        else
-+        {
-+            nRet = BP_VALUE_NOT_DEFINED;
-+        }
-+    }
-+    else
-+    {
-+        *pusValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetUsbLedGpio */
-+
-+/**************************************************************************
-+ * Name       : BpGetHpnaLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the HPNA
-+ *              LED.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the HPNA LED
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetHpnaLedGpio( unsigned short *pusValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        *pusValue = g_pCurrentBp->usGpioLedHpna;
-+
-+        if( g_pCurrentBp->usGpioLedHpna != BP_NOT_DEFINED )
-+        {
-+            nRet = BP_SUCCESS;
-+        }
-+        else
-+        {
-+            nRet = BP_VALUE_NOT_DEFINED;
-+        }
-+    }
-+    else
-+    {
-+        *pusValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetHpnaLedGpio */
-+
-+/**************************************************************************
-+ * Name       : BpGetWanDataLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the WAN Data
-+ *              LED.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the WAN Data LED
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetWanDataLedGpio( unsigned short *pusValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        *pusValue = g_pCurrentBp->usGpioLedWanData;
-+
-+        if( g_pCurrentBp->usGpioLedWanData != BP_NOT_DEFINED )
-+        {
-+            nRet = BP_SUCCESS;
-+        }
-+        else
-+        {
-+            nRet = BP_VALUE_NOT_DEFINED;
-+        }
-+    }
-+    else
-+    {
-+        *pusValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetWanDataLedGpio */
-+
-+/**************************************************************************
-+ * Name       : BpGetPppLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the PPP
-+ *              LED.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the PPP LED
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetPppLedGpio( unsigned short *pusValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        *pusValue = g_pCurrentBp->usGpioLedPpp;
-+
-+        if( g_pCurrentBp->usGpioLedPpp != BP_NOT_DEFINED )
-+        {
-+            nRet = BP_SUCCESS;
-+        }
-+        else
-+        {
-+            nRet = BP_VALUE_NOT_DEFINED;
-+        }
-+    }
-+    else
-+    {
-+        *pusValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetPppLedGpio */
-+
-+/**************************************************************************
-+ * Name       : BpGetPppFailLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the PPP
-+ *              LED that is used when there is a PPP connection failure.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the PPP LED
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetPppFailLedGpio( unsigned short *pusValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        *pusValue = g_pCurrentBp->usGpioLedPppFail;
-+
-+        if( g_pCurrentBp->usGpioLedPppFail != BP_NOT_DEFINED )
-+        {
-+            nRet = BP_SUCCESS;
-+        }
-+        else
-+        {
-+            nRet = BP_VALUE_NOT_DEFINED;
-+        }
-+    }
-+    else
-+    {
-+        *pusValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetPppFailLedGpio */
-+
-+/**************************************************************************
-+ * Name       : BpGetBootloaderPowerOnLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the power
-+ *              on LED that is set by the bootloader.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the alarm LED
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetBootloaderPowerOnLedGpio( unsigned short *pusValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        *pusValue = g_pCurrentBp->usGpioLedBlPowerOn;
-+
-+        if( g_pCurrentBp->usGpioLedBlPowerOn != BP_NOT_DEFINED )
-+        {
-+            nRet = BP_SUCCESS;
-+        }
-+        else
-+        {
-+            nRet = BP_VALUE_NOT_DEFINED;
-+        }
-+    }
-+    else
-+    {
-+        *pusValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetBootloaderPowerOn */
-+
-+/**************************************************************************
-+ * Name       : BpGetBootloaderAlarmLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the alarm
-+ *              LED that is set by the bootloader.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the alarm LED
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetBootloaderAlarmLedGpio( unsigned short *pusValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        *pusValue = g_pCurrentBp->usGpioLedBlAlarm;
-+
-+        if( g_pCurrentBp->usGpioLedBlAlarm != BP_NOT_DEFINED )
-+        {
-+            nRet = BP_SUCCESS;
-+        }
-+        else
-+        {
-+            nRet = BP_VALUE_NOT_DEFINED;
-+        }
-+    }
-+    else
-+    {
-+        *pusValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetBootloaderAlarmLedGpio */
-+
-+/**************************************************************************
-+ * Name       : BpGetBootloaderResetCfgLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the reset
-+ *              configuration LED that is set by the bootloader.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the reset
-+ *                  configuration LED GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetBootloaderResetCfgLedGpio( unsigned short *pusValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        *pusValue = g_pCurrentBp->usGpioLedBlResetCfg;
-+
-+        if( g_pCurrentBp->usGpioLedBlResetCfg != BP_NOT_DEFINED )
-+        {
-+            nRet = BP_SUCCESS;
-+        }
-+        else
-+        {
-+            nRet = BP_VALUE_NOT_DEFINED;
-+        }
-+    }
-+    else
-+    {
-+        *pusValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetBootloaderResetCfgLedGpio */
-+
-+/**************************************************************************
-+ * Name       : BpGetBootloaderStopLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the break
-+ *              into bootloader LED that is set by the bootloader.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the break into
-+ *                  bootloader LED GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetBootloaderStopLedGpio( unsigned short *pusValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        *pusValue = g_pCurrentBp->usGpioLedBlStop;
-+
-+        if( g_pCurrentBp->usGpioLedBlStop != BP_NOT_DEFINED )
-+        {
-+            nRet = BP_SUCCESS;
-+        }
-+        else
-+        {
-+            nRet = BP_VALUE_NOT_DEFINED;
-+        }
-+    }
-+    else
-+    {
-+        *pusValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetBootloaderStopLedGpio */
-+
-+/**************************************************************************
-+ * Name       : BpGetVoipLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the VOIP
-+ *              LED.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the VOIP LED
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ *
-+ * Note       : The VoIP structure would allow for having one LED per DSP
-+ *              however, the board initialization function assumes only one
-+ *              LED per functionality (ie one LED for VoIP).  Therefore in
-+ *              order to keep this tidy and simple we do not make usage of the
-+ *              one-LED-per-DSP function.  Instead, we assume that the LED for
-+ *              VoIP is unique and associated with DSP 0 (always present on
-+ *              any VoIP platform).  If changing this to a LED-per-DSP function
-+ *              then one need to update the board initialization driver in
-+ *              bcmdrivers\opensource\char\board\bcm963xx\impl1
-+ ***************************************************************************/
-+int BpGetVoipLedGpio( unsigned short *pusValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        VOIP_DSP_INFO *pDspInfo = BpGetVoipDspConfig( 0 );
-+
-+        if( pDspInfo )
-+        {
-+           *pusValue = pDspInfo->usGpioLedVoip;
-+
-+           if( *pusValue != BP_NOT_DEFINED )
-+           {
-+              nRet = BP_SUCCESS;
-+           }
-+           else
-+           {
-+              nRet = BP_VALUE_NOT_DEFINED;
-+           }
-+        }
-+        else
-+        {
-+           *pusValue = BP_NOT_DEFINED;
-+           nRet = BP_BOARD_ID_NOT_FOUND;
-+        }
-+    }
-+    else
-+    {
-+        *pusValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetVoipLedGpio */
-+
-+/**************************************************************************
-+ * Name       : BpGetWirelessExtIntr
-+ *
-+ * Description: This function returns the Wireless external interrupt number.
-+ *
-+ * Parameters : [OUT] pulValue - Address of short word that the wireless
-+ *                  external interrupt number is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetWirelessExtIntr( unsigned long *pulValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        *pulValue = g_pCurrentBp->usExtIntrWireless;
-+
-+        if( g_pCurrentBp->usExtIntrWireless != BP_NOT_DEFINED )
-+        {
-+            nRet = BP_SUCCESS;
-+        }
-+        else
-+        {
-+            nRet = BP_VALUE_NOT_DEFINED;
-+        }
-+    }
-+    else
-+    {
-+        *pulValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetWirelessExtIntr */
-+
-+/**************************************************************************
-+ * Name       : BpGetAdslDyingGaspExtIntr
-+ *
-+ * Description: This function returns the ADSL Dying Gasp external interrupt
-+ *              number.
-+ *
-+ * Parameters : [OUT] pulValue - Address of short word that the ADSL Dying Gasp
-+ *                  external interrupt number is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetAdslDyingGaspExtIntr( unsigned long *pulValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        *pulValue = g_pCurrentBp->usExtIntrAdslDyingGasp;
-+
-+        if( g_pCurrentBp->usExtIntrAdslDyingGasp != BP_NOT_DEFINED )
-+        {
-+            nRet = BP_SUCCESS;
-+        }
-+        else
-+        {
-+            nRet = BP_VALUE_NOT_DEFINED;
-+        }
-+    }
-+    else
-+    {
-+        *pulValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetAdslDyingGaspExtIntr */
-+
-+/**************************************************************************
-+ * Name       : BpGetVoipExtIntr
-+ *
-+ * Description: This function returns the VOIP external interrupt number.
-+ *
-+ * Parameters : [OUT] pulValue - Address of short word that the VOIP
-+ *                  external interrupt number is returned in.
-+ *              [IN] dspNum - Address of the DSP to query.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetVoipExtIntr( unsigned char dspNum, unsigned long *pulValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        VOIP_DSP_INFO *pDspInfo = BpGetVoipDspConfig( dspNum );
-+
-+        if( pDspInfo )
-+        {
-+           *pulValue = pDspInfo->usExtIntrVoip;
-+
-+           if( *pulValue != BP_NOT_DEFINED )
-+           {
-+              nRet = BP_SUCCESS;
-+           }
-+           else
-+           {
-+              nRet = BP_VALUE_NOT_DEFINED;
-+           }
-+        }
-+        else
-+        {
-+           *pulValue = BP_NOT_DEFINED;
-+           nRet = BP_BOARD_ID_NOT_FOUND;
-+        }
-+    }
-+    else
-+    {
-+        *pulValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetVoipExtIntr */
-+
-+/**************************************************************************
-+ * Name       : BpGetHpnaExtIntr
-+ *
-+ * Description: This function returns the HPNA external interrupt number.
-+ *
-+ * Parameters : [OUT] pulValue - Address of short word that the HPNA
-+ *                  external interrupt number is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetHpnaExtIntr( unsigned long *pulValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        *pulValue = g_pCurrentBp->usExtIntrHpna;
-+
-+        if( g_pCurrentBp->usExtIntrHpna != BP_NOT_DEFINED )
-+        {
-+            nRet = BP_SUCCESS;
-+        }
-+        else
-+        {
-+            nRet = BP_VALUE_NOT_DEFINED;
-+        }
-+    }
-+    else
-+    {
-+        *pulValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetHpnaExtIntr */
-+
-+/**************************************************************************
-+ * Name       : BpGetHpnaChipSelect
-+ *
-+ * Description: This function returns the HPNA chip select number.
-+ *
-+ * Parameters : [OUT] pulValue - Address of short word that the HPNA
-+ *                  chip select number is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetHpnaChipSelect( unsigned long *pulValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        *pulValue = g_pCurrentBp->usCsHpna;
-+
-+        if( g_pCurrentBp->usCsHpna != BP_NOT_DEFINED )
-+        {
-+            nRet = BP_SUCCESS;
-+        }
-+        else
-+        {
-+            nRet = BP_VALUE_NOT_DEFINED;
-+        }
-+    }
-+    else
-+    {
-+        *pulValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetHpnaChipSelect */
-+
-+/**************************************************************************
-+ * Name       : BpGetVoipChipSelect
-+ *
-+ * Description: This function returns the VOIP chip select number.
-+ *
-+ * Parameters : [OUT] pulValue - Address of short word that the VOIP
-+ *                  chip select number is returned in.
-+ *              [IN] dspNum - Address of the DSP to query.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetVoipChipSelect( unsigned char dspNum, unsigned long *pulValue )
-+{
-+    int nRet;
-+
-+    if( g_pCurrentBp )
-+    {
-+        VOIP_DSP_INFO *pDspInfo = BpGetVoipDspConfig( dspNum );
-+
-+        if( pDspInfo )
-+        {
-+           *pulValue = pDspInfo->usCsVoip;
-+
-+           if( *pulValue != BP_NOT_DEFINED )
-+           {
-+              nRet = BP_SUCCESS;
-+           }
-+           else
-+           {
-+              nRet = BP_VALUE_NOT_DEFINED;
-+           }
-+        }
-+        else
-+        {
-+           *pulValue = BP_NOT_DEFINED;
-+           nRet = BP_BOARD_ID_NOT_FOUND;
-+        }
-+    }
-+    else
-+    {
-+        *pulValue = BP_NOT_DEFINED;
-+        nRet = BP_BOARD_ID_NOT_SET;
-+    }
-+
-+    return( nRet );
-+} /* BpGetVoipChipSelect */
-+
-diff -urN linux.old/boardparms/bcm963xx/boardparms.h linux.dev/boardparms/bcm963xx/boardparms.h
---- linux.old/boardparms/bcm963xx/boardparms.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/boardparms/bcm963xx/boardparms.h 2006-08-25 00:39:38.000000000 +0200
-@@ -0,0 +1,766 @@
-+/*
-+<:copyright-gpl 
-+
-+ Copyright 2003 Broadcom Corp. All Rights Reserved. 
-+ 
-+ This program is free software; you can distribute it and/or modify it 
-+ under the terms of the GNU General Public License (Version 2) as 
-+ published by the Free Software Foundation. 
-+ 
-+ This program is distributed in the hope it will be useful, but WITHOUT 
-+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
-+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License 
-+ for more details. 
-+ 
-+ You should have received a copy of the GNU General Public License along 
-+ with this program; if not, write to the Free Software Foundation, Inc., 
-+ 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. 
-+
-+:>
-+*/
-+/**************************************************************************
-+ * File Name  : boardparms.h
-+ *
-+ * Description: This file contains definitions and function prototypes for
-+ *              the BCM63xx board parameter access functions.
-+ * 
-+ * Updates    : 07/14/2003  Created.
-+ ***************************************************************************/
-+
-+#if !defined(_BOARDPARMS_H)
-+#define _BOARDPARMS_H
-+
-+#if __cplusplus
-+extern "C" {
-+#endif
-+
-+/* Return codes. */
-+#define BP_SUCCESS                              0
-+#define BP_BOARD_ID_NOT_FOUND                   1
-+#define BP_VALUE_NOT_DEFINED                    2
-+#define BP_BOARD_ID_NOT_SET                     3
-+
-+/* Values for BpGetSdramSize. */
-+#define BP_MEMORY_8MB_1_CHIP                    0
-+#define BP_MEMORY_16MB_1_CHIP                   1
-+#define BP_MEMORY_32MB_1_CHIP                   2
-+#define BP_MEMORY_64MB_2_CHIP                   3
-+#define BP_MEMORY_32MB_2_CHIP                   4
-+#define BP_MEMORY_16MB_2_CHIP                   5
-+
-+/* Values for EthernetMacInfo PhyType. */
-+#define BP_ENET_NO_PHY                          0
-+#define BP_ENET_INTERNAL_PHY                    1
-+#define BP_ENET_EXTERNAL_PHY                    2
-+#define BP_ENET_EXTERNAL_SWITCH                 3
-+
-+/* Values for EthernetMacInfo Configuration type. */
-+#define BP_ENET_CONFIG_MDIO                     0       /* Internal PHY, External PHY, Switch+(no GPIO, no SPI, no MDIO Pseudo phy */
-+#define BP_ENET_CONFIG_GPIO                     1       /* Bcm96345GW board + Bcm5325M/E */
-+#define BP_ENET_CONFIG_MDIO_PSEUDO_PHY          2       /* Bcm96348GW board + Bcm5325E */
-+#define BP_ENET_CONFIG_SPI_SSB_0                3       /* Bcm96348GW board + Bcm5325M/E */
-+#define BP_ENET_CONFIG_SPI_SSB_1                4       /* Bcm96348GW board + Bcm5325M/E */
-+#define BP_ENET_CONFIG_SPI_SSB_2                5       /* Bcm96348GW board + Bcm5325M/E */
-+#define BP_ENET_CONFIG_SPI_SSB_3                6       /* Bcm96348GW board + Bcm5325M/E */
-+
-+/* Values for EthernetMacInfo Reverse MII. */
-+#define BP_ENET_NO_REVERSE_MII                  0
-+#define BP_ENET_REVERSE_MII                     1
-+
-+/* Values for VoIPDSPInfo DSPType. */
-+#define BP_VOIP_NO_DSP                          0
-+#define BP_VOIP_DSP                             1
-+
-+
-+/* Values for GPIO pin assignments (AH = Active High, AL = Active Low). */
-+#define BP_ACTIVE_MASK                          0x8000
-+#define BP_ACTIVE_HIGH                          0x0000
-+#define BP_ACTIVE_LOW                           0x8000
-+#define BP_GPIO_0_AH                            (0  | BP_ACTIVE_HIGH)
-+#define BP_GPIO_0_AL                            (0  | BP_ACTIVE_LOW)
-+#define BP_GPIO_1_AH                            (1  | BP_ACTIVE_HIGH)
-+#define BP_GPIO_1_AL                            (1  | BP_ACTIVE_LOW)
-+#define BP_GPIO_2_AH                            (2  | BP_ACTIVE_HIGH)
-+#define BP_GPIO_2_AL                            (2  | BP_ACTIVE_LOW)
-+#define BP_GPIO_3_AH                            (3  | BP_ACTIVE_HIGH)
-+#define BP_GPIO_3_AL                            (3  | BP_ACTIVE_LOW)
-+#define BP_GPIO_4_AH                            (4  | BP_ACTIVE_HIGH)
-+#define BP_GPIO_4_AL                            (4  | BP_ACTIVE_LOW)
-+#define BP_GPIO_5_AH                            (5  | BP_ACTIVE_HIGH)
-+#define BP_GPIO_5_AL                            (5  | BP_ACTIVE_LOW)
-+#define BP_GPIO_6_AH                            (6  | BP_ACTIVE_HIGH)
-+#define BP_GPIO_6_AL                            (6  | BP_ACTIVE_LOW)
-+#define BP_GPIO_7_AH                            (7  | BP_ACTIVE_HIGH)
-+#define BP_GPIO_7_AL                            (7  | BP_ACTIVE_LOW)
-+#define BP_GPIO_8_AH                            (8  | BP_ACTIVE_HIGH)
-+#define BP_GPIO_8_AL                            (8  | BP_ACTIVE_LOW)
-+#define BP_GPIO_9_AH                            (9  | BP_ACTIVE_HIGH)
-+#define BP_GPIO_9_AL                            (9  | BP_ACTIVE_LOW)
-+#define BP_GPIO_10_AH                           (10 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_10_AL                           (10 | BP_ACTIVE_LOW)
-+#define BP_GPIO_11_AH                           (11 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_11_AL                           (11 | BP_ACTIVE_LOW)
-+#define BP_GPIO_12_AH                           (12 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_12_AL                           (12 | BP_ACTIVE_LOW)
-+#define BP_GPIO_13_AH                           (13 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_13_AL                           (13 | BP_ACTIVE_LOW)
-+#define BP_GPIO_14_AH                           (14 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_14_AL                           (14 | BP_ACTIVE_LOW)
-+#define BP_GPIO_15_AH                           (15 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_15_AL                           (15 | BP_ACTIVE_LOW)
-+#define BP_GPIO_16_AH                           (16 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_16_AL                           (16 | BP_ACTIVE_LOW)
-+#define BP_GPIO_17_AH                           (17 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_17_AL                           (17 | BP_ACTIVE_LOW)
-+#define BP_GPIO_18_AH                           (18 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_18_AL                           (18 | BP_ACTIVE_LOW)
-+#define BP_GPIO_19_AH                           (19 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_19_AL                           (19 | BP_ACTIVE_LOW)
-+#define BP_GPIO_20_AH                           (20 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_20_AL                           (20 | BP_ACTIVE_LOW)
-+#define BP_GPIO_21_AH                           (21 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_21_AL                           (21 | BP_ACTIVE_LOW)
-+#define BP_GPIO_22_AH                           (22 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_22_AL                           (22 | BP_ACTIVE_LOW)
-+#define BP_GPIO_23_AH                           (23 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_23_AL                           (23 | BP_ACTIVE_LOW)
-+#define BP_GPIO_24_AH                           (24 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_24_AL                           (24 | BP_ACTIVE_LOW)
-+#define BP_GPIO_25_AH                           (25 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_25_AL                           (25 | BP_ACTIVE_LOW)
-+#define BP_GPIO_26_AH                           (26 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_26_AL                           (26 | BP_ACTIVE_LOW)
-+#define BP_GPIO_27_AH                           (27 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_27_AL                           (27 | BP_ACTIVE_LOW)
-+#define BP_GPIO_28_AH                           (28 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_28_AL                           (28 | BP_ACTIVE_LOW)
-+#define BP_GPIO_29_AH                           (29 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_29_AL                           (29 | BP_ACTIVE_LOW)
-+#define BP_GPIO_30_AH                           (30 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_30_AL                           (30 | BP_ACTIVE_LOW)
-+#define BP_GPIO_31_AH                           (31 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_31_AL                           (31 | BP_ACTIVE_LOW)
-+#define BP_GPIO_32_AH                           (32 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_32_AL                           (32 | BP_ACTIVE_LOW)
-+#define BP_GPIO_33_AH                           (33 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_33_AL                           (33 | BP_ACTIVE_LOW)
-+#define BP_GPIO_34_AH                           (34 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_34_AL                           (34 | BP_ACTIVE_LOW)
-+#define BP_GPIO_35_AH                           (35 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_35_AL                           (35 | BP_ACTIVE_LOW)
-+#define BP_GPIO_36_AH                           (36 | BP_ACTIVE_HIGH)
-+#define BP_GPIO_36_AL                           (36 | BP_ACTIVE_LOW)
-+
-+/* Values for external interrupt assignments. */
-+#define BP_EXT_INTR_0                           0
-+#define BP_EXT_INTR_1                           1
-+#define BP_EXT_INTR_2                           2
-+#define BP_EXT_INTR_3                           3
-+
-+/* Values for chip select assignments. */
-+#define BP_CS_0                                 0
-+#define BP_CS_1                                 1
-+#define BP_CS_2                                 2
-+#define BP_CS_3                                 3
-+
-+/* Value for GPIO and external interrupt fields that are not used. */
-+#define BP_NOT_DEFINED                          0xffff
-+#define BP_HW_DEFINED                           0xfff0
-+#define BP_UNEQUIPPED                           0xfff1
-+
-+/* Maximum size of the board id string. */
-+#define BP_BOARD_ID_LEN                         16
-+
-+/* Maximum number of Ethernet MACs. */
-+#define BP_MAX_ENET_MACS                        2
-+
-+/* Maximum number of VoIP DSPs. */
-+#define BP_MAX_VOIP_DSP                         2
-+
-+/* Wireless Antenna Settings. */
-+#define BP_WLAN_ANT_MAIN                        0
-+#define BP_WLAN_ANT_AUX                         1
-+#define BP_WLAN_ANT_BOTH                        3
-+
-+#if !defined(__ASSEMBLER__)
-+
-+/* Information about an Ethernet MAC.  If ucPhyType is BP_ENET_NO_PHY,
-+ * then the other fields are not valid.
-+ */
-+typedef struct EthernetMacInfo
-+{
-+    unsigned char ucPhyType;                    /* BP_ENET_xxx             */
-+    unsigned char ucPhyAddress;                 /* 0 to 31                 */
-+    unsigned short usGpioPhySpiSck;             /* GPIO pin or not defined */
-+    unsigned short usGpioPhySpiSs;              /* GPIO pin or not defined */
-+    unsigned short usGpioPhySpiMosi;            /* GPIO pin or not defined */
-+    unsigned short usGpioPhySpiMiso;            /* GPIO pin or not defined */
-+    unsigned short usGpioPhyReset;              /* GPIO pin or not defined (96348LV) */
-+    unsigned short numSwitchPorts;              /* Number of PHY ports */
-+    unsigned short usConfigType;                /* Configuration type */
-+    unsigned short usReverseMii;                /* Reverse MII */
-+} ETHERNET_MAC_INFO, *PETHERNET_MAC_INFO;
-+
-+
-+/* Information about VoIP DSPs.  If ucDspType is BP_VOIP_NO_DSP,
-+ * then the other fields are not valid.
-+ */
-+typedef struct VoIPDspInfo
-+{
-+    unsigned char  ucDspType;
-+    unsigned char  ucDspAddress;
-+    unsigned short usExtIntrVoip;
-+    unsigned short usGpioVoipReset;
-+    unsigned short usGpioVoipIntr;
-+    unsigned short usGpioLedVoip;
-+    unsigned short usCsVoip;
-+
-+} VOIP_DSP_INFO;
-+
-+
-+/**************************************************************************
-+ * Name       : BpSetBoardId
-+ *
-+ * Description: This function find the BOARD_PARAMETERS structure for the
-+ *              specified board id string and assigns it to a global, static
-+ *              variable.
-+ *
-+ * Parameters : [IN] pszBoardId - Board id string that is saved into NVRAM.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_FOUND - Error, board id input string does not
-+ *                  have a board parameters configuration record.
-+ ***************************************************************************/
-+int BpSetBoardId( char *pszBoardId );
-+
-+/**************************************************************************
-+ * Name       : BpGetBoardIds
-+ *
-+ * Description: This function returns all of the supported board id strings.
-+ *
-+ * Parameters : [OUT] pszBoardIds - Address of a buffer that the board id
-+ *                  strings are returned in.  Each id starts at BP_BOARD_ID_LEN
-+ *                  boundary.
-+ *              [IN] nBoardIdsSize - Number of BP_BOARD_ID_LEN elements that
-+ *                  were allocated in pszBoardIds.
-+ *
-+ * Returns    : Number of board id strings returned.
-+ ***************************************************************************/
-+int BpGetBoardIds( char *pszBoardIds, int nBoardIdsSize );
-+
-+/**************************************************************************
-+ * Name       : BpGetEthernetMacInfo
-+ *
-+ * Description: This function returns all of the supported board id strings.
-+ *
-+ * Parameters : [OUT] pEnetInfos - Address of an array of ETHERNET_MAC_INFO
-+ *                  buffers.
-+ *              [IN] nNumEnetInfos - Number of ETHERNET_MAC_INFO elements that
-+ *                  are pointed to by pEnetInfos.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ ***************************************************************************/
-+int BpGetEthernetMacInfo( PETHERNET_MAC_INFO pEnetInfos, int nNumEnetInfos );
-+
-+/**************************************************************************
-+ * Name       : BpGetSdramSize
-+ *
-+ * Description: This function returns a constant that describees the board's
-+ *              SDRAM type and size.
-+ *
-+ * Parameters : [OUT] pulSdramSize - Address of short word that the SDRAM size
-+ *                  is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ ***************************************************************************/
-+int BpGetSdramSize( unsigned long *pulSdramSize );
-+
-+/**************************************************************************
-+ * Name       : BpGetPsiSize
-+ *
-+ * Description: This function returns the persistent storage size in K bytes.
-+ *
-+ * Parameters : [OUT] pulPsiSize - Address of short word that the persistent
-+ *                  storage size is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ ***************************************************************************/
-+int BpGetPsiSize( unsigned long *pulPsiSize );
-+
-+/**************************************************************************
-+ * Name       : BpGetRj11InnerOuterPairGpios
-+ *
-+ * Description: This function returns the GPIO pin assignments for changing
-+ *              between the RJ11 inner pair and RJ11 outer pair.
-+ *
-+ * Parameters : [OUT] pusInner - Address of short word that the RJ11 inner pair
-+ *                  GPIO pin is returned in.
-+ *              [OUT] pusOuter - Address of short word that the RJ11 outer pair
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, values are returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetRj11InnerOuterPairGpios( unsigned short *pusInner,
-+    unsigned short *pusOuter );
-+
-+/**************************************************************************
-+ * Name       : BpGetPressAndHoldResetGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the press
-+ *              and hold reset button.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the press and hold
-+ *                  reset button GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetPressAndHoldResetGpio( unsigned short *pusValue );
-+
-+/**************************************************************************
-+ * Name       : BpGetVoipResetGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the VOIP
-+ *              Reset operation.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the VOIP reset
-+ *                  GPIO pin is returned in.
-+ *              [IN] dspNum - Address of the DSP to query.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetVoipResetGpio( unsigned char dspNum, unsigned short *pusValue );
-+
-+/**************************************************************************
-+ * Name       : BpGetVoipIntrGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for VoIP interrupt.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the VOIP interrupt
-+ *                  GPIO pin is returned in.
-+ *              [IN] dspNum - Address of the DSP to query.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetVoipIntrGpio( unsigned char dspNum, unsigned short *pusValue );
-+
-+/**************************************************************************
-+ * Name       : BpGetPcmciaResetGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the PCMCIA
-+ *              Reset operation.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the PCMCIA reset
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetPcmciaResetGpio( unsigned short *pusValue );
-+
-+/**************************************************************************
-+ * Name       : BpGetUartRtsCtsGpios
-+ *
-+ * Description: This function returns the GPIO pin assignments for RTS and CTS
-+ *              UART signals.
-+ *
-+ * Parameters : [OUT] pusRts - Address of short word that the UART RTS GPIO
-+ *                  pin is returned in.
-+ *              [OUT] pusCts - Address of short word that the UART CTS GPIO
-+ *                  pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, values are returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetRtsCtsUartGpios( unsigned short *pusRts, unsigned short *pusCts );
-+
-+/**************************************************************************
-+ * Name       : BpGetAdslLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the ADSL
-+ *              LED.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the ADSL LED
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetAdslLedGpio( unsigned short *pusValue );
-+
-+/**************************************************************************
-+ * Name       : BpGetAdslFailLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the ADSL
-+ *              LED that is used when there is a DSL connection failure.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the ADSL LED
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetAdslFailLedGpio( unsigned short *pusValue );
-+
-+/**************************************************************************
-+ * Name       : BpGetWirelessLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the Wireless
-+ *              LED.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the Wireless LED
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetWirelessLedGpio( unsigned short *pusValue );
-+
-+/**************************************************************************
-+ * Name       : BpGetWirelessAntInUse
-+ *
-+ * Description: This function returns the antennas in use for wireless
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the Wireless Antenna
-+ *                  is in use.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetWirelessAntInUse( unsigned short *pusValue );
-+
-+/**************************************************************************
-+ * Name       : BpGetWirelessSesBtnGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the Wireless
-+ *              Ses Button.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the Wireless Ses
-+ *                  Button GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetWirelessSesBtnGpio( unsigned short *pusValue );
-+
-+/**************************************************************************
-+ * Name       : BpGetWirelessSesExtIntr
-+ *
-+ * Description: This function returns the external interrupt number for the 
-+ *              Wireless Ses Button.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the Wireless Ses
-+ *                  external interrup is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetWirelessSesExtIntr( unsigned short *pusValue );
-+
-+/**************************************************************************
-+ * Name       : BpGetWirelessSesLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the Wireless
-+ *              Ses Led.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the Wireless Ses
-+ *                  Led GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetWirelessSesLedGpio( unsigned short *pusValue );
-+
-+/**************************************************************************
-+ * Name       : BpGetUsbLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the USB
-+ *              LED.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the USB LED
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetUsbLedGpio( unsigned short *pusValue );
-+
-+/**************************************************************************
-+ * Name       : BpGetHpnaLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the HPNA
-+ *              LED.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the HPNA LED
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetHpnaLedGpio( unsigned short *pusValue );
-+
-+/**************************************************************************
-+ * Name       : BpGetWanDataLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the WAN Data
-+ *              LED.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the WAN Data LED
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetWanDataLedGpio( unsigned short *pusValue );
-+
-+/**************************************************************************
-+ * Name       : BpGetPppLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the PPP
-+ *              LED.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the PPP LED
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetPppLedGpio( unsigned short *pusValue );
-+
-+/**************************************************************************
-+ * Name       : BpGetPppFailLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the PPP
-+ *              LED that is used when there is a PPP connection failure.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the PPP LED
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetPppFailLedGpio( unsigned short *pusValue );
-+
-+/**************************************************************************
-+ * Name       : BpGetVoipLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the VOIP
-+ *              LED.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the VOIP LED
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetVoipLedGpio( unsigned short *pusValue );
-+
-+/**************************************************************************
-+ * Name       : BpGetBootloaderPowerOnLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the power
-+ *              on LED that is set by the bootloader.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the alarm LED
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetBootloaderPowerOnLedGpio( unsigned short *pusValue );
-+
-+/**************************************************************************
-+ * Name       : BpGetBootloaderAlarmLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the alarm
-+ *              LED that is set by the bootloader.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the alarm LED
-+ *                  GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetBootloaderAlarmLedGpio( unsigned short *pusValue );
-+
-+/**************************************************************************
-+ * Name       : BpGetBootloaderResetCfgLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the reset
-+ *              configuration LED that is set by the bootloader.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the reset
-+ *                  configuration LED GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetBootloaderResetCfgLedGpio( unsigned short *pusValue );
-+
-+/**************************************************************************
-+ * Name       : BpGetBootloaderStopLedGpio
-+ *
-+ * Description: This function returns the GPIO pin assignment for the break
-+ *              into bootloader LED that is set by the bootloader.
-+ *
-+ * Parameters : [OUT] pusValue - Address of short word that the break into
-+ *                  bootloader LED GPIO pin is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetBootloaderStopLedGpio( unsigned short *pusValue );
-+
-+/**************************************************************************
-+ * Name       : BpGetWirelessExtIntr
-+ *
-+ * Description: This function returns the Wireless external interrupt number.
-+ *
-+ * Parameters : [OUT] pulValue - Address of short word that the wireless
-+ *                  external interrupt number is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetWirelessExtIntr( unsigned long *pulValue );
-+
-+/**************************************************************************
-+ * Name       : BpGetAdslDyingGaspExtIntr
-+ *
-+ * Description: This function returns the ADSL Dying Gasp external interrupt
-+ *              number.
-+ *
-+ * Parameters : [OUT] pulValue - Address of short word that the ADSL Dying Gasp
-+ *                  external interrupt number is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetAdslDyingGaspExtIntr( unsigned long *pulValue );
-+
-+/**************************************************************************
-+ * Name       : BpGetVoipExtIntr
-+ *
-+ * Description: This function returns the VOIP external interrupt number.
-+ *
-+ * Parameters : [OUT] pulValue - Address of short word that the VOIP
-+ *                  external interrupt number is returned in.
-+ *              [IN] dspNum - Address of the DSP to query.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetVoipExtIntr( unsigned char dspNum, unsigned long *pulValue );
-+
-+/**************************************************************************
-+ * Name       : BpGetHpnaExtIntr
-+ *
-+ * Description: This function returns the HPNA external interrupt number.
-+ *
-+ * Parameters : [OUT] pulValue - Address of short word that the HPNA
-+ *                  external interrupt number is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetHpnaExtIntr( unsigned long *pulValue );
-+
-+/**************************************************************************
-+ * Name       : BpGetHpnaChipSelect
-+ *
-+ * Description: This function returns the HPNA chip select number.
-+ *
-+ * Parameters : [OUT] pulValue - Address of short word that the HPNA
-+ *                  chip select number is returned in.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetHpnaChipSelect( unsigned long *pulValue );
-+
-+/**************************************************************************
-+ * Name       : BpGetVoipChipSelect
-+ *
-+ * Description: This function returns the VOIP chip select number.
-+ *
-+ * Parameters : [OUT] pulValue - Address of short word that the VOIP
-+ *                  chip select number is returned in.
-+ *              [IN] dspNum - Address of the DSP to query.
-+ *
-+ * Returns    : BP_SUCCESS - Success, value is returned.
-+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
-+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
-+ *                  for the board.
-+ ***************************************************************************/
-+int BpGetVoipChipSelect( unsigned char dspNum, unsigned long *pulValue );
-+
-+#endif /* __ASSEMBLER__ */
-+
-+#if __cplusplus
-+}
-+#endif
-+
-+#endif /* _BOARDPARMS_H */
-+
-diff -urN linux.old/boardparms/bcm963xx/Makefile linux.dev/boardparms/bcm963xx/Makefile
---- linux.old/boardparms/bcm963xx/Makefile     1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/boardparms/bcm963xx/Makefile     2006-08-25 00:39:38.000000000 +0200
-@@ -0,0 +1,16 @@
-+
-+ifeq ($(CONFIG_MIPS_BRCM),y)
-+
-+# Linux
-+obj-y         += boardparms.o
-+EXTRA_CFLAGS += -DCONFIG_BCM9$(BRCM_CHIP)
-+-include $(TOPDIR)/Rules.make
-+
-+else
-+
-+# CFE
-+BSPOBJS += boardparms.o
-+
-+endif
-+
-+
-diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/include/asm-mips/bootinfo.h
---- linux.old/include/asm-mips/bootinfo.h      2006-08-25 00:43:22.000000000 +0200
-+++ linux.dev/include/asm-mips/bootinfo.h      2006-08-25 00:39:38.000000000 +0200
-@@ -218,6 +218,14 @@
- #define MACH_GROUP_TITAN       22     /* PMC-Sierra Titan             */
- #define  MACH_TITAN_YOSEMITE  1       /* PMC-Sierra Yosemite          */
-+/*
-+ * 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 CL_SIZE                       COMMAND_LINE_SIZE
- const char *get_system_type(void);
-diff -urN linux.old/include/asm-mips/cpu.h linux.dev/include/asm-mips/cpu.h
---- linux.old/include/asm-mips/cpu.h   2006-08-25 00:43:22.000000000 +0200
-+++ linux.dev/include/asm-mips/cpu.h   2006-08-25 00:39:38.000000000 +0200
-@@ -103,6 +103,13 @@
- #define PRID_IMP_SR71000        0x0400
-+/* 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
-+
- /*
-  * Definitions for 7:0 on legacy processors
-  */
-@@ -200,7 +207,10 @@
- #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_LAST              67
- /*
-  * ISA Level encodings
-diff -urN linux.old/include/asm-mips/mach-bcm963xx/cpu-feature-overrides.h linux.dev/include/asm-mips/mach-bcm963xx/cpu-feature-overrides.h
---- linux.old/include/asm-mips/mach-bcm963xx/cpu-feature-overrides.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/mach-bcm963xx/cpu-feature-overrides.h   2006-08-25 11:27:40.000000000 +0200
-@@ -0,0 +1,36 @@
-+#ifndef __ASM_MACH_BCM963XX_CPU_FEATURE_OVERRIDES_H
-+#define __ASM_MACH_BCM963XX_CPU_FEATURE_OVERRIDES_H
-+
-+#define cpu_has_tlb                   1
-+#define cpu_has_4kex                  4
-+#define cpu_has_4ktlb                 8
-+#define cpu_has_fpu                   0
-+#define cpu_has_32fpr                 0
-+#define cpu_has_counter                       0x40
-+#define cpu_has_watch                 0
-+#define cpu_has_mips16                        0
-+#define cpu_has_divec                 0x200
-+#define cpu_has_vce                   0
-+#define cpu_has_cache_cdex_p          0
-+#define cpu_has_cache_cdex_s          0
-+#define cpu_has_prefetch              0x40000
-+#define cpu_has_mcheck                        0x2000
-+#define cpu_has_ejtag                 0x4000
-+#define cpu_has_llsc                  0x10000
-+#define cpu_has_vtag_icache           0
-+#define cpu_has_dc_aliases            0
-+#define cpu_has_ic_fills_f_dc         0
-+
-+#define cpu_has_nofpuex                       0
-+#define cpu_has_64bits                        0
-+#define cpu_has_64bit_zero_reg                0
-+#define cpu_has_64bit_gp_regs         0
-+#define cpu_has_64bit_addresses               0
-+
-+#define cpu_has_subset_pcaches                0
-+
-+#define cpu_dcache_line_size()                16
-+#define cpu_icache_line_size()                16
-+#define cpu_scache_line_size()                0
++#define cpu_has_tlb                           1
++#define cpu_has_4kex                          4
++#define cpu_has_4ktlb                         8
++#define cpu_has_fpu                           0
++#define cpu_has_32fpr                         0
++#define cpu_has_counter                       0x40
++#define cpu_has_watch                         0
++#define cpu_has_mips16                        0
++#define cpu_has_divec                         0x200
++#define cpu_has_vce                           0
++#define cpu_has_cache_cdex_p                  0
++#define cpu_has_cache_cdex_s                  0
++#define cpu_has_prefetch                      0x40000
++#define cpu_has_mcheck                        0x2000
++#define cpu_has_ejtag                         0x4000
++#define cpu_has_llsc                          0x10000
++#define cpu_has_vtag_icache                   0
++#define cpu_has_dc_aliases                    0
++#define cpu_has_ic_fills_f_dc                 0
++
++#define cpu_has_nofpuex                       0
++#define cpu_has_64bits                        0
++#define cpu_has_64bit_zero_reg                0
++#define cpu_has_64bit_gp_regs                 0
++#define cpu_has_64bit_addresses               0
++
++#define cpu_has_subset_pcaches                0
++
++#define cpu_dcache_line_size()                16
++#define cpu_icache_line_size()                16
++#define cpu_scache_line_size()                0
 +
 +#endif /* __ASM_MACH_BCM963XX_CPU_FEATURE_OVERRIDES_H */
 +
 +#endif /* __ASM_MACH_BCM963XX_CPU_FEATURE_OVERRIDES_H */
-diff -urN linux.old/include/asm-mips/mach-generic/param.h linux.dev/include/asm-mips/mach-generic/param.h
---- linux.old/include/asm-mips/mach-generic/param.h    2006-08-25 00:43:22.000000000 +0200
-+++ linux.dev/include/asm-mips/mach-generic/param.h    2006-08-25 00:39:38.000000000 +0200
-@@ -8,6 +8,6 @@
- #ifndef __ASM_MACH_GENERIC_PARAM_H
- #define __ASM_MACH_GENERIC_PARAM_H
--#define HZ            1000            /* Internal kernel timer frequency */
-+#define HZ            200             /* Internal kernel timer frequency */
- #endif /* __ASM_MACH_GENERIC_PARAM_H */
-diff -urN linux.old/include/asm-mips/module.h linux.dev/include/asm-mips/module.h
---- linux.old/include/asm-mips/module.h        2006-08-25 00:43:22.000000000 +0200
-+++ linux.dev/include/asm-mips/module.h        2006-08-25 00:39:38.000000000 +0200
-@@ -113,6 +113,12 @@
+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,12 @@
  #define MODULE_PROC_FAMILY "RM9000 "
  #elif defined CONFIG_CPU_SB1
  #define MODULE_PROC_FAMILY "SB1 "
  #define MODULE_PROC_FAMILY "RM9000 "
  #elif defined CONFIG_CPU_SB1
  #define MODULE_PROC_FAMILY "SB1 "
This page took 0.153964 seconds and 4 git commands to generate.