summaryrefslogtreecommitdiffstats
path: root/target/linux/rb532
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/rb532')
-rw-r--r--target/linux/rb532/Makefile2
-rw-r--r--target/linux/rb532/base-files/etc/config/network8
-rw-r--r--target/linux/rb532/base-files/etc/diag.sh18
-rwxr-xr-xtarget/linux/rb532/base-files/sbin/cf2nand2
-rwxr-xr-xtarget/linux/rb532/base-files/sbin/wget2nand2
-rw-r--r--target/linux/rb532/config-3.8 (renamed from target/linux/rb532/config-3.3)26
-rw-r--r--target/linux/rb532/patches-3.8/001-cmdline_hack.patch (renamed from target/linux/rb532/patches-3.3/001-cmdline_hack.patch)0
-rw-r--r--target/linux/rb532/patches-3.8/002-rb532_nand_fixup.patch (renamed from target/linux/rb532/patches-3.3/002-rb532_nand_fixup.patch)9
8 files changed, 44 insertions, 23 deletions
diff --git a/target/linux/rb532/Makefile b/target/linux/rb532/Makefile
index 0504452c4..8740b67c2 100644
--- a/target/linux/rb532/Makefile
+++ b/target/linux/rb532/Makefile
@@ -11,7 +11,7 @@ BOARD:=rb532
BOARDNAME:=Mikrotik RouterBoard 532
FEATURES:=jffs2 pci targz broken
-LINUX_VERSION:=3.3.8
+LINUX_VERSION:=3.8.12
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += wpad-mini kmod-madwifi kmod-input-rb532
diff --git a/target/linux/rb532/base-files/etc/config/network b/target/linux/rb532/base-files/etc/config/network
index ee09491c7..3a8c8f30b 100644
--- a/target/linux/rb532/base-files/etc/config/network
+++ b/target/linux/rb532/base-files/etc/config/network
@@ -11,3 +11,11 @@ config interface lan
option proto static
option ipaddr 192.168.1.1
option netmask 255.255.255.0
+ option ip6assign 60
+
+config interface wan6
+ option ifname @wan
+ option proto dhcpv6
+
+config globals globals
+ option ula_prefix auto
diff --git a/target/linux/rb532/base-files/etc/diag.sh b/target/linux/rb532/base-files/etc/diag.sh
index d8f9a8825..482b8e995 100644
--- a/target/linux/rb532/base-files/etc/diag.sh
+++ b/target/linux/rb532/base-files/etc/diag.sh
@@ -1,19 +1,17 @@
#!/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/rb500led:$led" ] && echo "$state" > "/sys/class/leds/rb500led:$led/brightness"
-}
+. /lib/functions/leds.sh
+
+status_led="rb500led:amber"
set_state() {
case "$1" in
- preinit)
- set_led amber 1
+ preinit)
+ status_led_on
;;
- done)
- set_led amber 0
+ done)
+ status_led_off
;;
esac
}
diff --git a/target/linux/rb532/base-files/sbin/cf2nand b/target/linux/rb532/base-files/sbin/cf2nand
index 60542de1e..0bfc259ef 100755
--- a/target/linux/rb532/base-files/sbin/cf2nand
+++ b/target/linux/rb532/base-files/sbin/cf2nand
@@ -1,5 +1,5 @@
#!/bin/sh
-. /etc/functions.sh
+. /lib/functions.sh
copy_kernel() {
local input="$1"
diff --git a/target/linux/rb532/base-files/sbin/wget2nand b/target/linux/rb532/base-files/sbin/wget2nand
index 57f412864..9a111fa89 100755
--- a/target/linux/rb532/base-files/sbin/wget2nand
+++ b/target/linux/rb532/base-files/sbin/wget2nand
@@ -6,7 +6,7 @@
# Licence GPL V2
# Author david.goodenough@linkchoose.co.uk
# Based on cf2nand from RB532 support
-. /etc/functions.sh
+. /lib/functions.sh
[ -d /tmp/wget2nand ] && {
echo "/tmp/wget2nand already exists"
diff --git a/target/linux/rb532/config-3.3 b/target/linux/rb532/config-3.8
index 1cfc4eacb..84da54d84 100644
--- a/target/linux/rb532/config-3.3
+++ b/target/linux/rb532/config-3.8
@@ -1,25 +1,31 @@
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_REQUIRE_GPIOLIB=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
CONFIG_ATA=y
-CONFIG_BCMA_POSSIBLE=y
CONFIG_BLK_DEV_SD=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_CEVT_R4K=y
-CONFIG_CEVT_R4K_LIB=y
+CONFIG_CPU_GENERIC_DUMP_TLB=y
CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_CPU_MIPS32=y
CONFIG_CPU_MIPS32_R1=y
CONFIG_CPU_MIPSR1=y
+CONFIG_CPU_R4K_CACHE_TLB=y
+CONFIG_CPU_R4K_FPU=y
CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
CONFIG_CPU_SUPPORTS_HIGHMEM=y
CONFIG_CRC16=y
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
CONFIG_CSRC_R4K=y
-CONFIG_CSRC_R4K_LIB=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DMA_NONCOHERENT=y
# CONFIG_ENABLE_WARN_DEPRECATED is not set
@@ -30,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_GPIO_SYSFS=y
# CONFIG_HAMRADIO is not set
@@ -41,7 +49,9 @@ CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAVE_ARCH_JUMP_LABEL=y
CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
CONFIG_HAVE_DMA_API_DEBUG=y
CONFIG_HAVE_DMA_ATTRS=y
CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -55,6 +65,8 @@ CONFIG_HAVE_IDE=y
CONFIG_HAVE_IRQ_WORK=y
CONFIG_HAVE_MEMBLOCK=y
CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_HAVE_NET_DSA=y
CONFIG_HAVE_OPROFILE=y
CONFIG_HAVE_PERF_EVENTS=y
# CONFIG_HIGH_RES_TIMERS is not set
@@ -73,9 +85,11 @@ CONFIG_KORINA=y
CONFIG_LEDS_MIKROTIK_RB532=y
CONFIG_MIKROTIK_RB532=y
CONFIG_MIPS=y
+# CONFIG_MIPS_HUGE_TLB_SUPPORT is not set
CONFIG_MIPS_L1_CACHE_SHIFT=4
# CONFIG_MIPS_MACHINE is not set
CONFIG_MIPS_MT_DISABLED=y
+CONFIG_MODULES_USE_ELF_REL=y
CONFIG_MTD_BLOCK2MTD=y
CONFIG_MTD_CFI_ADV_OPTIONS=y
# CONFIG_MTD_CFI_AMDSTD is not set
@@ -85,7 +99,6 @@ CONFIG_MTD_CFI_GEOMETRY=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_ECC=y
CONFIG_MTD_NAND_PLATFORM=y
-CONFIG_MTD_NAND_VERIFY_WRITE=y
CONFIG_MTD_PHYSMAP=y
# CONFIG_MTD_ROOTFS_ROOT_DEV is not set
# CONFIG_MTD_ROOTFS_SPLIT is not set
@@ -98,6 +111,7 @@ CONFIG_PATA_RB532=y
CONFIG_PCI=y
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
CONFIG_PCI_DOMAINS=y
+CONFIG_PERCPU_RWSEM=y
CONFIG_PERF_USE_VMALLOC=y
# CONFIG_PREEMPT_RCU is not set
CONFIG_RC32434_WDT=y
@@ -111,9 +125,11 @@ CONFIG_SYS_HAS_CPU_MIPS32_R1=y
CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
+CONFIG_TICK_CPU_ACCOUNTING=y
+CONFIG_UIDGID_CONVERTED=y
+CONFIG_USB_ARCH_HAS_XHCI=y
CONFIG_VIA_RHINE=y
CONFIG_VIA_RHINE_MMIO=y
-CONFIG_XZ_DEC=y
CONFIG_YAFFS_9BYTE_TAGS=y
# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
CONFIG_YAFFS_AUTO_YAFFS2=y
diff --git a/target/linux/rb532/patches-3.3/001-cmdline_hack.patch b/target/linux/rb532/patches-3.8/001-cmdline_hack.patch
index d27184d34..d27184d34 100644
--- a/target/linux/rb532/patches-3.3/001-cmdline_hack.patch
+++ b/target/linux/rb532/patches-3.8/001-cmdline_hack.patch
diff --git a/target/linux/rb532/patches-3.3/002-rb532_nand_fixup.patch b/target/linux/rb532/patches-3.8/002-rb532_nand_fixup.patch
index d127979d2..f1124a14c 100644
--- a/target/linux/rb532/patches-3.3/002-rb532_nand_fixup.patch
+++ b/target/linux/rb532/patches-3.8/002-rb532_nand_fixup.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/rb532/devices.c
+++ b/arch/mips/rb532/devices.c
-@@ -139,6 +139,19 @@ static struct platform_device cf_slot0 =
+@@ -140,6 +140,19 @@ static struct platform_device cf_slot0 =
};
/* Resources and device for NAND */
@@ -20,7 +20,7 @@
static int rb532_dev_ready(struct mtd_info *mtd)
{
return gpio_get_value(GPIO_RDY);
-@@ -274,6 +287,16 @@ static void __init parse_mac_addr(char *
+@@ -275,6 +288,16 @@ static void __init parse_mac_addr(char *
/* NAND definitions */
#define NAND_CHIP_DELAY 25
@@ -37,11 +37,10 @@
static void __init rb532_nand_setup(void)
{
switch (mips_machtype) {
-@@ -293,6 +316,8 @@ static void __init rb532_nand_setup(void
+@@ -293,6 +316,7 @@ static void __init rb532_nand_setup(void
+ rb532_nand_data.chip.nr_partitions = ARRAY_SIZE(rb532_partition_info);
rb532_nand_data.chip.partitions = rb532_partition_info;
rb532_nand_data.chip.chip_delay = NAND_CHIP_DELAY;
- rb532_nand_data.chip.options = NAND_NO_AUTOINCR;
-+
+ rb532_nand_data.chip.chip_fixup = &rb532_nand_fixup;
}