fix brcm-2.4/brcm47xx failsafe init (thx, puchu)

[openwrt.git] / target / linux / ixp4xx / config-2.6.30

diff --git a/target/linux/ixp4xx/config-2.6.30 b/target/linux/ixp4xx/config-2.6.30
index f548032..982e9b7 100644 (file)
--- a/target/linux/ixp4xx/config-2.6.30
+++ b/target/linux/ixp4xx/config-2.6.30
@@ -1,75 +1,33 @@
 # CONFIG_AEABI is not set
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_AEABI is not set
 CONFIG_ALIGNMENT_TRAP=y

-# CONFIG_ARCH_AAEC2000 is not set

 # CONFIG_ARCH_ADI_COYOTE is not set
 # CONFIG_ARCH_ADI_COYOTE is not set

-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set

 CONFIG_ARCH_FLATMEM_HAS_HOLES=y
 CONFIG_ARCH_FLATMEM_HAS_HOLES=y

-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_GEMINI is not set
-# CONFIG_ARCH_H720X is not set

 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set

-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set

 CONFIG_ARCH_IXCDP1100=y
 CONFIG_ARCH_IXDP425=y
 CONFIG_ARCH_IXDP4XX=y
 CONFIG_ARCH_IXCDP1100=y
 CONFIG_ARCH_IXDP425=y
 CONFIG_ARCH_IXDP4XX=y

-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP23XX is not set

 CONFIG_ARCH_IXP4XX=y
 CONFIG_ARCH_IXP4XX=y

-# CONFIG_ARCH_KIRKWOOD is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_LOKI is not set
-# CONFIG_ARCH_MMP is not set
-# CONFIG_ARCH_MSM is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_PNX4008 is not set

 # CONFIG_ARCH_PRPMC1100 is not set
 # CONFIG_ARCH_PRPMC1100 is not set

-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_REALVIEW is not set

 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y

-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_SA1100 is not set

 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set

-# CONFIG_ARCH_SHARK is not set

 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y

-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_W90X900 is not set
-CONFIG_ARM=y

 # CONFIG_ARM_THUMB is not set
 # CONFIG_ARM_THUMB is not set

+CONFIG_ARM=y

 # CONFIG_ARPD is not set
 # CONFIG_ARPD is not set

-CONFIG_BASE_SMALL=0

 CONFIG_BITREVERSE=y
 CONFIG_BOUNCE=y
 CONFIG_BITREVERSE=y
 CONFIG_BOUNCE=y

-CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200 init=/etc/preinit"
-CONFIG_COMPAT_NET_DEV_OPS=y
-# CONFIG_CONFIGFS_FS is not set
-CONFIG_CPU_32=y
+CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"

 CONFIG_CPU_32v5=y
 CONFIG_CPU_32v5=y

+CONFIG_CPU_32=y

 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_BIG_ENDIAN=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_BIG_ENDIAN=y
 CONFIG_CPU_CACHE_VIVT=y

-CONFIG_CPU_CP15=y

 CONFIG_CPU_CP15_MMU=y
 CONFIG_CPU_CP15_MMU=y

+CONFIG_CPU_CP15=y

 CONFIG_CPU_IXP43X=y
 CONFIG_CPU_IXP46X=y
 CONFIG_CPU_PABRT_NOIFAR=y
 CONFIG_CPU_IXP43X=y
 CONFIG_CPU_IXP46X=y
 CONFIG_CPU_PABRT_NOIFAR=y


@@ -77,10 +35,7 @@ CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CPU_XSCALE=y
 CONFIG_CRC16=y
 # CONFIG_DCB is not set
 CONFIG_CPU_XSCALE=y
 CONFIG_CRC16=y
 # CONFIG_DCB is not set

-# CONFIG_DEBUG_BUGVERBOSE is not set

 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEBUG_USER is not set

-CONFIG_DEFAULT_VEGAS=y
-# CONFIG_DEFAULT_WESTWOOD is not set

 CONFIG_DEVPORT=y
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 # CONFIG_DM9000 is not set
 CONFIG_DEVPORT=y
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 # CONFIG_DM9000 is not set


@@ -88,19 +43,17 @@ CONFIG_DMABOUNCE=y
 CONFIG_DNOTIFY=y
 CONFIG_EEPROM_AT24=y
 # CONFIG_EEPROM_LEGACY is not set
 CONFIG_DNOTIFY=y
 CONFIG_EEPROM_AT24=y
 # CONFIG_EEPROM_LEGACY is not set

-# CONFIG_FIXED_PHY is not set

 # CONFIG_FPE_FASTFPE is not set
 # CONFIG_FPE_NWFPE is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_FPE_FASTFPE is not set
 # CONFIG_FPE_NWFPE is not set
 CONFIG_FRAME_POINTER=y

-# CONFIG_FREEZER is not set
-CONFIG_GENERIC_CLOCKEVENTS=y

 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y

+CONFIG_GENERIC_CLOCKEVENTS=y

 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y

-CONFIG_GPIOLIB=y

 CONFIG_GPIO_DEVICE=y
 CONFIG_GPIO_GW_I2C_PLD=y
 CONFIG_GPIO_DEVICE=y
 CONFIG_GPIO_GW_I2C_PLD=y

+CONFIG_GPIOLIB=y

 CONFIG_GPIO_SYSFS=y
 # CONFIG_HAMRADIO is not set
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GPIO_SYSFS=y
 # CONFIG_HAMRADIO is not set
 CONFIG_HARDIRQS_SW_RESEND=y


@@ -117,18 +70,19 @@ CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_MTD_OTP=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_MTD_OTP=y
 CONFIG_HAVE_OPROFILE=y

-CONFIG_HWMON=y

 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HWMON_VID=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HWMON_VID=y

-CONFIG_HW_RANDOM=y
+CONFIG_HWMON=y

 CONFIG_HW_RANDOM_IXP4XX=y
 CONFIG_HW_RANDOM_IXP4XX=y

-CONFIG_I2C=y
+CONFIG_HW_RANDOM=y

 CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_GPIO=y
 # CONFIG_I2C_IOP3XX is not set
 CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_GPIO=y
 # CONFIG_I2C_IOP3XX is not set

+CONFIG_I2C=y

 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INITRAMFS_SOURCE=""

+# CONFIG_INPUT_IXP4XX_BEEPER is not set

 CONFIG_IP_MROUTE=y
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_IP_MROUTE=y
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y


@@ -144,10 +98,9 @@ CONFIG_IXP4XX_WATCHDOG=y
 CONFIG_LEDS_FSG=y
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_LATCH=y
 CONFIG_LEDS_FSG=y
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_LATCH=y

-CONFIG_LEGACY_PTYS=y

 CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_LEGACY_PTY_COUNT=256

+CONFIG_LEGACY_PTYS=y

 # CONFIG_LIB80211 is not set
 # CONFIG_LIB80211 is not set

-# CONFIG_LSI_ET1011C_PHY is not set

 CONFIG_MACH_AP1000=y
 CONFIG_MACH_AVILA=y
 CONFIG_MACH_CAMBRIA=y
 CONFIG_MACH_AP1000=y
 CONFIG_MACH_AVILA=y
 CONFIG_MACH_CAMBRIA=y


@@ -163,47 +116,32 @@ CONFIG_MACH_LOFT=y
 CONFIG_MACH_MI424WR=y
 CONFIG_MACH_NAS100D=y
 CONFIG_MACH_NSLU2=y
 CONFIG_MACH_MI424WR=y
 CONFIG_MACH_NAS100D=y
 CONFIG_MACH_NSLU2=y

-CONFIG_MACH_PRONGHORN=y

 CONFIG_MACH_PRONGHORNMETRO=y
 CONFIG_MACH_PRONGHORNMETRO=y

+CONFIG_MACH_PRONGHORN=y

 CONFIG_MACH_SIDEWINDER=y
 CONFIG_MACH_TW5334=y
 CONFIG_MACH_USR8200=y
 CONFIG_MACH_WG302V1=y
 CONFIG_MACH_WG302V2=y
 CONFIG_MACH_WRT300NV2=y
 CONFIG_MACH_SIDEWINDER=y
 CONFIG_MACH_TW5334=y
 CONFIG_MACH_USR8200=y
 CONFIG_MACH_WG302V1=y
 CONFIG_MACH_WG302V2=y
 CONFIG_MACH_WRT300NV2=y

-# CONFIG_MAC_PARTITION is not set

 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_MTD_CFI_ADV_OPTIONS=y
 # CONFIG_MTD_CFI_GEOMETRY is not set
 CONFIG_MTD_IXP4XX=y
 CONFIG_MTD_OTP=y
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_MTD_CFI_ADV_OPTIONS=y
 # CONFIG_MTD_CFI_GEOMETRY is not set
 CONFIG_MTD_IXP4XX=y
 CONFIG_MTD_OTP=y
 CONFIG_MTD_REDBOOT_PARTS=y

-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_NATSEMI is not set

 # CONFIG_NET_SCH_DRR is not set
 # CONFIG_NET_SCH_DRR is not set

-# CONFIG_NF_DEFRAG_IPV4 is not set

 # CONFIG_NO_IOPORT is not set
 # CONFIG_NO_IOPORT is not set

-# CONFIG_NVRAM is not set

 # CONFIG_OUTER_CACHE is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_OUTER_CACHE is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000

-CONFIG_PCI=y

 # CONFIG_PCI_STUB is not set
 # CONFIG_PCI_STUB is not set

-CONFIG_PCI_SYSCALL=y

 CONFIG_PHYLIB=y
 CONFIG_PHYLIB=y

-# CONFIG_PHYS_ADDR_T_64BIT is not set

 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_DS1672=y
 CONFIG_RTC_DRV_ISL1208=y
 CONFIG_RTC_DRV_PCF8563=y
 CONFIG_RTC_DRV_X1205=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_DS1672=y
 CONFIG_RTC_DRV_ISL1208=y
 CONFIG_RTC_DRV_PCF8563=y
 CONFIG_RTC_DRV_X1205=y

-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_LIB=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y

 # CONFIG_SCSI_DMA is not set
 CONFIG_SENSORS_AD7418=y
 CONFIG_SENSORS_MAX6650=y
 # CONFIG_SCSI_DMA is not set
 CONFIG_SENSORS_AD7418=y
 CONFIG_SENSORS_MAX6650=y


@@ -212,10 +150,7 @@ CONFIG_SENSORS_W83781D=y
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SPLIT_PTLOCK_CPUS=4096

-CONFIG_SSB_POSSIBLE=y
-CONFIG_SYSVIPC_SYSCTL=y

 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y

-CONFIG_TICK_ONESHOT=y

 CONFIG_UID16=y
 CONFIG_USB_SUPPORT=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_UID16=y
 CONFIG_USB_SUPPORT=y
 CONFIG_VECTORS_BASE=0xffff0000