summaryrefslogtreecommitdiffstats
path: root/target/linux/au1000
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/au1000')
-rw-r--r--target/linux/au1000/Makefile4
-rw-r--r--target/linux/au1000/au1500/config-default5
-rw-r--r--target/linux/au1000/au1550/config-3.35
-rw-r--r--target/linux/au1000/au1550/config-default4
-rw-r--r--target/linux/au1000/base-files/etc/diag.sh26
-rw-r--r--target/linux/au1000/config-3.6 (renamed from target/linux/au1000/au1500/config-3.3)19
-rw-r--r--target/linux/au1000/patches-3.3/004-pci-idsel-cb.patch12
-rw-r--r--target/linux/au1000/patches-3.6/002-openwrt_rootfs.patch (renamed from target/linux/au1000/patches-3.3/002-openwrt_rootfs.patch)0
-rw-r--r--target/linux/au1000/patches-3.6/003-au1000_eth_ioctl.patch (renamed from target/linux/au1000/patches-3.3/003-au1000_eth_ioctl.patch)0
-rw-r--r--target/linux/au1000/patches-3.6/004-watchdog_low_init.patch12
10 files changed, 44 insertions, 43 deletions
diff --git a/target/linux/au1000/Makefile b/target/linux/au1000/Makefile
index 2405ece4e..93605edc0 100644
--- a/target/linux/au1000/Makefile
+++ b/target/linux/au1000/Makefile
@@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
ARCH:=mipsel
BOARD:=au1000
BOARDNAME:=RMI/AMD AU1x00
-FEATURES:=jffs2 usb pci
+FEATURES:=squashfs jffs2 usb pci
SUBTARGETS=au1500 au1550
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.3.8
+LINUX_VERSION:=3.6.11
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += wpad-mini yamonenv
diff --git a/target/linux/au1000/au1500/config-default b/target/linux/au1000/au1500/config-default
new file mode 100644
index 000000000..0289d967b
--- /dev/null
+++ b/target/linux/au1000/au1500/config-default
@@ -0,0 +1,5 @@
+CONFIG_DMA_NONCOHERENT=y
+# CONFIG_MIPS_DB1550 is not set
+CONFIG_MIPS_MTX1=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_WDT_MTX1=y
diff --git a/target/linux/au1000/au1550/config-3.3 b/target/linux/au1000/au1550/config-3.3
index 34a821f77..14e028605 100644
--- a/target/linux/au1000/au1550/config-3.3
+++ b/target/linux/au1000/au1550/config-3.3
@@ -7,7 +7,6 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
CONFIG_BCMA_POSSIBLE=y
-# CONFIG_BLK_DEV_IDE_AU1XXX is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_CEVT_R4K_LIB=y
CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/mtdblock0 rootfstype=squashfs,jffs2"
@@ -102,8 +101,8 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_PB1500 is not set
# CONFIG_MIPS_PB1550 is not set
# CONFIG_MIPS_XXS1500 is not set
-CONFIG_MODULE_FORCE_UNLOAD=y
# CONFIG_MMC_AU1X is not set
+CONFIG_MODULE_FORCE_UNLOAD=y
# CONFIG_MTD_CFI_INTELEXT is not set
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
CONFIG_MTD_PHYSMAP=y
@@ -121,8 +120,8 @@ CONFIG_PHYS_ADDR_T_64BIT=y
CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_PCI=m
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SND_SOC_AU1XPSC is not set
# CONFIG_SND_SOC_AU1XAUDIO is not set
+# CONFIG_SND_SOC_AU1XPSC is not set
CONFIG_SOFT_WATCHDOG=m
# CONFIG_SPI_AU1550 is not set
# CONFIG_STANDALONE is not set
diff --git a/target/linux/au1000/au1550/config-default b/target/linux/au1000/au1550/config-default
new file mode 100644
index 000000000..2c641b8ca
--- /dev/null
+++ b/target/linux/au1000/au1550/config-default
@@ -0,0 +1,4 @@
+CONFIG_DMA_COHERENT=y
+CONFIG_MIPS_DB1550=y
+CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y
+# CONFIG_MIPS_MTX1 is not set
diff --git a/target/linux/au1000/base-files/etc/diag.sh b/target/linux/au1000/base-files/etc/diag.sh
index d97461532..65e3011be 100644
--- a/target/linux/au1000/base-files/etc/diag.sh
+++ b/target/linux/au1000/base-files/etc/diag.sh
@@ -1,25 +1,21 @@
#!/bin/sh
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2013 OpenWrt.org
-set_led() {
- local led="$1"
- local state="$2"
- [ -d "/sys/class/leds/mtx1:$led" ] && echo "$state" > "/sys/class/leds/mtx1:$led/brightness"
-}
+. /lib/functions/leds.sh
set_state() {
case "$1" in
- preinit)
- set_led green 0
- set_led red 1
+ preinit)
+ led_off "mtx1:green"
+ led_on "mtx1:red"
;;
- failsafe)
- set_led green 1
- set_led red 1
+ failsafe)
+ led_on "mtx1:green"
+ led_on "mtx1:red"
;;
- done)
- set_led green 1
- set_led red 0
+ done)
+ led_on "mtx1:green"
+ led_off "mtx1:red"
;;
esac
}
diff --git a/target/linux/au1000/au1500/config-3.3 b/target/linux/au1000/config-3.6
index 4c59d8840..2498f0df0 100644
--- a/target/linux/au1000/au1500/config-3.3
+++ b/target/linux/au1000/config-3.6
@@ -2,17 +2,19 @@ CONFIG_64BIT_PHYS_ADDR=y
CONFIG_ALCHEMY_GPIOINT_AU1000=y
CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
CONFIG_ARCH_DISCARD_MEMBLOCK=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_BCMA_POSSIBLE=y
-# CONFIG_BLK_DEV_IDE_AU1XXX is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_CEVT_R4K_LIB=y
CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/mtdblock0 rootfstype=squashfs,jffs2"
CONFIG_CMDLINE_BOOL=y
# CONFIG_CMDLINE_OVERRIDE is not set
+# CONFIG_CPU_BIG_ENDIAN is not set
CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
CONFIG_CPU_LITTLE_ENDIAN=y
@@ -26,7 +28,6 @@ CONFIG_CRC16=y
CONFIG_CSRC_R4K_LIB=y
# CONFIG_DEBUG_ZBOOT is not set
CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DMA_NONCOHERENT=y
CONFIG_DUMMY=m
CONFIG_EARLY_PRINTK=y
CONFIG_ELF_CORE=y
@@ -35,8 +36,10 @@ CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_IO=y
CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
CONFIG_GPIOLIB=y
# CONFIG_HAMRADIO is not set
CONFIG_HARDWARE_WATCHPOINTS=y
@@ -95,18 +98,15 @@ CONFIG_MIPS_AU1X00_ENET=y
# CONFIG_MIPS_GPR is not set
CONFIG_MIPS_L1_CACHE_SHIFT=5
# CONFIG_MIPS_MACHINE is not set
-CONFIG_MIPS_MTX1=y
CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_PB1100 is not set
# CONFIG_MIPS_PB1500 is not set
# CONFIG_MIPS_PB1550 is not set
# CONFIG_MIPS_XXS1500 is not set
CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MMC_AU1X is not set
# CONFIG_MTD_CFI_INTELEXT is not set
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
CONFIG_MTD_PHYSMAP=y
-CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NEED_PER_CPU_KM=y
CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
CONFIG_PAGEFLAGS_EXTENDED=y
@@ -121,10 +121,7 @@ CONFIG_PHYS_ADDR_T_64BIT=y
CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_PCI=m
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SND_SOC_AU1XPSC is not set
-# CONFIG_SND_SOC_AU1XAUDIO is not set
CONFIG_SOFT_WATCHDOG=m
-# CONFIG_SPI_AU1550 is not set
# CONFIG_STANDALONE is not set
CONFIG_SYS_HAS_CPU_MIPS32_R1=y
CONFIG_SYS_HAS_EARLY_PRINTK=y
@@ -135,7 +132,7 @@ CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
CONFIG_SYS_SUPPORTS_ZBOOT=y
CONFIG_USB_ARCH_HAS_XHCI=y
CONFIG_USB_SUPPORT=y
-CONFIG_WDT_MTX1=y
-CONFIG_XZ_DEC=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WDT_MTX1 is not set
CONFIG_ZLIB_INFLATE=m
CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/au1000/patches-3.3/004-pci-idsel-cb.patch b/target/linux/au1000/patches-3.3/004-pci-idsel-cb.patch
deleted file mode 100644
index 6b3603220..000000000
--- a/target/linux/au1000/patches-3.3/004-pci-idsel-cb.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/arch/mips/alchemy/board-mtx1.c 2012-06-11 22:02:34.686604093 +0100
-+++ b/arch/mips/alchemy/board-mtx1.c 2012-06-11 22:04:23.375143044 +0100
-@@ -228,6 +228,9 @@
- * adapter on the mtx-1 "singleboard" variant. It triggers a custom
- * logic chip connected to EXT_IO3 (GPIO1) to suppress IDSEL signals.
- */
-+
-+ udelay(1);
-+
- if (assert && devsel != 0)
- /* Suppress signal to Cardbus */
- alchemy_gpio_set_value(1, 0); /* set EXT_IO3 OFF */
diff --git a/target/linux/au1000/patches-3.3/002-openwrt_rootfs.patch b/target/linux/au1000/patches-3.6/002-openwrt_rootfs.patch
index 3adf3b44e..3adf3b44e 100644
--- a/target/linux/au1000/patches-3.3/002-openwrt_rootfs.patch
+++ b/target/linux/au1000/patches-3.6/002-openwrt_rootfs.patch
diff --git a/target/linux/au1000/patches-3.3/003-au1000_eth_ioctl.patch b/target/linux/au1000/patches-3.6/003-au1000_eth_ioctl.patch
index b97a439a4..b97a439a4 100644
--- a/target/linux/au1000/patches-3.3/003-au1000_eth_ioctl.patch
+++ b/target/linux/au1000/patches-3.6/003-au1000_eth_ioctl.patch
diff --git a/target/linux/au1000/patches-3.6/004-watchdog_low_init.patch b/target/linux/au1000/patches-3.6/004-watchdog_low_init.patch
new file mode 100644
index 000000000..d42470ef1
--- /dev/null
+++ b/target/linux/au1000/patches-3.6/004-watchdog_low_init.patch
@@ -0,0 +1,12 @@
+--- a/arch/mips/alchemy/board-mtx1.c
++++ b/arch/mips/alchemy/board-mtx1.c
+@@ -100,6 +100,9 @@ void __init board_setup(void)
+ alchemy_gpio_direction_output(211, 1); /* green on */
+ alchemy_gpio_direction_output(212, 0); /* red off */
+
++ /* Set watchdog pin low */
++ alchemy_gpio_direction_output(215, 0);
++
+ pm_power_off = mtx1_power_off;
+ _machine_halt = mtx1_power_off;
+ _machine_restart = mtx1_reset;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 10:19:04 +0000